blob: a8fa6e39339b8c0b3a481d93e0bade30ce1a1112 [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 Lemur5ba1e9c2018-07-23 18:19:02 +000045import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000046import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000047import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000048import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000049import presubmit_support
50import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040052import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000053import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000054import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000055import watchlists
56
Edward Lemur79d4f992019-11-11 23:49:02 +000057from third_party import six
58from six.moves import urllib
59
60
61if sys.version_info.major == 3:
62 basestring = (str,) # pylint: disable=redefined-builtin
63
Edward Lemurb9830242019-10-30 22:19:20 +000064
tandrii7400cf02016-06-21 08:48:07 -070065__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066
Edward Lemur0f58ae42019-04-30 17:24:12 +000067# Traces for git push will be stored in a traces directory inside the
68# depot_tools checkout.
69DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
70TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
71
72# When collecting traces, Git hashes will be reduced to 6 characters to reduce
73# the size after compression.
74GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
75# Used to redact the cookies from the gitcookies file.
76GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
77
Edward Lemurd4d1ba42019-09-20 21:46:37 +000078MAX_ATTEMPTS = 3
79
Edward Lemur1b52d872019-05-09 21:12:12 +000080# The maximum number of traces we will keep. Multiplied by 3 since we store
81# 3 files per trace.
82MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000083# Message to be displayed to the user to inform where to find the traces for a
84# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000085TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000086'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000087'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000088' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000089'Copies of your gitcookies file and git config have been recorded at:\n'
90' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000091# Format of the message to be stored as part of the traces to give developers a
92# better context when they go through traces.
93TRACES_README_FORMAT = (
94'Date: %(now)s\n'
95'\n'
96'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
97'Title: %(title)s\n'
98'\n'
99'%(description)s\n'
100'\n'
101'Execution time: %(execution_time)s\n'
102'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +0000103
tandrii9d2c7a32016-06-22 03:42:45 -0700104COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800105POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
Henrique Ferreiroff249622019-11-28 23:19:29 +0000106DESCRIPTION_BACKUP_FILE = '.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000107REFS_THAT_ALIAS_TO_OTHER_REFS = {
108 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
109 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
110}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
thestig@chromium.org44202a22014-03-11 19:22:18 +0000112# Valid extensions for files we want to lint.
113DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
114DEFAULT_LINT_IGNORE_REGEX = r"$^"
115
Aiden Bennerc08566e2018-10-03 17:52:42 +0000116# File name for yapf style config files.
117YAPF_CONFIG_FILENAME = '.style.yapf'
118
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000119# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000120Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000121
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000122# Initialized in main()
123settings = None
124
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125# Used by tests/git_cl_test.py to add extra logging.
126# Inside the weirdly failing test, add this:
127# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700128# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100129_IS_BEING_TESTED = False
130
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000131
Christopher Lamf732cd52017-01-24 12:40:11 +1100132def DieWithError(message, change_desc=None):
133 if change_desc:
134 SaveDescriptionBackup(change_desc)
135
vapiera7fbd5a2016-06-16 09:17:49 -0700136 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137 sys.exit(1)
138
139
Christopher Lamf732cd52017-01-24 12:40:11 +1100140def SaveDescriptionBackup(change_desc):
Henrique Ferreiro5ae48172019-11-29 16:14:42 +0000141 backup_path = os.path.join(DEPOT_TOOLS, DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000142 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100143 backup_file = open(backup_path, 'w')
144 backup_file.write(change_desc.description)
145 backup_file.close()
146
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
265def _git_get_branch_config_value(key, default=None, value_type=str,
266 branch=False):
267 """Returns git config value of given or current branch if any.
268
269 Returns default in all other cases.
270 """
271 assert value_type in (int, str, bool)
272 if branch is False: # Distinguishing default arg value from None.
273 branch = GetCurrentBranch()
274
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000275 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700276 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000277
tandrii5d48c322016-08-18 16:19:37 -0700278 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700279 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700280 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000281 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700282 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700283 args.append(_git_branch_config_key(branch, key))
284 code, out = RunGitWithCode(args)
285 if code == 0:
286 value = out.strip()
287 if value_type == int:
288 return int(value)
289 if value_type == bool:
290 return bool(value.lower() == 'true')
291 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000292 return default
293
294
tandrii5d48c322016-08-18 16:19:37 -0700295def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000296 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700297
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000298 If value is None, the key will be unset, otherwise it will be set.
299 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700300 """
301 if not branch:
302 branch = GetCurrentBranch()
303 assert branch, 'a branch name OR currently checked out branch is required'
304 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700305 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700306 if value is None:
307 args.append('--unset')
308 elif isinstance(value, bool):
309 args.append('--bool')
310 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700311 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000312 # `git config` also has --int, but apparently git config suffers from
313 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700314 value = str(value)
315 args.append(_git_branch_config_key(branch, key))
316 if value is not None:
317 args.append(value)
318 RunGit(args, **kwargs)
319
320
machenbach@chromium.org45453142015-09-15 08:45:22 +0000321def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000322 prop_list = getattr(options, 'properties', [])
323 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000324 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000325 try:
326 properties[key] = json.loads(val)
327 except ValueError:
328 pass # If a value couldn't be evaluated, treat it as a string.
329 return properties
330
331
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000332# TODO(crbug.com/976104): Remove this function once git-cl try-results has
333# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000334def _buildbucket_retry(operation_name, http, *args, **kwargs):
335 """Retries requests to buildbucket service and returns parsed json content."""
336 try_count = 0
337 while True:
338 response, content = http.request(*args, **kwargs)
339 try:
340 content_json = json.loads(content)
341 except ValueError:
342 content_json = None
343
344 # Buildbucket could return an error even if status==200.
345 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000346 error = content_json.get('error')
347 if error.get('code') == 403:
348 raise BuildbucketResponseException(
349 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000350 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000351 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000352 raise BuildbucketResponseException(msg)
353
354 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700355 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000357 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700358 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000359 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000360 content)
361 return content_json
362 if response.status < 500 or try_count >= 2:
363 raise httplib2.HttpLib2Error(content)
364
365 # status >= 500 means transient failures.
366 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000367 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000368 try_count += 1
369 assert False, 'unreachable'
370
371
Edward Lemur4c707a22019-09-24 21:13:43 +0000372def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000373 """Calls a buildbucket v2 method and returns the parsed json response."""
374 headers = {
375 'Accept': 'application/json',
376 'Content-Type': 'application/json',
377 }
378 request = json.dumps(request)
379 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
380
381 logging.info('POST %s with %s' % (url, request))
382
383 attempts = 1
384 time_to_sleep = 1
385 while True:
386 response, content = http.request(url, 'POST', body=request, headers=headers)
387 if response.status == 200:
388 return json.loads(content[4:])
389 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
390 msg = '%s error when calling POST %s with %s: %s' % (
391 response.status, url, request, content)
392 raise BuildbucketResponseException(msg)
393 logging.debug(
394 '%s error when calling POST %s with %s. '
395 'Sleeping for %d seconds and retrying...' % (
396 response.status, url, request, time_to_sleep))
397 time.sleep(time_to_sleep)
398 time_to_sleep *= 2
399 attempts += 1
400
401 assert False, 'unreachable'
402
403
qyearsley1fdfcb62016-10-24 13:22:03 -0700404def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700405 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000406 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700407 """
qyearsleydd49f942016-10-28 11:57:22 -0700408 # If no bots are listed, we try to get a set of builders and tests based
409 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 if not options.bot:
411 change = changelist.GetChange(
412 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700413 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700414 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700415 change=change,
416 changed_files=change.LocalPaths(),
417 repository_root=settings.GetRoot(),
418 default_presubmit=None,
419 project=None,
420 verbose=options.verbose,
421 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700422 if masters is None:
423 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000424 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700425
qyearsley1fdfcb62016-10-24 13:22:03 -0700426 if options.bucket:
427 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000428 option_parser.error(
Edward Lemur5ef16a32019-11-11 21:13:25 +0000429 'Please specify the bucket, e.g. "-B chromium/try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700430
431
Edward Lemur6215c792019-10-03 21:59:05 +0000432def _parse_bucket(raw_bucket):
433 legacy = True
434 project = bucket = None
435 if '/' in raw_bucket:
436 legacy = False
437 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000438 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000439 elif raw_bucket.startswith('luci.'):
440 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000441 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000442 elif '.' in raw_bucket:
443 project = raw_bucket.split('.')[0]
444 bucket = raw_bucket
445 # Legacy buckets.
446 if legacy:
447 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
448 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000449
450
Edward Lemur5b929a42019-10-21 17:57:39 +0000451def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000452 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700453
454 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000455 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 buckets: A nested dict mapping bucket names to builders to tests.
457 options: Command-line options.
458 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000459 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000460 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 print('Bucket:', bucket)
462 print('\n'.join(
463 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000464 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000465 print('To see results here, run: git cl try-results')
466 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700467
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000468 requests = _make_try_job_schedule_requests(
469 changelist, buckets, options, patchset)
470 if not requests:
471 return
472
Edward Lemur5b929a42019-10-21 17:57:39 +0000473 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000474 http.force_exception_to_status_code = True
475
476 batch_request = {'requests': requests}
477 batch_response = _call_buildbucket(
478 http, options.buildbucket_host, 'Batch', batch_request)
479
480 errors = [
481 ' ' + response['error']['message']
482 for response in batch_response.get('responses', [])
483 if 'error' in response
484 ]
485 if errors:
486 raise BuildbucketResponseException(
487 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
488
489
490def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000491 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000492 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000493 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000494 shared_properties['clobber'] = True
495 shared_properties.update(_get_properties_from_options(options) or {})
496
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000497 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
498 if options.retry_failed:
499 shared_tags.append({'key': 'retry_failed',
500 'value': '1'})
501
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000502 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000503 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000504 project, bucket = _parse_bucket(raw_bucket)
505 if not project or not bucket:
506 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
507 continue
508
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000509 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000510 properties = shared_properties.copy()
511 if 'presubmit' in builder.lower():
512 properties['dry_run'] = 'true'
513 if tests:
514 properties['testfilter'] = tests
515
516 requests.append({
517 'scheduleBuild': {
518 'requestId': str(uuid.uuid4()),
519 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000520 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000521 'bucket': bucket,
522 'builder': builder,
523 },
524 'gerritChanges': gerrit_changes,
525 'properties': properties,
526 'tags': [
527 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000528 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000529 }
530 })
Anthony Polito1a5fe232020-01-24 23:17:52 +0000531
532 if options.revision:
533 requests[-1]['scheduleBuild']['gitilesCommit'] = {
534 'host': gerrit_changes[0]['host'],
535 'project': gerrit_changes[0]['project'],
536 'id': options.revision
537 }
538
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000539 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000540
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000541
Edward Lemur5b929a42019-10-21 17:57:39 +0000542def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000543 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000545 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000547 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000548 request = {
549 'predicate': {
550 'gerritChanges': [changelist.GetGerritChange(patchset)],
551 },
552 'fields': ','.join('builds.*.' + field for field in fields),
553 }
tandrii221ab252016-10-06 08:12:04 -0700554
Edward Lemur5b929a42019-10-21 17:57:39 +0000555 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 if authenticator.has_cached_credentials():
557 http = authenticator.authorize(httplib2.Http())
558 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700559 print('Warning: Some results might be missing because %s' %
560 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000561 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000562 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000563 http.force_exception_to_status_code = True
564
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
566 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
Edward Lemur5b929a42019-10-21 17:57:39 +0000568def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000569 """Fetches builds from the latest patchset that has builds (within
570 the last few patchsets).
571
572 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000573 changelist (Changelist): The CL to fetch builds for
574 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000575 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
576 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000577 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000578 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
579 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000580 """
581 assert buildbucket_host
582 assert changelist.GetIssue(), 'CL must be uploaded first'
583 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000584 if latest_patchset is None:
585 assert changelist.GetMostRecentPatchset()
586 ps = changelist.GetMostRecentPatchset()
587 else:
588 assert latest_patchset > 0, latest_patchset
589 ps = latest_patchset
590
Quinten Yearsley983111f2019-09-26 17:18:48 +0000591 min_ps = max(1, ps - 5)
592 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000593 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000594 if len(builds):
595 return builds, ps
596 ps -= 1
597 return [], 0
598
599
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000600def _filter_failed_for_retry(all_builds):
601 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000602
603 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000604 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000605 i.e. a list of buildbucket.v2.Builds which includes status and builder
606 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000607
608 Returns:
609 A dict of bucket to builder to tests (empty list). This is the same format
610 accepted by _trigger_try_jobs and returned by _get_bucket_map.
611 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000612
613 def _builder_of(build):
614 builder = build['builder']
615 return (builder['project'], builder['bucket'], builder['builder'])
616
617 res = collections.defaultdict(dict)
618 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
619 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
620 # If builder had several builds, retry only if the last one failed.
621 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
622 # build, but in case of retrying failed jobs retrying a flaky one makes
623 # sense.
624 builds = list(builds)
625 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
626 continue
627 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
628 for t in builds[-1]['tags']):
629 # Don't retry experimental build previously triggered by CQ.
630 continue
631 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
632 # Don't retry if any are running.
633 continue
634 res[proj + '/' + buck][bldr] = []
635 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000636
637
qyearsleyeab3c042016-08-24 09:18:28 -0700638def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639 """Prints nicely result of fetch_try_jobs."""
640 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000641 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000642 return
643
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000644 longest_builder = max(len(b['builder']['builder']) for b in builds)
645 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000646 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000647 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
648 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000650 builds_by_status = {}
651 for b in builds:
652 builds_by_status.setdefault(b['status'], []).append({
653 'id': b['id'],
654 'name': name_fmt.format(
655 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
656 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000657
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000658 sort_key = lambda b: (b['name'], b['id'])
659
660 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000661 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000662 if not builds:
663 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000664
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000665 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000666 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000667 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000668 else:
669 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
670
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000671 print(colorize(title))
672 for b in sorted(builds, key=sort_key):
673 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674
675 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000676 print_builds(
677 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
678 print_builds(
679 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
680 color=Fore.MAGENTA)
681 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
682 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
683 color=Fore.MAGENTA)
684 print_builds('Started:', builds_by_status.pop('STARTED', []))
685 print_builds(
686 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000687 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000688 print_builds(
689 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000690 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000691
692
Aiden Bennerc08566e2018-10-03 17:52:42 +0000693def _ComputeDiffLineRanges(files, upstream_commit):
694 """Gets the changed line ranges for each file since upstream_commit.
695
696 Parses a git diff on provided files and returns a dict that maps a file name
697 to an ordered list of range tuples in the form (start_line, count).
698 Ranges are in the same format as a git diff.
699 """
700 # If files is empty then diff_output will be a full diff.
701 if len(files) == 0:
702 return {}
703
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000704 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000705 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000706 diff_output = RunGit(diff_cmd)
707
708 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
709 # 2 capture groups
710 # 0 == fname of diff file
711 # 1 == 'diff_start,diff_count' or 'diff_start'
712 # will match each of
713 # diff --git a/foo.foo b/foo.py
714 # @@ -12,2 +14,3 @@
715 # @@ -12,2 +17 @@
716 # running re.findall on the above string with pattern will give
717 # [('foo.py', ''), ('', '14,3'), ('', '17')]
718
719 curr_file = None
720 line_diffs = {}
721 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
722 if match[0] != '':
723 # Will match the second filename in diff --git a/a.py b/b.py.
724 curr_file = match[0]
725 line_diffs[curr_file] = []
726 else:
727 # Matches +14,3
728 if ',' in match[1]:
729 diff_start, diff_count = match[1].split(',')
730 else:
731 # Single line changes are of the form +12 instead of +12,1.
732 diff_start = match[1]
733 diff_count = 1
734
735 diff_start = int(diff_start)
736 diff_count = int(diff_count)
737
738 # If diff_count == 0 this is a removal we can ignore.
739 line_diffs[curr_file].append((diff_start, diff_count))
740
741 return line_diffs
742
743
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000744def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000745 """Checks if a yapf file is in any parent directory of fpath until top_dir.
746
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000747 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000748 is found returns None. Uses yapf_config_cache as a cache for previously found
749 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000750 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000751 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000752 # Return result if we've already computed it.
753 if fpath in yapf_config_cache:
754 return yapf_config_cache[fpath]
755
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000756 parent_dir = os.path.dirname(fpath)
757 if os.path.isfile(fpath):
758 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000759 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000760 # Otherwise fpath is a directory
761 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
762 if os.path.isfile(yapf_file):
763 ret = yapf_file
764 elif fpath == top_dir or parent_dir == fpath:
765 # If we're at the top level directory, or if we're at root
766 # there is no provided style.
767 ret = None
768 else:
769 # Otherwise recurse on the current directory.
770 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000771 yapf_config_cache[fpath] = ret
772 return ret
773
774
Brian Sheedyb4307d52019-12-02 19:18:17 +0000775def _GetYapfIgnorePatterns(top_dir):
776 """Returns all patterns in the .yapfignore file.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000777
778 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
779 but this functionality appears to break when explicitly passing files to
780 yapf for formatting. According to
781 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
782 the .yapfignore file should be in the directory that yapf is invoked from,
783 which we assume to be the top level directory in this case.
784
785 Args:
786 top_dir: The top level directory for the repository being formatted.
787
788 Returns:
Brian Sheedyb4307d52019-12-02 19:18:17 +0000789 A set of all fnmatch patterns to be ignored.
Brian Sheedy59b06a82019-10-14 17:03:29 +0000790 """
791 yapfignore_file = os.path.join(top_dir, '.yapfignore')
Brian Sheedyb4307d52019-12-02 19:18:17 +0000792 ignore_patterns = set()
Brian Sheedy59b06a82019-10-14 17:03:29 +0000793 if not os.path.exists(yapfignore_file):
Brian Sheedyb4307d52019-12-02 19:18:17 +0000794 return ignore_patterns
Brian Sheedy59b06a82019-10-14 17:03:29 +0000795
Brian Sheedyb4307d52019-12-02 19:18:17 +0000796 with open(yapfignore_file) as f:
797 for line in f.readlines():
798 stripped_line = line.strip()
799 # Comments and blank lines should be ignored.
800 if stripped_line.startswith('#') or stripped_line == '':
801 continue
802 ignore_patterns.add(stripped_line)
803 return ignore_patterns
804
805
806def _FilterYapfIgnoredFiles(filepaths, patterns):
807 """Filters out any filepaths that match any of the given patterns.
808
809 Args:
810 filepaths: An iterable of strings containing filepaths to filter.
811 patterns: An iterable of strings containing fnmatch patterns to filter on.
812
813 Returns:
814 A list of strings containing all the elements of |filepaths| that did not
815 match any of the patterns in |patterns|.
816 """
817 # Not inlined so that tests can use the same implementation.
818 return [f for f in filepaths
819 if not any(fnmatch.fnmatch(f, p) for p in patterns)]
Brian Sheedy59b06a82019-10-14 17:03:29 +0000820
821
Aaron Gable13101a62018-02-09 13:20:41 -0800822def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000823 """Prints statistics about the change to the user."""
824 # --no-ext-diff is broken in some versions of Git, so try to work around
825 # this by overriding the environment (but there is still a problem if the
826 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000827 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000828 if 'GIT_EXTERNAL_DIFF' in env:
829 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000830
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000831 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800832 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
Edward Lemur0db01f02019-11-12 22:01:51 +0000833 env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000834
835
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000836class BuildbucketResponseException(Exception):
837 pass
838
839
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000840class Settings(object):
841 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000842 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000843 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844 self.tree_status_url = None
845 self.viewvc_url = None
846 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000847 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000848 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000849 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000850 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000851 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000852
853 def LazyUpdateIfNeeded(self):
854 """Updates the settings from a codereview.settings file, if available."""
855 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000856 # The only value that actually changes the behavior is
857 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000858 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000859 error_ok=True
860 ).strip().lower()
861
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000862 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000863 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000864 LoadCodereviewSettingsFromFile(cr_settings_file)
865 self.updated = True
866
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000867 @staticmethod
868 def GetRelativeRoot():
869 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000870
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000871 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000872 if self.root is None:
873 self.root = os.path.abspath(self.GetRelativeRoot())
874 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000876 def GetTreeStatusUrl(self, error_ok=False):
877 if not self.tree_status_url:
878 error_message = ('You must configure your tree status URL by running '
879 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000880 self.tree_status_url = self._GetConfig(
881 'rietveld.tree-status-url', error_ok=error_ok,
882 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 return self.tree_status_url
884
885 def GetViewVCUrl(self):
886 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000887 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000888 return self.viewvc_url
889
rmistry@google.com90752582014-01-14 21:04:50 +0000890 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000891 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000892
rmistry@google.com5626a922015-02-26 14:03:30 +0000893 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000894 run_post_upload_hook = self._GetConfig(
895 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000896 return run_post_upload_hook == "True"
897
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000898 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000899 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000900
ukai@chromium.orge8077812012-02-03 03:41:46 +0000901 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000902 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000903 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700904 self.is_gerrit = (
905 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 return self.is_gerrit
907
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000908 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000909 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000910 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700911 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
912 if self.squash_gerrit_uploads is None:
913 # Default is squash now (http://crbug.com/611892#c23).
914 self.squash_gerrit_uploads = not (
915 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
916 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000917 return self.squash_gerrit_uploads
918
tandriia60502f2016-06-20 02:01:53 -0700919 def GetSquashGerritUploadsOverride(self):
920 """Return True or False if codereview.settings should be overridden.
921
922 Returns None if no override has been defined.
923 """
924 # See also http://crbug.com/611892#c23
925 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
926 error_ok=True).strip()
927 if result == 'true':
928 return True
929 if result == 'false':
930 return False
931 return None
932
tandrii@chromium.org28253532016-04-14 13:46:56 +0000933 def GetGerritSkipEnsureAuthenticated(self):
934 """Return True if EnsureAuthenticated should not be done for Gerrit
935 uploads."""
936 if self.gerrit_skip_ensure_authenticated is None:
937 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000938 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000939 error_ok=True).strip() == 'true')
940 return self.gerrit_skip_ensure_authenticated
941
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000942 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000943 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000944 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000945 # Git requires single quotes for paths with spaces. We need to replace
946 # them with double quotes for Windows to treat such paths as a single
947 # path.
948 self.git_editor = self._GetConfig(
949 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000950 return self.git_editor or None
951
thestig@chromium.org44202a22014-03-11 19:22:18 +0000952 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000953 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000954 DEFAULT_LINT_REGEX)
955
956 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000957 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000958 DEFAULT_LINT_IGNORE_REGEX)
959
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000960 def GetFormatFullByDefault(self):
961 if self.format_full_by_default is None:
962 result = (
963 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
964 error_ok=True).strip())
965 self.format_full_by_default = (result == 'true')
966 return self.format_full_by_default
967
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000968 def _GetConfig(self, param, **kwargs):
969 self.LazyUpdateIfNeeded()
970 return RunGit(['config', param], **kwargs).strip()
971
972
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000973def ShortBranchName(branch):
974 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000975 return branch.replace('refs/heads/', '', 1)
976
977
978def GetCurrentBranchRef():
979 """Returns branch ref (e.g., refs/heads/master) or None."""
980 return RunGit(['symbolic-ref', 'HEAD'],
981 stderr=subprocess2.VOID, error_ok=True).strip() or None
982
983
984def GetCurrentBranch():
985 """Returns current branch or None.
986
987 For refs/heads/* branches, returns just last part. For others, full ref.
988 """
989 branchref = GetCurrentBranchRef()
990 if branchref:
991 return ShortBranchName(branchref)
992 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000993
994
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000995class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000996 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000997 NONE = 'none'
998 DRY_RUN = 'dry_run'
999 COMMIT = 'commit'
1000
1001 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1002
1003
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001004class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +00001005 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001006 self.issue = issue
1007 self.patchset = patchset
1008 self.hostname = hostname
1009
1010 @property
1011 def valid(self):
1012 return self.issue is not None
1013
1014
Edward Lemurf38bc172019-09-03 21:02:13 +00001015def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001016 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1017 fail_result = _ParsedIssueNumberArgument()
1018
Edward Lemur678a6842019-10-03 22:25:05 +00001019 if isinstance(arg, int):
1020 return _ParsedIssueNumberArgument(issue=arg)
1021 if not isinstance(arg, basestring):
1022 return fail_result
1023
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001024 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001025 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001026 if not arg.startswith('http'):
1027 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001028
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001029 url = gclient_utils.UpgradeToHttps(arg)
1030 try:
Edward Lemur79d4f992019-11-11 23:49:02 +00001031 parsed_url = urllib.parse.urlparse(url)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001032 except ValueError:
1033 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001034
Edward Lemur678a6842019-10-03 22:25:05 +00001035 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1036 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1037 # Short urls like https://domain/<issue_number> can be used, but don't allow
1038 # specifying the patchset (you'd 404), but we allow that here.
1039 if parsed_url.path == '/':
1040 part = parsed_url.fragment
1041 else:
1042 part = parsed_url.path
1043
1044 match = re.match(
1045 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1046 if not match:
1047 return fail_result
1048
1049 issue = int(match.group('issue'))
1050 patchset = match.group('patchset')
1051 return _ParsedIssueNumberArgument(
1052 issue=issue,
1053 patchset=int(patchset) if patchset else None,
1054 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055
1056
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001057def _create_description_from_log(args):
1058 """Pulls out the commit log to use as a base for the CL description."""
1059 log_args = []
1060 if len(args) == 1 and not args[0].endswith('.'):
1061 log_args = [args[0] + '..']
1062 elif len(args) == 1 and args[0].endswith('...'):
1063 log_args = [args[0][:-1]]
1064 elif len(args) == 2:
1065 log_args = [args[0] + '..' + args[1]]
1066 else:
1067 log_args = args[:] # Hope for the best!
1068 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1069
1070
Aaron Gablea45ee112016-11-22 15:14:38 -08001071class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001072 def __init__(self, issue, url):
1073 self.issue = issue
1074 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001075 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001076
1077 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001078 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001079 self.issue, self.url)
1080
1081
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001082_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001083 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001084 # TODO(tandrii): these two aren't known in Gerrit.
1085 'approval', 'disapproval'])
1086
1087
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001089 """Changelist works with one changelist in local branch.
1090
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001091 Notes:
1092 * Not safe for concurrent multi-{thread,process} use.
1093 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001094 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001095 """
1096
Edward Lemur125d60a2019-09-13 18:25:41 +00001097 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001098 """Create a new ChangeList instance.
1099
Edward Lemurf38bc172019-09-03 21:02:13 +00001100 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001101 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001103 global settings
1104 if not settings:
1105 # Happens when git_cl.py is used as a utility library.
1106 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108 self.branchref = branchref
1109 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001110 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111 self.branch = ShortBranchName(self.branchref)
1112 else:
1113 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001114 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001115 self.lookedup_issue = False
1116 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117 self.has_description = False
1118 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001119 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001121 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001122 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001123 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001124 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001125
Edward Lemur125d60a2019-09-13 18:25:41 +00001126 # Lazily cached values.
1127 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1128 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1129 # Map from change number (issue) to its detail cache.
1130 self._detail_cache = {}
1131
1132 if codereview_host is not None:
1133 assert not codereview_host.startswith('https://'), codereview_host
1134 self._gerrit_host = codereview_host
1135 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001136
1137 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001138 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001139
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001140 The return value is a string suitable for passing to git cl with the --cc
1141 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001142 """
1143 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001144 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001145 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001146 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1147 return self.cc
1148
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001149 def GetCCListWithoutDefault(self):
1150 """Return the users cc'd on this CL excluding default ones."""
1151 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001152 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001153 return self.cc
1154
Daniel Cheng7227d212017-11-17 08:12:37 -08001155 def ExtendCC(self, more_cc):
1156 """Extends the list of users to cc on this CL based on the changed files."""
1157 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158
1159 def GetBranch(self):
1160 """Returns the short branch name, e.g. 'master'."""
1161 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001163 if not branchref:
1164 return None
1165 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001166 self.branch = ShortBranchName(self.branchref)
1167 return self.branch
1168
1169 def GetBranchRef(self):
1170 """Returns the full branch name, e.g. 'refs/heads/master'."""
1171 self.GetBranch() # Poke the lazy loader.
1172 return self.branchref
1173
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001174 def ClearBranch(self):
1175 """Clears cached branch data of this object."""
1176 self.branch = self.branchref = None
1177
tandrii5d48c322016-08-18 16:19:37 -07001178 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1179 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1180 kwargs['branch'] = self.GetBranch()
1181 return _git_get_branch_config_value(key, default, **kwargs)
1182
1183 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1184 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1185 assert self.GetBranch(), (
1186 'this CL must have an associated branch to %sset %s%s' %
1187 ('un' if value is None else '',
1188 key,
1189 '' if value is None else ' to %r' % value))
1190 kwargs['branch'] = self.GetBranch()
1191 return _git_set_branch_config_value(key, value, **kwargs)
1192
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001193 @staticmethod
1194 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001195 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001196 e.g. 'origin', 'refs/heads/master'
1197 """
1198 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001199 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1200
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001202 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001203 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001204 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1205 error_ok=True).strip()
1206 if upstream_branch:
1207 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001208 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001209 # Else, try to guess the origin remote.
1210 remote_branches = RunGit(['branch', '-r']).split()
1211 if 'origin/master' in remote_branches:
1212 # Fall back on origin/master if it exits.
1213 remote = 'origin'
1214 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001216 DieWithError(
1217 'Unable to determine default branch to diff against.\n'
1218 'Either pass complete "git diff"-style arguments, like\n'
1219 ' git cl upload origin/master\n'
1220 'or verify this branch is set up to track another \n'
1221 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222
1223 return remote, upstream_branch
1224
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001225 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001226 upstream_branch = self.GetUpstreamBranch()
1227 if not BranchExists(upstream_branch):
1228 DieWithError('The upstream for the current branch (%s) does not exist '
1229 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001230 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001231 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001232
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001233 def GetUpstreamBranch(self):
1234 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001235 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001236 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001237 upstream_branch = upstream_branch.replace('refs/heads/',
1238 'refs/remotes/%s/' % remote)
1239 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1240 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001241 self.upstream_branch = upstream_branch
1242 return self.upstream_branch
1243
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001244 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001245 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001246 remote, branch = None, self.GetBranch()
1247 seen_branches = set()
1248 while branch not in seen_branches:
1249 seen_branches.add(branch)
1250 remote, branch = self.FetchUpstreamTuple(branch)
1251 branch = ShortBranchName(branch)
1252 if remote != '.' or branch.startswith('refs/remotes'):
1253 break
1254 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001255 remotes = RunGit(['remote'], error_ok=True).split()
1256 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001258 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001259 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001260 logging.warn('Could not determine which remote this change is '
1261 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001262 else:
1263 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001264 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001265 branch = 'HEAD'
1266 if branch.startswith('refs/remotes'):
1267 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001268 elif branch.startswith('refs/branch-heads/'):
1269 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001270 else:
1271 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001272 return self._remote
1273
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001274 def GitSanityChecks(self, upstream_git_obj):
1275 """Checks git repo status and ensures diff is from local commits."""
1276
sbc@chromium.org79706062015-01-14 21:18:12 +00001277 if upstream_git_obj is None:
1278 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001279 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001280 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001281 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001282 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001283 return False
1284
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 # Verify the commit we're diffing against is in our current branch.
1286 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1287 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1288 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001289 print('ERROR: %s is not in the current branch. You may need to rebase '
1290 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 return False
1292
1293 # List the commits inside the diff, and verify they are all local.
1294 commits_in_diff = RunGit(
1295 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1296 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1297 remote_branch = remote_branch.strip()
1298 if code != 0:
1299 _, remote_branch = self.GetRemoteBranch()
1300
1301 commits_in_remote = RunGit(
1302 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1303
1304 common_commits = set(commits_in_diff) & set(commits_in_remote)
1305 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001306 print('ERROR: Your diff contains %d commits already in %s.\n'
1307 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1308 'the diff. If you are using a custom git flow, you can override'
1309 ' the reference used for this check with "git config '
1310 'gitcl.remotebranch <git-ref>".' % (
1311 len(common_commits), remote_branch, upstream_git_obj),
1312 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001313 return False
1314 return True
1315
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001316 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001317 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001318
1319 Returns None if it is not set.
1320 """
tandrii5d48c322016-08-18 16:19:37 -07001321 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001323 def GetRemoteUrl(self):
1324 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1325
1326 Returns None if there is no remote.
1327 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001328 is_cached, value = self._cached_remote_url
1329 if is_cached:
1330 return value
1331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001333 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1334
Edward Lemur298f2cf2019-02-22 21:40:39 +00001335 # Check if the remote url can be parsed as an URL.
Edward Lemur79d4f992019-11-11 23:49:02 +00001336 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001337 if host:
1338 self._cached_remote_url = (True, url)
1339 return url
1340
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001341 # If it cannot be parsed as an url, assume it is a local directory,
1342 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001343 logging.warning('"%s" doesn\'t appear to point to a git host. '
1344 'Interpreting it as a local directory.', url)
1345 if not os.path.isdir(url):
1346 logging.error(
1347 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001348 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001349 return None
1350
1351 cache_path = url
1352 url = RunGit(['config', 'remote.%s.url' % remote],
1353 error_ok=True,
1354 cwd=url).strip()
1355
Edward Lemur79d4f992019-11-11 23:49:02 +00001356 host = urllib.parse.urlparse(url).netloc
Edward Lemur298f2cf2019-02-22 21:40:39 +00001357 if not host:
1358 logging.error(
1359 'Remote "%(remote)s" for branch "%(branch)s" points to '
1360 '"%(cache_path)s", but it is misconfigured.\n'
1361 '"%(cache_path)s" must be a git repo and must have a remote named '
1362 '"%(remote)s" pointing to the git host.', {
1363 'remote': remote,
1364 'cache_path': cache_path,
1365 'branch': self.GetBranch()})
1366 return None
1367
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001368 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001369 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001371 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001372 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001373 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001374 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001375 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001376 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001377 return self.issue
1378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 def GetIssueURL(self):
1380 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001381 issue = self.GetIssue()
1382 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001383 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001384 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001386 def GetDescription(self, pretty=False, force=False):
1387 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001389 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001390 self.has_description = True
1391 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001392 # Set width to 72 columns + 2 space indent.
1393 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001395 lines = self.description.splitlines()
1396 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001397 return self.description
1398
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001399 def GetDescriptionFooters(self):
1400 """Returns (non_footer_lines, footers) for the commit message.
1401
1402 Returns:
1403 non_footer_lines (list(str)) - Simple list of description lines without
1404 any footer. The lines do not contain newlines, nor does the list contain
1405 the empty line between the message and the footers.
1406 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1407 [("Change-Id", "Ideadbeef...."), ...]
1408 """
1409 raw_description = self.GetDescription()
1410 msg_lines, _, footers = git_footers.split_footers(raw_description)
1411 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001412 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001413 return msg_lines, footers
1414
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001416 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001417 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001418 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001419 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001420 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 return self.patchset
1422
1423 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001424 """Set this branch's patchset. If patchset=0, clears the patchset."""
1425 assert self.GetBranch()
1426 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001427 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001428 else:
1429 self.patchset = int(patchset)
1430 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001431 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001432
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001433 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001434 """Set this branch's issue. If issue isn't given, clears the issue."""
1435 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001436 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001437 issue = int(issue)
1438 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001439 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001440 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001441 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001442 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001443 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001444 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001445 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001446 else:
tandrii5d48c322016-08-18 16:19:37 -07001447 # Reset all of these just to be clean.
1448 reset_suffixes = [
1449 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001450 self.IssueConfigKey(),
1451 self.PatchsetConfigKey(),
1452 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001453 ] + self._PostUnsetIssueProperties()
1454 for prop in reset_suffixes:
1455 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001456 msg = RunGit(['log', '-1', '--format=%B']).strip()
1457 if msg and git_footers.get_footer_change_id(msg):
1458 print('WARNING: The change patched into this branch has a Change-Id. '
1459 'Removing it.')
1460 RunGit(['commit', '--amend', '-m',
1461 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001462 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001463 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001464 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001465
dnjba1b0f32016-09-02 12:37:42 -07001466 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001467 if not self.GitSanityChecks(upstream_branch):
1468 DieWithError('\nGit sanity check failure')
1469
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001470 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001471 if not root:
1472 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001473 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001474
1475 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001476 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001477 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001478 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001479 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001480 except subprocess2.CalledProcessError:
1481 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001482 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001483 'This branch probably doesn\'t exist anymore. To reset the\n'
1484 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001485 ' git branch --set-upstream-to origin/master %s\n'
1486 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001487 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001488
maruel@chromium.org52424302012-08-29 15:14:30 +00001489 issue = self.GetIssue()
1490 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001491 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001492 description = self.GetDescription()
1493 else:
1494 # If the change was never uploaded, use the log messages of all commits
1495 # up to the branch point, as git cl upload will prefill the description
1496 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001497 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1498 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001499
1500 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001501 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001502 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001503 name,
1504 description,
1505 absroot,
1506 files,
1507 issue,
1508 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001509 author,
1510 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001511
dsansomee2d6fd92016-09-08 00:10:47 -07001512 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001513 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001514 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001515 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001516
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001517 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1518 """Sets the description for this CL remotely.
1519
1520 You can get description_lines and footers with GetDescriptionFooters.
1521
1522 Args:
1523 description_lines (list(str)) - List of CL description lines without
1524 newline characters.
1525 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1526 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1527 `List-Of-Tokens`). It will be case-normalized so that each token is
1528 title-cased.
1529 """
1530 new_description = '\n'.join(description_lines)
1531 if footers:
1532 new_description += '\n'
1533 for k, v in footers:
1534 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1535 if not git_footers.FOOTER_PATTERN.match(foot):
1536 raise ValueError('Invalid footer %r' % foot)
1537 new_description += foot + '\n'
1538 self.UpdateDescription(new_description, force)
1539
Edward Lesmes8e282792018-04-03 18:50:29 -04001540 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001541 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1542 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001543 start = time_time()
1544 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001545 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1546 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001547 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001548 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001549 metrics.collector.add_repeated('sub_commands', {
1550 'command': 'presubmit',
1551 'execution_time': time_time() - start,
1552 'exit_code': 0 if result.should_continue() else 1,
1553 })
1554 return result
vapierfd77ac72016-06-16 08:33:57 -07001555 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001556 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001557
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558 def CMDUpload(self, options, git_diff_args, orig_args):
1559 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001560 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001561 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001562 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001563 else:
1564 if self.GetBranch() is None:
1565 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1566
1567 # Default to diffing against common ancestor of upstream branch
1568 base_branch = self.GetCommonAncestorWithUpstream()
1569 git_diff_args = [base_branch, 'HEAD']
1570
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001571 # Fast best-effort checks to abort before running potentially expensive
1572 # hooks if uploading is likely to fail anyway. Passing these checks does
1573 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001574 self.EnsureAuthenticated(force=options.force)
1575 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576
1577 # Apply watchlists on upload.
1578 change = self.GetChange(base_branch, None)
1579 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1580 files = [f.LocalPath() for f in change.AffectedFiles()]
1581 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001582 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583
1584 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001585 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 # Set the reviewer list now so that presubmit checks can access it.
1587 change_description = ChangeDescription(change.FullDescriptionText())
1588 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001589 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001590 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591 change)
1592 change.SetDescriptionText(change_description.description)
1593 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001594 may_prompt=not options.force,
1595 verbose=options.verbose,
1596 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597 if not hook_results.should_continue():
1598 return 1
1599 if not options.reviewers and hook_results.reviewers:
1600 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001601 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001602
Aaron Gable13101a62018-02-09 13:20:41 -08001603 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001604 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001606 _git_set_branch_config_value('last-upload-hash',
1607 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001608 # Run post upload hooks, if specified.
1609 if settings.GetRunPostUploadHook():
1610 presubmit_support.DoPostUploadExecuter(
1611 change,
1612 self,
1613 settings.GetRoot(),
1614 options.verbose,
1615 sys.stdout)
1616
1617 # Upload all dependencies if specified.
1618 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001619 print()
1620 print('--dependencies has been specified.')
1621 print('All dependent local branches will be re-uploaded.')
1622 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001623 # Remove the dependencies flag from args so that we do not end up in a
1624 # loop.
1625 orig_args.remove('--dependencies')
1626 ret = upload_branch_deps(self, orig_args)
1627 return ret
1628
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001629 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001630 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001631
1632 Issue must have been already uploaded and known.
1633 """
1634 assert new_state in _CQState.ALL_STATES
1635 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001636 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001637 vote_map = {
1638 _CQState.NONE: 0,
1639 _CQState.DRY_RUN: 1,
1640 _CQState.COMMIT: 2,
1641 }
1642 labels = {'Commit-Queue': vote_map[new_state]}
1643 notify = False if new_state == _CQState.DRY_RUN else None
1644 gerrit_util.SetReview(
1645 self._GetGerritHost(), self._GerritChangeIdentifier(),
1646 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001647 return 0
1648 except KeyboardInterrupt:
1649 raise
1650 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001651 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001652 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001653 ' * Your project has no CQ,\n'
1654 ' * You don\'t have permission to change the CQ state,\n'
1655 ' * There\'s a bug in this code (see stack trace below).\n'
1656 'Consider specifying which bots to trigger manually or asking your '
1657 'project owners for permissions or contacting Chrome Infra at:\n'
1658 'https://www.chromium.org/infra\n\n' %
1659 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001660 # Still raise exception so that stack trace is printed.
1661 raise
1662
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001663 def _GetGerritHost(self):
1664 # Lazy load of configs.
1665 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001666 if self._gerrit_host and '.' not in self._gerrit_host:
1667 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1668 # This happens for internal stuff http://crbug.com/614312.
Edward Lemur79d4f992019-11-11 23:49:02 +00001669 parsed = urllib.parse.urlparse(self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001670 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001671 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001672 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001673 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1674 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675 return self._gerrit_host
1676
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001677 def _GetGitHost(self):
1678 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001679 remote_url = self.GetRemoteUrl()
1680 if not remote_url:
1681 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001682 return urllib.parse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001683
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001684 def GetCodereviewServer(self):
1685 if not self._gerrit_server:
1686 # If we're on a branch then get the server potentially associated
1687 # with that branch.
1688 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001689 self._gerrit_server = self._GitGetBranchConfigValue(
1690 self.CodereviewServerConfigKey())
1691 if self._gerrit_server:
Edward Lemur79d4f992019-11-11 23:49:02 +00001692 self._gerrit_host = urllib.parse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001693 if not self._gerrit_server:
1694 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1695 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001696 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001697 parts[0] = parts[0] + '-review'
1698 self._gerrit_host = '.'.join(parts)
1699 self._gerrit_server = 'https://%s' % self._gerrit_host
1700 return self._gerrit_server
1701
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001702 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001703 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001704 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001705 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001706 logging.warn('can\'t detect Gerrit project.')
1707 return None
Edward Lemur79d4f992019-11-11 23:49:02 +00001708 project = urllib.parse.urlparse(remote_url).path.strip('/')
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001709 if project.endswith('.git'):
1710 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001711 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1712 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1713 # gitiles/git-over-https protocol. E.g.,
1714 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1715 # as
1716 # https://chromium.googlesource.com/v8/v8
1717 if project.startswith('a/'):
1718 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001719 return project
1720
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001721 def _GerritChangeIdentifier(self):
1722 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1723
1724 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001725 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001726 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001727 project = self._GetGerritProject()
1728 if project:
1729 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1730 # Fall back on still unique, but less efficient change number.
1731 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001732
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001733 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001734 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001735 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001736
tandrii5d48c322016-08-18 16:19:37 -07001737 @classmethod
1738 def PatchsetConfigKey(cls):
1739 return 'gerritpatchset'
1740
1741 @classmethod
1742 def CodereviewServerConfigKey(cls):
1743 return 'gerritserver'
1744
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001745 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001746 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001747 if settings.GetGerritSkipEnsureAuthenticated():
1748 # For projects with unusual authentication schemes.
1749 # See http://crbug.com/603378.
1750 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001751
1752 # Check presence of cookies only if using cookies-based auth method.
1753 cookie_auth = gerrit_util.Authenticator.get()
1754 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001755 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001756
Florian Mayerae510e82020-01-30 21:04:48 +00001757 remote_url = self.GetRemoteUrl()
1758 if remote_url is None:
1759 print('WARNING: invalid remote')
1760 return
1761 if urllib.parse.urlparse(remote_url).scheme != 'https':
Daniel Chengcf6269b2019-05-18 01:02:12 +00001762 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001763 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001764 return
1765
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001766 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001767 self.GetCodereviewServer()
1768 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001769 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001770
1771 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1772 git_auth = cookie_auth.get_auth_header(git_host)
1773 if gerrit_auth and git_auth:
1774 if gerrit_auth == git_auth:
1775 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001776 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001777 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001778 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001779 ' %s\n'
1780 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001781 ' Consider running the following command:\n'
1782 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001783 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001784 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001785 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001786 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001787 cookie_auth.get_new_password_message(git_host)))
1788 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001789 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001790 return
1791 else:
1792 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001793 ([] if gerrit_auth else [self._gerrit_host]) +
1794 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001795 DieWithError('Credentials for the following hosts are required:\n'
1796 ' %s\n'
1797 'These are read from %s (or legacy %s)\n'
1798 '%s' % (
1799 '\n '.join(missing),
1800 cookie_auth.get_gitcookies_path(),
1801 cookie_auth.get_netrc_path(),
1802 cookie_auth.get_new_password_message(git_host)))
1803
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001804 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001805 if not self.GetIssue():
1806 return
1807
1808 # Warm change details cache now to avoid RPCs later, reducing latency for
1809 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001810 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001811 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001812
1813 status = self._GetChangeDetail()['status']
1814 if status in ('MERGED', 'ABANDONED'):
1815 DieWithError('Change %s has been %s, new uploads are not allowed' %
1816 (self.GetIssueURL(),
1817 'submitted' if status == 'MERGED' else 'abandoned'))
1818
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001819 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1820 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1821 # Apparently this check is not very important? Otherwise get_auth_email
1822 # could have been added to other implementations of Authenticator.
1823 cookies_auth = gerrit_util.Authenticator.get()
1824 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001825 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001826
1827 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001828 if self.GetIssueOwner() == cookies_user:
1829 return
1830 logging.debug('change %s owner is %s, cookies user is %s',
1831 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001832 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001833 # so ask what Gerrit thinks of this user.
1834 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1835 if details['email'] == self.GetIssueOwner():
1836 return
1837 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001838 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001839 'as %s.\n'
1840 'Uploading may fail due to lack of permissions.' %
1841 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1842 confirm_or_exit(action='upload')
1843
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001844 def _PostUnsetIssueProperties(self):
1845 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001846 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001847
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001848 def GetGerritObjForPresubmit(self):
1849 return presubmit_support.GerritAccessor(self._GetGerritHost())
1850
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001851 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001852 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001853 or CQ status, assuming adherence to a common workflow.
1854
1855 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001856 * 'error' - error from review tool (including deleted issues)
1857 * 'unsent' - no reviewers added
1858 * 'waiting' - waiting for review
1859 * 'reply' - waiting for uploader to reply to review
1860 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001861 * 'dry-run' - dry-running in the CQ
1862 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001863 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001864 """
1865 if not self.GetIssue():
1866 return None
1867
1868 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001869 data = self._GetChangeDetail([
1870 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Edward Lemur79d4f992019-11-11 23:49:02 +00001871 except GerritChangeNotExists:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001872 return 'error'
1873
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001874 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001875 return 'closed'
1876
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001877 cq_label = data['labels'].get('Commit-Queue', {})
1878 max_cq_vote = 0
1879 for vote in cq_label.get('all', []):
1880 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1881 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001882 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001883 if max_cq_vote == 1:
1884 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001885
Aaron Gable9ab38c62017-04-06 14:36:33 -07001886 if data['labels'].get('Code-Review', {}).get('approved'):
1887 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001888
1889 if not data.get('reviewers', {}).get('REVIEWER', []):
1890 return 'unsent'
1891
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001892 owner = data['owner'].get('_account_id')
Edward Lemur79d4f992019-11-11 23:49:02 +00001893 messages = sorted(data.get('messages', []), key=lambda m: m.get('date'))
Aaron Gable9ab38c62017-04-06 14:36:33 -07001894 last_message_author = messages.pop().get('author', {})
1895 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001896 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1897 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001898 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001899 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001900 if last_message_author.get('_account_id') == owner:
1901 # Most recent message was by owner.
1902 return 'waiting'
1903 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001904 # Some reply from non-owner.
1905 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001906
1907 # Somehow there are no messages even though there are reviewers.
1908 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001909
1910 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001911 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001912 patchset = data['revisions'][data['current_revision']]['_number']
1913 self.SetPatchset(patchset)
1914 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001916 def FetchDescription(self, force=False):
1917 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1918 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001919 current_rev = data['current_revision']
Edward Lemur79d4f992019-11-11 23:49:02 +00001920 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921
dsansomee2d6fd92016-09-08 00:10:47 -07001922 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001923 if gerrit_util.HasPendingChangeEdit(
1924 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001925 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001926 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001927 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001928 'unpublished edit. Either publish the edit in the Gerrit web UI '
1929 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001930
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001931 gerrit_util.DeletePendingChangeEdit(
1932 self._GetGerritHost(), self._GerritChangeIdentifier())
1933 gerrit_util.SetCommitMessage(
1934 self._GetGerritHost(), self._GerritChangeIdentifier(),
1935 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936
Aaron Gable636b13f2017-07-14 10:42:48 -07001937 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001938 gerrit_util.SetReview(
1939 self._GetGerritHost(), self._GerritChangeIdentifier(),
1940 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001941
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001942 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001943 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001944 # CURRENT_REVISION is included to get the latest patchset so that
1945 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001946 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001947 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1948 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001949 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001950 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001951 robot_file_comments = gerrit_util.GetChangeRobotComments(
1952 self._GetGerritHost(), self._GerritChangeIdentifier())
1953
1954 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001955 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001956 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001957 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001958 line_comments = file_comments.setdefault(path, [])
1959 line_comments.extend(
1960 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001961
1962 # Build dictionary of file comments for easy access and sorting later.
1963 # {author+date: {path: {patchset: {line: url+message}}}}
1964 comments = collections.defaultdict(
1965 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001966 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001967 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001968 tag = comment.get('tag', '')
1969 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001970 continue
1971 key = (comment['author']['email'], comment['updated'])
1972 if comment.get('side', 'REVISION') == 'PARENT':
1973 patchset = 'Base'
1974 else:
1975 patchset = 'PS%d' % comment['patch_set']
1976 line = comment.get('line', 0)
1977 url = ('https://%s/c/%s/%s/%s#%s%s' %
1978 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1979 'b' if comment.get('side') == 'PARENT' else '',
1980 str(line) if line else ''))
1981 comments[key][path][patchset][line] = (url, comment['message'])
1982
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001983 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001984 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001985 summary = self._BuildCommentSummary(msg, comments, readable)
1986 if summary:
1987 summaries.append(summary)
1988 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001989
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001990 @staticmethod
1991 def _BuildCommentSummary(msg, comments, readable):
1992 key = (msg['author']['email'], msg['date'])
1993 # Don't bother showing autogenerated messages that don't have associated
1994 # file or line comments. this will filter out most autogenerated
1995 # messages, but will keep robot comments like those from Tricium.
1996 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1997 if is_autogenerated and not comments.get(key):
1998 return None
1999 message = msg['message']
2000 # Gerrit spits out nanoseconds.
2001 assert len(msg['date'].split('.')[-1]) == 9
2002 date = datetime.datetime.strptime(msg['date'][:-3],
2003 '%Y-%m-%d %H:%M:%S.%f')
2004 if key in comments:
2005 message += '\n'
2006 for path, patchsets in sorted(comments.get(key, {}).items()):
2007 if readable:
2008 message += '\n%s' % path
2009 for patchset, lines in sorted(patchsets.items()):
2010 for line, (url, content) in sorted(lines.items()):
2011 if line:
2012 line_str = 'Line %d' % line
2013 path_str = '%s:%d:' % (path, line)
2014 else:
2015 line_str = 'File comment'
2016 path_str = '%s:0:' % path
2017 if readable:
2018 message += '\n %s, %s: %s' % (patchset, line_str, url)
2019 message += '\n %s\n' % content
2020 else:
2021 message += '\n%s ' % path_str
2022 message += '\n%s\n' % content
2023
2024 return _CommentSummary(
2025 date=date,
2026 message=message,
2027 sender=msg['author']['email'],
2028 autogenerated=is_autogenerated,
2029 # These could be inferred from the text messages and correlated with
2030 # Code-Review label maximum, however this is not reliable.
2031 # Leaving as is until the need arises.
2032 approval=False,
2033 disapproval=False,
2034 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002035
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002036 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002037 gerrit_util.AbandonChange(
2038 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002039
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002040 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002041 gerrit_util.SubmitChange(
2042 self._GetGerritHost(), self._GerritChangeIdentifier(),
2043 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002044
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002045 def _GetChangeDetail(self, options=None, no_cache=False):
2046 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002047
2048 If fresh data is needed, set no_cache=True which will clear cache and
2049 thus new data will be fetched from Gerrit.
2050 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002051 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002052 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002053
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002054 # Optimization to avoid multiple RPCs:
2055 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2056 'CURRENT_COMMIT' not in options):
2057 options.append('CURRENT_COMMIT')
2058
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002059 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002060 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002061 options = [o.upper() for o in options]
2062
2063 # Check in cache first unless no_cache is True.
2064 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002065 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002066 else:
2067 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002068 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002069 # Assumption: data fetched before with extra options is suitable
2070 # for return for a smaller set of options.
2071 # For example, if we cached data for
2072 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2073 # and request is for options=[CURRENT_REVISION],
2074 # THEN we can return prior cached data.
2075 if options_set.issubset(cached_options_set):
2076 return data
2077
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002078 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002079 data = gerrit_util.GetChangeDetail(
2080 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002081 except gerrit_util.GerritError as e:
2082 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002083 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002084 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002085
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002086 self._detail_cache.setdefault(cache_key, []).append(
2087 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002088 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002089
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002090 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002091 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002092 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002093 data = gerrit_util.GetChangeCommit(
2094 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002095 except gerrit_util.GerritError as e:
2096 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002097 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002098 raise
agable32978d92016-11-01 12:55:02 -07002099 return data
2100
Karen Qian40c19422019-03-13 21:28:29 +00002101 def _IsCqConfigured(self):
2102 detail = self._GetChangeDetail(['LABELS'])
Andrii Shyshkalov8effa4d2020-01-21 13:23:36 +00002103 return u'Commit-Queue' in detail.get('labels', {})
Karen Qian40c19422019-03-13 21:28:29 +00002104
Olivier Robin75ee7252018-04-13 10:02:56 +02002105 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002106 if git_common.is_dirty_git_tree('land'):
2107 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002108
tandriid60367b2016-06-22 05:25:12 -07002109 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002110 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002111 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002112 'which can test and land changes for you. '
2113 'Are you sure you wish to bypass it?\n',
2114 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002115 differs = True
tandriic4344b52016-08-29 06:04:54 -07002116 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002117 # Note: git diff outputs nothing if there is no diff.
2118 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002119 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002120 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002121 if detail['current_revision'] == last_upload:
2122 differs = False
2123 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002124 print('WARNING: Local branch contents differ from latest uploaded '
2125 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002126 if differs:
2127 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002128 confirm_or_exit(
2129 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2130 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002131 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002132 elif not bypass_hooks:
2133 hook_results = self.RunHook(
2134 committing=True,
2135 may_prompt=not force,
2136 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002137 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2138 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002139 if not hook_results.should_continue():
2140 return 1
2141
2142 self.SubmitIssue(wait_for_merge=True)
2143 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002144 links = self._GetChangeCommit().get('web_links', [])
2145 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002146 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002147 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002148 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002149 return 0
2150
Edward Lemurf38bc172019-09-03 21:02:13 +00002151 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 assert parsed_issue_arg.valid
2153
Edward Lemur125d60a2019-09-13 18:25:41 +00002154 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155
2156 if parsed_issue_arg.hostname:
2157 self._gerrit_host = parsed_issue_arg.hostname
2158 self._gerrit_server = 'https://%s' % self._gerrit_host
2159
tandriic2405f52016-10-10 08:13:15 -07002160 try:
2161 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002162 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002163 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164
2165 if not parsed_issue_arg.patchset:
2166 # Use current revision by default.
2167 revision_info = detail['revisions'][detail['current_revision']]
2168 patchset = int(revision_info['_number'])
2169 else:
2170 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002171 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2173 break
2174 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002175 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 (parsed_issue_arg.patchset, self.GetIssue()))
2177
Edward Lemur125d60a2019-09-13 18:25:41 +00002178 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002179 if remote_url.endswith('.git'):
2180 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002181 remote_url = remote_url.rstrip('/')
2182
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002183 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002184 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002185
2186 if remote_url != fetch_info['url']:
2187 DieWithError('Trying to patch a change from %s but this repo appears '
2188 'to be %s.' % (fetch_info['url'], remote_url))
2189
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002191
Aaron Gable62619a32017-06-16 08:22:09 -07002192 if force:
2193 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2194 print('Checked out commit for change %i patchset %i locally' %
2195 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002196 elif nocommit:
2197 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2198 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002199 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002200 RunGit(['cherry-pick', 'FETCH_HEAD'])
2201 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002202 (parsed_issue_arg.issue, patchset))
2203 print('Note: this created a local commit which does not have '
2204 'the same hash as the one uploaded for review. This will make '
2205 'uploading changes based on top of this branch difficult.\n'
2206 'If you want to do that, use "git cl patch --force" instead.')
2207
Stefan Zagerd08043c2017-10-12 12:07:02 -07002208 if self.GetBranch():
2209 self.SetIssue(parsed_issue_arg.issue)
2210 self.SetPatchset(patchset)
2211 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2212 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2213 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2214 else:
2215 print('WARNING: You are in detached HEAD state.\n'
2216 'The patch has been applied to your checkout, but you will not be '
2217 'able to upload a new patch set to the gerrit issue.\n'
2218 'Try using the \'-b\' option if you would like to work on a '
2219 'branch and/or upload a new patch set.')
2220
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002221 return 0
2222
tandrii16e0b4e2016-06-07 10:34:28 -07002223 def _GerritCommitMsgHookCheck(self, offer_removal):
2224 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2225 if not os.path.exists(hook):
2226 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002227 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2228 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002229 data = gclient_utils.FileRead(hook)
2230 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2231 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002232 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002233 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002234 'and may interfere with it in subtle ways.\n'
2235 'We recommend you remove the commit-msg hook.')
2236 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002237 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002238 gclient_utils.rm_file_or_tree(hook)
2239 print('Gerrit commit-msg hook removed.')
2240 else:
2241 print('OK, will keep Gerrit commit-msg hook in place.')
2242
Edward Lemur1b52d872019-05-09 21:12:12 +00002243 def _CleanUpOldTraces(self):
2244 """Keep only the last |MAX_TRACES| traces."""
2245 try:
2246 traces = sorted([
2247 os.path.join(TRACES_DIR, f)
2248 for f in os.listdir(TRACES_DIR)
2249 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2250 and not f.startswith('tmp'))
2251 ])
2252 traces_to_delete = traces[:-MAX_TRACES]
2253 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002254 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002255 except OSError:
2256 print('WARNING: Failed to remove old git traces from\n'
2257 ' %s'
2258 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002259
Edward Lemur5737f022019-05-17 01:24:00 +00002260 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002261 """Zip and write the git push traces stored in traces_dir."""
2262 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002263 traces_zip = trace_name + '-traces'
2264 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002265 # Create a temporary dir to store git config and gitcookies in. It will be
2266 # compressed and stored next to the traces.
2267 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002268 git_info_zip = trace_name + '-git-info'
2269
Edward Lemur5737f022019-05-17 01:24:00 +00002270 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002271 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002272 git_push_metadata['now'] = git_push_metadata['now'].decode(
2273 sys.stdin.encoding)
2274
Edward Lemur1b52d872019-05-09 21:12:12 +00002275 git_push_metadata['trace_name'] = trace_name
2276 gclient_utils.FileWrite(
2277 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2278
2279 # Keep only the first 6 characters of the git hashes on the packet
2280 # trace. This greatly decreases size after compression.
2281 packet_traces = os.path.join(traces_dir, 'trace-packet')
2282 if os.path.isfile(packet_traces):
2283 contents = gclient_utils.FileRead(packet_traces)
2284 gclient_utils.FileWrite(
2285 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2286 shutil.make_archive(traces_zip, 'zip', traces_dir)
2287
2288 # Collect and compress the git config and gitcookies.
2289 git_config = RunGit(['config', '-l'])
2290 gclient_utils.FileWrite(
2291 os.path.join(git_info_dir, 'git-config'),
2292 git_config)
2293
2294 cookie_auth = gerrit_util.Authenticator.get()
2295 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2296 gitcookies_path = cookie_auth.get_gitcookies_path()
2297 if os.path.isfile(gitcookies_path):
2298 gitcookies = gclient_utils.FileRead(gitcookies_path)
2299 gclient_utils.FileWrite(
2300 os.path.join(git_info_dir, 'gitcookies'),
2301 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2302 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2303
Edward Lemur1b52d872019-05-09 21:12:12 +00002304 gclient_utils.rmtree(git_info_dir)
2305
2306 def _RunGitPushWithTraces(
2307 self, change_desc, refspec, refspec_opts, git_push_metadata):
2308 """Run git push and collect the traces resulting from the execution."""
2309 # Create a temporary directory to store traces in. Traces will be compressed
2310 # and stored in a 'traces' dir inside depot_tools.
2311 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002312 trace_name = os.path.join(
2313 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002314
2315 env = os.environ.copy()
2316 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2317 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002318 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002319 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2320 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2321 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2322
2323 try:
2324 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002325 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002326 before_push = time_time()
2327 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002328 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002329 env=env,
2330 print_stdout=True,
2331 # Flush after every line: useful for seeing progress when running as
2332 # recipe.
2333 filter_fn=lambda _: sys.stdout.flush())
Edward Lemur79d4f992019-11-11 23:49:02 +00002334 push_stdout = push_stdout.decode('utf-8', 'replace')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002335 except subprocess2.CalledProcessError as e:
2336 push_returncode = e.returncode
2337 DieWithError('Failed to create a change. Please examine output above '
2338 'for the reason of the failure.\n'
2339 'Hint: run command below to diagnose common Git/Gerrit '
2340 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002341 ' git cl creds-check\n'
2342 '\n'
2343 'If git-cl is not working correctly, file a bug under the '
2344 'Infra>SDK component including the files below.\n'
2345 'Review the files before upload, since they might contain '
2346 'sensitive information.\n'
2347 'Set the Restrict-View-Google label so that they are not '
2348 'publicly accessible.\n'
2349 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002350 change_desc)
2351 finally:
2352 execution_time = time_time() - before_push
2353 metrics.collector.add_repeated('sub_commands', {
2354 'command': 'git push',
2355 'execution_time': execution_time,
2356 'exit_code': push_returncode,
2357 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2358 })
2359
Edward Lemur1b52d872019-05-09 21:12:12 +00002360 git_push_metadata['execution_time'] = execution_time
2361 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002362 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002363
Edward Lemur1b52d872019-05-09 21:12:12 +00002364 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002365 gclient_utils.rmtree(traces_dir)
2366
2367 return push_stdout
2368
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002369 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002370 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002371 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002372 # Load default for user, repo, squash=true, in this order.
2373 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002374
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002375 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002376 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002377 # This may be None; default fallback value is determined in logic below.
2378 title = options.title
2379
Dominic Battre7d1c4842017-10-27 09:17:28 +02002380 # Extract bug number from branch name.
2381 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002382 fixed = options.fixed
2383 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2384 self.GetBranch())
2385 if not bug and not fixed and match:
2386 if match.group('type') == 'bug':
2387 bug = match.group('bugnum')
2388 else:
2389 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002390
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002391 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002392 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002393 if self.GetIssue():
2394 # Try to get the message from a previous upload.
2395 message = self.GetDescription()
2396 if not message:
2397 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002398 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002399 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002400 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002401 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002402 # When uploading a subsequent patchset, -m|--message is taken
2403 # as the patchset title if --title was not provided.
2404 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002405 else:
2406 default_title = RunGit(
2407 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002408 if options.force:
2409 title = default_title
2410 else:
2411 title = ask_for_data(
2412 'Title for patchset [%s]: ' % default_title) or default_title
Josipe827b0f2020-01-30 00:07:20 +00002413
2414 # User requested to change description
2415 if options.edit_description:
2416 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
2417 change_desc.prompt()
2418 message = change_desc.description
2419
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002420 change_id = self._GetChangeDetail()['change_id']
2421 while True:
2422 footer_change_ids = git_footers.get_footer_change_id(message)
2423 if footer_change_ids == [change_id]:
2424 break
2425 if not footer_change_ids:
2426 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002427 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002428 continue
2429 # There is already a valid footer but with different or several ids.
2430 # Doing this automatically is non-trivial as we don't want to lose
2431 # existing other footers, yet we want to append just 1 desired
2432 # Change-Id. Thus, just create a new footer, but let user verify the
2433 # new description.
2434 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002435 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002436 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002437 print(
2438 'WARNING: change %s has Change-Id footer(s):\n'
2439 ' %s\n'
2440 'but change has Change-Id %s, according to Gerrit.\n'
2441 'Please, check the proposed correction to the description, '
2442 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2443 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2444 change_id))
2445 confirm_or_exit(action='edit')
2446 change_desc.prompt()
2447
2448 message = change_desc.description
2449 if not message:
2450 DieWithError("Description is empty. Aborting...")
2451
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002452 # Continue the while loop.
2453 # Sanity check of this code - we should end up with proper message
2454 # footer.
2455 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002456 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002457 else: # if not self.GetIssue()
2458 if options.message:
2459 message = options.message
2460 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002461 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002462 if options.title:
2463 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002464 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002465 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002466 change_desc.prompt()
2467
Aaron Gableb56ad332017-01-06 15:24:31 -08002468 # On first upload, patchset title is always this string, while
2469 # --title flag gets converted to first line of message.
2470 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002471 if not change_desc.description:
2472 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002473 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002474 if len(change_ids) > 1:
2475 DieWithError('too many Change-Id footers, at most 1 allowed.')
2476 if not change_ids:
2477 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002478 change_desc.set_description(git_footers.add_footer_change_id(
2479 change_desc.description,
2480 GenerateGerritChangeId(change_desc.description)))
2481 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002482 assert len(change_ids) == 1
2483 change_id = change_ids[0]
2484
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002485 if options.reviewers or options.tbrs or options.add_owners_to:
2486 change_desc.update_reviewers(options.reviewers, options.tbrs,
2487 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002488 if options.preserve_tryjobs:
2489 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002490
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002491 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002492 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2493 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002494 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Edward Lesmesf6a22322019-11-04 22:14:39 +00002495 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
Edward Lemur79d4f992019-11-11 23:49:02 +00002496 desc_tempfile.write(change_desc.description.encode('utf-8', 'replace'))
Aaron Gable9a03ae02017-11-03 11:31:07 -07002497 desc_tempfile.close()
2498 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2499 '-F', desc_tempfile.name]).strip()
2500 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002501 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002502 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002503 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002504 if not change_desc.description:
2505 DieWithError("Description is empty. Aborting...")
2506
2507 if not git_footers.get_footer_change_id(change_desc.description):
2508 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002509 change_desc.set_description(
2510 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002511 if options.reviewers or options.tbrs or options.add_owners_to:
2512 change_desc.update_reviewers(options.reviewers, options.tbrs,
2513 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002514 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002515 # For no-squash mode, we assume the remote called "origin" is the one we
2516 # want. It is not worthwhile to support different workflows for
2517 # no-squash mode.
2518 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002519 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2520
2521 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002522 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002523 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2524 ref_to_push)]).splitlines()
2525 if len(commits) > 1:
2526 print('WARNING: This will upload %d commits. Run the following command '
2527 'to see which commits will be uploaded: ' % len(commits))
2528 print('git log %s..%s' % (parent, ref_to_push))
2529 print('You can also use `git squash-branch` to squash these into a '
2530 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002531 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002532
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002533 if options.reviewers or options.tbrs or options.add_owners_to:
2534 change_desc.update_reviewers(options.reviewers, options.tbrs,
2535 options.add_owners_to, change)
2536
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002537 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002538 cc = []
2539 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2540 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2541 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002542 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002543 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002544 if options.cc:
2545 cc.extend(options.cc)
Edward Lemur79d4f992019-11-11 23:49:02 +00002546 cc = [email.strip() for email in cc if email.strip()]
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002547 if change_desc.get_cced():
2548 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002549 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2550 valid_accounts = set(reviewers + cc)
2551 # TODO(crbug/877717): relax this for all hosts.
2552 else:
2553 valid_accounts = gerrit_util.ValidAccounts(
2554 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002555 logging.info('accounts %s are recognized, %s invalid',
2556 sorted(valid_accounts),
2557 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002558
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002559 # Extra options that can be specified at push time. Doc:
2560 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002561 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002562
Aaron Gable844cf292017-06-28 11:32:59 -07002563 # By default, new changes are started in WIP mode, and subsequent patchsets
2564 # don't send email. At any time, passing --send-mail will mark the change
2565 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002566 if options.send_mail:
2567 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002568 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002569 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002570 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002571 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002572 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002573
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002574 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002575 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002576
Aaron Gable9b713dd2016-12-14 16:04:21 -08002577 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002578 # Punctuation and whitespace in |title| must be percent-encoded.
2579 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002580
agablec6787972016-09-09 16:13:34 -07002581 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002582 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002583
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002584 for r in sorted(reviewers):
2585 if r in valid_accounts:
2586 refspec_opts.append('r=%s' % r)
2587 reviewers.remove(r)
2588 else:
2589 # TODO(tandrii): this should probably be a hard failure.
2590 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2591 % r)
2592 for c in sorted(cc):
2593 # refspec option will be rejected if cc doesn't correspond to an
2594 # account, even though REST call to add such arbitrary cc may succeed.
2595 if c in valid_accounts:
2596 refspec_opts.append('cc=%s' % c)
2597 cc.remove(c)
2598
rmistry9eadede2016-09-19 11:22:43 -07002599 if options.topic:
2600 # Documentation on Gerrit topics is here:
2601 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002602 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002603
Edward Lemur687ca902018-12-05 02:30:30 +00002604 if options.enable_auto_submit:
2605 refspec_opts.append('l=Auto-Submit+1')
2606 if options.use_commit_queue:
2607 refspec_opts.append('l=Commit-Queue+2')
2608 elif options.cq_dry_run:
2609 refspec_opts.append('l=Commit-Queue+1')
2610
2611 if change_desc.get_reviewers(tbr_only=True):
2612 score = gerrit_util.GetCodeReviewTbrScore(
2613 self._GetGerritHost(),
2614 self._GetGerritProject())
2615 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002616
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002617 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002618 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002619 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002620 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002621 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2622
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002623 refspec_suffix = ''
2624 if refspec_opts:
2625 refspec_suffix = '%' + ','.join(refspec_opts)
2626 assert ' ' not in refspec_suffix, (
2627 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2628 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2629
Edward Lemur1b52d872019-05-09 21:12:12 +00002630 git_push_metadata = {
2631 'gerrit_host': self._GetGerritHost(),
2632 'title': title or '<untitled>',
2633 'change_id': change_id,
2634 'description': change_desc.description,
2635 }
2636 push_stdout = self._RunGitPushWithTraces(
2637 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002638
2639 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002640 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002641 change_numbers = [m.group(1)
2642 for m in map(regex.match, push_stdout.splitlines())
2643 if m]
2644 if len(change_numbers) != 1:
2645 DieWithError(
2646 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002647 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002648 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002649 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002650
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002651 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002652 # GetIssue() is not set in case of non-squash uploads according to tests.
2653 # TODO(agable): non-squash uploads in git cl should be removed.
2654 gerrit_util.AddReviewers(
2655 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002656 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002657 reviewers, cc,
2658 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002659
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002660 return 0
2661
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002662 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2663 change_desc):
2664 """Computes parent of the generated commit to be uploaded to Gerrit.
2665
2666 Returns revision or a ref name.
2667 """
2668 if custom_cl_base:
2669 # Try to avoid creating additional unintended CLs when uploading, unless
2670 # user wants to take this risk.
2671 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2672 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2673 local_ref_of_target_remote])
2674 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002675 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002676 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2677 'If you proceed with upload, more than 1 CL may be created by '
2678 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2679 'If you are certain that specified base `%s` has already been '
2680 'uploaded to Gerrit as another CL, you may proceed.\n' %
2681 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2682 if not force:
2683 confirm_or_exit(
2684 'Do you take responsibility for cleaning up potential mess '
2685 'resulting from proceeding with upload?',
2686 action='upload')
2687 return custom_cl_base
2688
Aaron Gablef97e33d2017-03-30 15:44:27 -07002689 if remote != '.':
2690 return self.GetCommonAncestorWithUpstream()
2691
2692 # If our upstream branch is local, we base our squashed commit on its
2693 # squashed version.
2694 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2695
Aaron Gablef97e33d2017-03-30 15:44:27 -07002696 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002697 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002698
2699 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002700 # TODO(tandrii): consider checking parent change in Gerrit and using its
2701 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2702 # the tree hash of the parent branch. The upside is less likely bogus
2703 # requests to reupload parent change just because it's uploadhash is
2704 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002705 parent = RunGit(['config',
2706 'branch.%s.gerritsquashhash' % upstream_branch_name],
2707 error_ok=True).strip()
2708 # Verify that the upstream branch has been uploaded too, otherwise
2709 # Gerrit will create additional CLs when uploading.
2710 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2711 RunGitSilent(['rev-parse', parent + ':'])):
2712 DieWithError(
2713 '\nUpload upstream branch %s first.\n'
2714 'It is likely that this branch has been rebased since its last '
2715 'upload, so you just need to upload it again.\n'
2716 '(If you uploaded it with --no-squash, then branch dependencies '
2717 'are not supported, and you should reupload with --squash.)'
2718 % upstream_branch_name,
2719 change_desc)
2720 return parent
2721
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002722 def _AddChangeIdToCommitMessage(self, options, args):
2723 """Re-commits using the current message, assumes the commit hook is in
2724 place.
2725 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002726 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002727 git_command = ['commit', '--amend', '-m', log_desc]
2728 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002729 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002730 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002731 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002732 return new_log_desc
2733 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002734 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002735
tandriie113dfd2016-10-11 10:20:12 -07002736 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002737 try:
2738 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002739 except GerritChangeNotExists:
2740 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002741
2742 if data['status'] in ('ABANDONED', 'MERGED'):
2743 return 'CL %s is closed' % self.GetIssue()
2744
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002745 def GetGerritChange(self, patchset=None):
2746 """Returns a buildbucket.v2.GerritChange message for the current issue."""
Edward Lemur79d4f992019-11-11 23:49:02 +00002747 host = urllib.parse.urlparse(self.GetCodereviewServer()).hostname
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002748 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002749 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002750 data = self._GetChangeDetail(['ALL_REVISIONS'])
2751
2752 assert host and issue and patchset, 'CL must be uploaded first'
2753
2754 has_patchset = any(
2755 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002756 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002757 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002758 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002759 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002760
tandrii8c5a3532016-11-04 07:52:02 -07002761 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002762 'host': host,
2763 'change': issue,
2764 'project': data['project'],
2765 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002766 }
tandriie113dfd2016-10-11 10:20:12 -07002767
tandriide281ae2016-10-12 06:02:30 -07002768 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002769 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002770
Edward Lemur707d70b2018-02-07 00:50:14 +01002771 def GetReviewers(self):
2772 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002773 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002774
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002775
2776_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002777 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002778}
2779
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002780
iannuccie53c9352016-08-17 14:40:40 -07002781def _add_codereview_issue_select_options(parser, extra=""):
2782 _add_codereview_select_options(parser)
2783
2784 text = ('Operate on this issue number instead of the current branch\'s '
2785 'implicit issue.')
2786 if extra:
2787 text += ' '+extra
2788 parser.add_option('-i', '--issue', type=int, help=text)
2789
2790
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002791def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002792 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002793 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002794 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002795 parser.add_option_group(parser.codereview_group)
2796 parser.codereview_group.add_option(
2797 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002798 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002799
2800
tandriif9aefb72016-07-01 09:06:51 -07002801def _get_bug_line_values(default_project, bugs):
2802 """Given default_project and comma separated list of bugs, yields bug line
2803 values.
2804
2805 Each bug can be either:
2806 * a number, which is combined with default_project
2807 * string, which is left as is.
2808
2809 This function may produce more than one line, because bugdroid expects one
2810 project per line.
2811
2812 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2813 ['v8:123', 'chromium:789']
2814 """
2815 default_bugs = []
2816 others = []
2817 for bug in bugs.split(','):
2818 bug = bug.strip()
2819 if bug:
2820 try:
2821 default_bugs.append(int(bug))
2822 except ValueError:
2823 others.append(bug)
2824
2825 if default_bugs:
2826 default_bugs = ','.join(map(str, default_bugs))
2827 if default_project:
2828 yield '%s:%s' % (default_project, default_bugs)
2829 else:
2830 yield default_bugs
2831 for other in sorted(others):
2832 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2833 yield other
2834
2835
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002836class ChangeDescription(object):
2837 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002838 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002839 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002840 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002841 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002842 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002843 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2844 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
Anthony Polito02b5af32019-12-02 19:49:47 +00002845 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):($|[^:])'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002846 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002847
Dan Beamd8b04ca2019-10-10 21:23:26 +00002848 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002849 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002850 if bug:
2851 regexp = re.compile(self.BUG_LINE)
2852 prefix = settings.GetBugPrefix()
2853 if not any((regexp.match(line) for line in self._description_lines)):
2854 values = list(_get_bug_line_values(prefix, bug))
2855 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002856 if fixed:
2857 regexp = re.compile(self.FIXED_LINE)
2858 prefix = settings.GetBugPrefix()
2859 if not any((regexp.match(line) for line in self._description_lines)):
2860 values = list(_get_bug_line_values(prefix, fixed))
2861 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002862
agable@chromium.org42c20792013-09-12 17:34:49 +00002863 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002864 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002865 return '\n'.join(self._description_lines)
2866
2867 def set_description(self, desc):
2868 if isinstance(desc, basestring):
2869 lines = desc.splitlines()
2870 else:
2871 lines = [line.rstrip() for line in desc]
2872 while lines and not lines[0]:
2873 lines.pop(0)
2874 while lines and not lines[-1]:
2875 lines.pop(-1)
2876 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002878 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2879 """Rewrites the R=/TBR= line(s) as a single line each.
2880
2881 Args:
2882 reviewers (list(str)) - list of additional emails to use for reviewers.
2883 tbrs (list(str)) - list of additional emails to use for TBRs.
2884 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2885 the change that are missing OWNER coverage. If this is not None, you
2886 must also pass a value for `change`.
2887 change (Change) - The Change that should be used for OWNERS lookups.
2888 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002889 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002890 assert isinstance(tbrs, list), tbrs
2891
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002892 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002893 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002894
2895 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002896 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002897
2898 reviewers = set(reviewers)
2899 tbrs = set(tbrs)
2900 LOOKUP = {
2901 'TBR': tbrs,
2902 'R': reviewers,
2903 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002904
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002905 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002906 regexp = re.compile(self.R_LINE)
2907 matches = [regexp.match(line) for line in self._description_lines]
2908 new_desc = [l for i, l in enumerate(self._description_lines)
2909 if not matches[i]]
2910 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002911
agable@chromium.org42c20792013-09-12 17:34:49 +00002912 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002913
2914 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002915 for match in matches:
2916 if not match:
2917 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002918 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2919
2920 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002921 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002922 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002923 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002924 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002925 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002926 LOOKUP[add_owners_to].update(
2927 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002928
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002929 # If any folks ended up in both groups, remove them from tbrs.
2930 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002931
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002932 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2933 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002934
2935 # Put the new lines in the description where the old first R= line was.
2936 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2937 if 0 <= line_loc < len(self._description_lines):
2938 if new_tbr_line:
2939 self._description_lines.insert(line_loc, new_tbr_line)
2940 if new_r_line:
2941 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002942 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002943 if new_r_line:
2944 self.append_footer(new_r_line)
2945 if new_tbr_line:
2946 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002947
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002948 def set_preserve_tryjobs(self):
2949 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2950 footers = git_footers.parse_footers(self.description)
2951 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2952 if v.lower() == 'true':
2953 return
2954 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2955
Anthony Polito8b955342019-09-24 19:01:36 +00002956 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002957 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002958 self.set_description([
2959 '# Enter a description of the change.',
2960 '# This will be displayed on the codereview site.',
2961 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002962 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002963 '--------------------',
2964 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002965 bug_regexp = re.compile(self.BUG_LINE)
2966 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002967 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002968 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2969 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002970 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002971
agable@chromium.org42c20792013-09-12 17:34:49 +00002972 content = gclient_utils.RunEditor(self.description, True,
Edward Lemur79d4f992019-11-11 23:49:02 +00002973 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002974 if not content:
2975 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002976 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002977
Bruce Dawson2377b012018-01-11 16:46:49 -08002978 # Strip off comments and default inserted "Bug:" line.
2979 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002980 (line.startswith('#') or
2981 line.rstrip() == "Bug:" or
2982 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002983 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002984 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002985 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002986
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002987 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002988 """Adds a footer line to the description.
2989
2990 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2991 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2992 that Gerrit footers are always at the end.
2993 """
2994 parsed_footer_line = git_footers.parse_footer(line)
2995 if parsed_footer_line:
2996 # Line is a gerrit footer in the form: Footer-Key: any value.
2997 # Thus, must be appended observing Gerrit footer rules.
2998 self.set_description(
2999 git_footers.add_footer(self.description,
3000 key=parsed_footer_line[0],
3001 value=parsed_footer_line[1]))
3002 return
3003
3004 if not self._description_lines:
3005 self._description_lines.append(line)
3006 return
3007
3008 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3009 if gerrit_footers:
3010 # git_footers.split_footers ensures that there is an empty line before
3011 # actual (gerrit) footers, if any. We have to keep it that way.
3012 assert top_lines and top_lines[-1] == ''
3013 top_lines, separator = top_lines[:-1], top_lines[-1:]
3014 else:
3015 separator = [] # No need for separator if there are no gerrit_footers.
3016
3017 prev_line = top_lines[-1] if top_lines else ''
3018 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3019 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3020 top_lines.append('')
3021 top_lines.append(line)
3022 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003023
tandrii99a72f22016-08-17 14:33:24 -07003024 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003025 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003026 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003027 reviewers = [match.group(2).strip()
3028 for match in matches
3029 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003030 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003031
bradnelsond975b302016-10-23 12:20:23 -07003032 def get_cced(self):
3033 """Retrieves the list of reviewers."""
3034 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3035 cced = [match.group(2).strip() for match in matches if match]
3036 return cleanup_list(cced)
3037
Nodir Turakulov23b82142017-11-16 11:04:25 -08003038 def get_hash_tags(self):
3039 """Extracts and sanitizes a list of Gerrit hashtags."""
3040 subject = (self._description_lines or ('',))[0]
3041 subject = re.sub(
3042 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3043
3044 tags = []
3045 start = 0
3046 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3047 while True:
3048 m = bracket_exp.match(subject, start)
3049 if not m:
3050 break
3051 tags.append(self.sanitize_hash_tag(m.group(1)))
3052 start = m.end()
3053
3054 if not tags:
3055 # Try "Tag: " prefix.
3056 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3057 if m:
3058 tags.append(self.sanitize_hash_tag(m.group(1)))
3059 return tags
3060
3061 @classmethod
3062 def sanitize_hash_tag(cls, tag):
3063 """Returns a sanitized Gerrit hash tag.
3064
3065 A sanitized hashtag can be used as a git push refspec parameter value.
3066 """
3067 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3068
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003069 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3070 """Updates this commit description given the parent.
3071
3072 This is essentially what Gnumbd used to do.
3073 Consult https://goo.gl/WMmpDe for more details.
3074 """
3075 assert parent_msg # No, orphan branch creation isn't supported.
3076 assert parent_hash
3077 assert dest_ref
3078 parent_footer_map = git_footers.parse_footers(parent_msg)
3079 # This will also happily parse svn-position, which GnumbD is no longer
3080 # supporting. While we'd generate correct footers, the verifier plugin
3081 # installed in Gerrit will block such commit (ie git push below will fail).
3082 parent_position = git_footers.get_position(parent_footer_map)
3083
3084 # Cherry-picks may have last line obscuring their prior footers,
3085 # from git_footers perspective. This is also what Gnumbd did.
3086 cp_line = None
3087 if (self._description_lines and
3088 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3089 cp_line = self._description_lines.pop()
3090
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003091 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003092
3093 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3094 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003095 for i, line in enumerate(footer_lines):
3096 k, v = git_footers.parse_footer(line) or (None, None)
3097 if k and k.startswith('Cr-'):
3098 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003099
3100 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003101 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003102 if parent_position[0] == dest_ref:
3103 # Same branch as parent.
3104 number = int(parent_position[1]) + 1
3105 else:
3106 number = 1 # New branch, and extra lineage.
3107 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3108 int(parent_position[1])))
3109
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003110 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3111 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003112
3113 self._description_lines = top_lines
3114 if cp_line:
3115 self._description_lines.append(cp_line)
3116 if self._description_lines[-1] != '':
3117 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003118 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003119
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003120
Aaron Gablea1bab272017-04-11 16:38:18 -07003121def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003122 """Retrieves the reviewers that approved a CL from the issue properties with
3123 messages.
3124
3125 Note that the list may contain reviewers that are not committer, thus are not
3126 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003127
3128 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003129 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003130 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003131 return sorted(
3132 set(
3133 message['sender']
3134 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003135 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003136 )
3137 )
3138
3139
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003140def FindCodereviewSettingsFile(filename='codereview.settings'):
3141 """Finds the given file starting in the cwd and going up.
3142
3143 Only looks up to the top of the repository unless an
3144 'inherit-review-settings-ok' file exists in the root of the repository.
3145 """
3146 inherit_ok_file = 'inherit-review-settings-ok'
3147 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003148 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003149 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3150 root = '/'
3151 while True:
3152 if filename in os.listdir(cwd):
3153 if os.path.isfile(os.path.join(cwd, filename)):
3154 return open(os.path.join(cwd, filename))
3155 if cwd == root:
3156 break
3157 cwd = os.path.dirname(cwd)
3158
3159
3160def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003161 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003162 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003163
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003164 def SetProperty(name, setting, unset_error_ok=False):
3165 fullname = 'rietveld.' + name
3166 if setting in keyvals:
3167 RunGit(['config', fullname, keyvals[setting]])
3168 else:
3169 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3170
tandrii48df5812016-10-17 03:55:37 -07003171 if not keyvals.get('GERRIT_HOST', False):
3172 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003173 # Only server setting is required. Other settings can be absent.
3174 # In that case, we ignore errors raised during option deletion attempt.
3175 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3176 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3177 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003178 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003179 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3180 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003181 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3182 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003183 SetProperty(
3184 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003185
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003186 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003187 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003188
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003189 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003190 RunGit(['config', 'gerrit.squash-uploads',
3191 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003192
tandrii@chromium.org28253532016-04-14 13:46:56 +00003193 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003194 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003195 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3196
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003197 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003198 # should be of the form
3199 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3200 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003201 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3202 keyvals['ORIGIN_URL_CONFIG']])
3203
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003204
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003205def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003206 """Downloads a network object to a local file, like urllib.urlretrieve.
3207
3208 This is necessary because urllib is broken for SSL connections via a proxy.
3209 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003210 with open(destination, 'w') as f:
Edward Lemur79d4f992019-11-11 23:49:02 +00003211 f.write(urllib.request.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003212
3213
ukai@chromium.org712d6102013-11-27 00:52:58 +00003214def hasSheBang(fname):
3215 """Checks fname is a #! script."""
3216 with open(fname) as f:
3217 return f.read(2).startswith('#!')
3218
3219
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003220# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3221def DownloadHooks(*args, **kwargs):
3222 pass
3223
3224
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003225def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003226 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003227
3228 Args:
3229 force: True to update hooks. False to install hooks if not present.
3230 """
3231 if not settings.GetIsGerrit():
3232 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003233 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003234 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3235 if not os.access(dst, os.X_OK):
3236 if os.path.exists(dst):
3237 if not force:
3238 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003239 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003240 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003241 if not hasSheBang(dst):
3242 DieWithError('Not a script: %s\n'
3243 'You need to download from\n%s\n'
3244 'into .git/hooks/commit-msg and '
3245 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003246 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3247 except Exception:
3248 if os.path.exists(dst):
3249 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003250 DieWithError('\nFailed to download hooks.\n'
3251 'You need to download from\n%s\n'
3252 'into .git/hooks/commit-msg and '
3253 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003254
3255
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003256class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003257 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003258
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003259 _GOOGLESOURCE = 'googlesource.com'
3260
3261 def __init__(self):
3262 # Cached list of [host, identity, source], where source is either
3263 # .gitcookies or .netrc.
3264 self._all_hosts = None
3265
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003266 def ensure_configured_gitcookies(self):
3267 """Runs checks and suggests fixes to make git use .gitcookies from default
3268 path."""
3269 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3270 configured_path = RunGitSilent(
3271 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003272 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003273 if configured_path:
3274 self._ensure_default_gitcookies_path(configured_path, default)
3275 else:
3276 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003277
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003278 @staticmethod
3279 def _ensure_default_gitcookies_path(configured_path, default_path):
3280 assert configured_path
3281 if configured_path == default_path:
3282 print('git is already configured to use your .gitcookies from %s' %
3283 configured_path)
3284 return
3285
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003286 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003287 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3288 (configured_path, default_path))
3289
3290 if not os.path.exists(configured_path):
3291 print('However, your configured .gitcookies file is missing.')
3292 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3293 action='reconfigure')
3294 RunGit(['config', '--global', 'http.cookiefile', default_path])
3295 return
3296
3297 if os.path.exists(default_path):
3298 print('WARNING: default .gitcookies file already exists %s' %
3299 default_path)
3300 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3301 default_path)
3302
3303 confirm_or_exit('Move existing .gitcookies to default location?',
3304 action='move')
3305 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003306 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003307 print('Moved and reconfigured git to use .gitcookies from %s' %
3308 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003309
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003310 @staticmethod
3311 def _configure_gitcookies_path(default_path):
3312 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3313 if os.path.exists(netrc_path):
3314 print('You seem to be using outdated .netrc for git credentials: %s' %
3315 netrc_path)
3316 print('This tool will guide you through setting up recommended '
3317 '.gitcookies store for git credentials.\n'
3318 '\n'
3319 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3320 ' git config --global --unset http.cookiefile\n'
3321 ' mv %s %s.backup\n\n' % (default_path, default_path))
3322 confirm_or_exit(action='setup .gitcookies')
3323 RunGit(['config', '--global', 'http.cookiefile', default_path])
3324 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003325
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003326 def get_hosts_with_creds(self, include_netrc=False):
3327 if self._all_hosts is None:
3328 a = gerrit_util.CookiesAuthenticator()
3329 self._all_hosts = [
3330 (h, u, s)
3331 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003332 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3333 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003334 )
3335 if h.endswith(self._GOOGLESOURCE)
3336 ]
3337
3338 if include_netrc:
3339 return self._all_hosts
3340 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3341
3342 def print_current_creds(self, include_netrc=False):
3343 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3344 if not hosts:
3345 print('No Git/Gerrit credentials found')
3346 return
Edward Lemur79d4f992019-11-11 23:49:02 +00003347 lengths = [max(map(len, (row[i] for row in hosts))) for i in range(3)]
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003348 header = [('Host', 'User', 'Which file'),
3349 ['=' * l for l in lengths]]
3350 for row in (header + hosts):
3351 print('\t'.join((('%%+%ds' % l) % s)
3352 for l, s in zip(lengths, row)))
3353
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003354 @staticmethod
3355 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003356 """Parses identity "git-<username>.domain" into <username> and domain."""
3357 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003358 # distinguishable from sub-domains. But we do know typical domains:
3359 if identity.endswith('.chromium.org'):
3360 domain = 'chromium.org'
3361 username = identity[:-len('.chromium.org')]
3362 else:
3363 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003364 if username.startswith('git-'):
3365 username = username[len('git-'):]
3366 return username, domain
3367
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003368 def _canonical_git_googlesource_host(self, host):
3369 """Normalizes Gerrit hosts (with '-review') to Git host."""
3370 assert host.endswith(self._GOOGLESOURCE)
3371 # Prefix doesn't include '.' at the end.
3372 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3373 if prefix.endswith('-review'):
3374 prefix = prefix[:-len('-review')]
3375 return prefix + '.' + self._GOOGLESOURCE
3376
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003377 def _canonical_gerrit_googlesource_host(self, host):
3378 git_host = self._canonical_git_googlesource_host(host)
3379 prefix = git_host.split('.', 1)[0]
3380 return prefix + '-review.' + self._GOOGLESOURCE
3381
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003382 def _get_counterpart_host(self, host):
3383 assert host.endswith(self._GOOGLESOURCE)
3384 git = self._canonical_git_googlesource_host(host)
3385 gerrit = self._canonical_gerrit_googlesource_host(git)
3386 return git if gerrit == host else gerrit
3387
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003388 def has_generic_host(self):
3389 """Returns whether generic .googlesource.com has been configured.
3390
3391 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3392 """
3393 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3394 if host == '.' + self._GOOGLESOURCE:
3395 return True
3396 return False
3397
3398 def _get_git_gerrit_identity_pairs(self):
3399 """Returns map from canonic host to pair of identities (Git, Gerrit).
3400
3401 One of identities might be None, meaning not configured.
3402 """
3403 host_to_identity_pairs = {}
3404 for host, identity, _ in self.get_hosts_with_creds():
3405 canonical = self._canonical_git_googlesource_host(host)
3406 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3407 idx = 0 if canonical == host else 1
3408 pair[idx] = identity
3409 return host_to_identity_pairs
3410
3411 def get_partially_configured_hosts(self):
3412 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003413 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003414 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003415 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003416
3417 def get_conflicting_hosts(self):
3418 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003419 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003420 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003421 if None not in (i1, i2) and i1 != i2)
3422
3423 def get_duplicated_hosts(self):
3424 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003425 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003426
3427 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3428 'chromium.googlesource.com': 'chromium.org',
3429 'chrome-internal.googlesource.com': 'google.com',
3430 }
3431
3432 def get_hosts_with_wrong_identities(self):
3433 """Finds hosts which **likely** reference wrong identities.
3434
3435 Note: skips hosts which have conflicting identities for Git and Gerrit.
3436 """
3437 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003438 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003439 pair = self._get_git_gerrit_identity_pairs().get(host)
3440 if pair and pair[0] == pair[1]:
3441 _, domain = self._parse_identity(pair[0])
3442 if domain != expected:
3443 hosts.add(host)
3444 return hosts
3445
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003446 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003447 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003448 hosts = sorted(hosts)
3449 assert hosts
3450 if extra_column_func is None:
3451 extras = [''] * len(hosts)
3452 else:
3453 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003454 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3455 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003456 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003457 lines.append(tmpl % he)
3458 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003459
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003460 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003461 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003462 yield ('.googlesource.com wildcard record detected',
3463 ['Chrome Infrastructure team recommends to list full host names '
3464 'explicitly.'],
3465 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003466
3467 dups = self.get_duplicated_hosts()
3468 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003469 yield ('The following hosts were defined twice',
3470 self._format_hosts(dups),
3471 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003472
3473 partial = self.get_partially_configured_hosts()
3474 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003475 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3476 'These hosts are missing',
3477 self._format_hosts(partial, lambda host: 'but %s defined' %
3478 self._get_counterpart_host(host)),
3479 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003480
3481 conflicting = self.get_conflicting_hosts()
3482 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003483 yield ('The following Git hosts have differing credentials from their '
3484 'Gerrit counterparts',
3485 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3486 tuple(self._get_git_gerrit_identity_pairs()[host])),
3487 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003488
3489 wrong = self.get_hosts_with_wrong_identities()
3490 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003491 yield ('These hosts likely use wrong identity',
3492 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3493 (self._get_git_gerrit_identity_pairs()[host][0],
3494 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3495 wrong)
3496
3497 def find_and_report_problems(self):
3498 """Returns True if there was at least one problem, else False."""
3499 found = False
3500 bad_hosts = set()
3501 for title, sublines, hosts in self._find_problems():
3502 if not found:
3503 found = True
3504 print('\n\n.gitcookies problem report:\n')
3505 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003506 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003507 if sublines:
3508 print()
3509 print(' %s' % '\n '.join(sublines))
3510 print()
3511
3512 if bad_hosts:
3513 assert found
3514 print(' You can manually remove corresponding lines in your %s file and '
3515 'visit the following URLs with correct account to generate '
3516 'correct credential lines:\n' %
3517 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3518 print(' %s' % '\n '.join(sorted(set(
3519 gerrit_util.CookiesAuthenticator().get_new_password_url(
3520 self._canonical_git_googlesource_host(host))
3521 for host in bad_hosts
3522 ))))
3523 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003524
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003525
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003526@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003527def CMDcreds_check(parser, args):
3528 """Checks credentials and suggests changes."""
3529 _, _ = parser.parse_args(args)
3530
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003531 # Code below checks .gitcookies. Abort if using something else.
3532 authn = gerrit_util.Authenticator.get()
3533 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3534 if isinstance(authn, gerrit_util.GceAuthenticator):
3535 DieWithError(
3536 'This command is not designed for GCE, are you on a bot?\n'
3537 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3538 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003539 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003540 'This command is not designed for bot environment. It checks '
3541 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003542
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003543 checker = _GitCookiesChecker()
3544 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003545
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003546 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003547 checker.print_current_creds(include_netrc=True)
3548
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003549 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003550 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003551 return 0
3552 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003553
3554
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003555@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003556def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003557 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003558 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3559 branch = ShortBranchName(branchref)
3560 _, args = parser.parse_args(args)
3561 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003562 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003563 return RunGit(['config', 'branch.%s.base-url' % branch],
3564 error_ok=False).strip()
3565 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003567 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3568 error_ok=False).strip()
3569
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003570
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003571def color_for_status(status):
3572 """Maps a Changelist status to color, for CMDstatus and other tools."""
3573 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003574 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003575 'waiting': Fore.BLUE,
3576 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003577 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003578 'lgtm': Fore.GREEN,
3579 'commit': Fore.MAGENTA,
3580 'closed': Fore.CYAN,
3581 'error': Fore.WHITE,
3582 }.get(status, Fore.WHITE)
3583
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003584
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003585def get_cl_statuses(changes, fine_grained, max_processes=None):
3586 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003587
3588 If fine_grained is true, this will fetch CL statuses from the server.
3589 Otherwise, simply indicate if there's a matching url for the given branches.
3590
3591 If max_processes is specified, it is used as the maximum number of processes
3592 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3593 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003594
3595 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003596 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003597 if not changes:
3598 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003599
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003600 if not fine_grained:
3601 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003602 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003603 for cl in changes:
3604 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003605 return
3606
3607 # First, sort out authentication issues.
3608 logging.debug('ensuring credentials exist')
3609 for cl in changes:
3610 cl.EnsureAuthenticated(force=False, refresh=True)
3611
3612 def fetch(cl):
3613 try:
3614 return (cl, cl.GetStatus())
3615 except:
3616 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003617 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003618 raise
3619
3620 threads_count = len(changes)
3621 if max_processes:
3622 threads_count = max(1, min(threads_count, max_processes))
3623 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3624
3625 pool = ThreadPool(threads_count)
3626 fetched_cls = set()
3627 try:
3628 it = pool.imap_unordered(fetch, changes).__iter__()
3629 while True:
3630 try:
3631 cl, status = it.next(timeout=5)
3632 except multiprocessing.TimeoutError:
3633 break
3634 fetched_cls.add(cl)
3635 yield cl, status
3636 finally:
3637 pool.close()
3638
3639 # Add any branches that failed to fetch.
3640 for cl in set(changes) - fetched_cls:
3641 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003642
rmistry@google.com2dd99862015-06-22 12:22:18 +00003643
3644def upload_branch_deps(cl, args):
3645 """Uploads CLs of local branches that are dependents of the current branch.
3646
3647 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003648
3649 test1 -> test2.1 -> test3.1
3650 -> test3.2
3651 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003652
3653 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3654 run on the dependent branches in this order:
3655 test2.1, test3.1, test3.2, test2.2, test3.3
3656
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003657 Note: This function does not rebase your local dependent branches. Use it
3658 when you make a change to the parent branch that will not conflict
3659 with its dependent branches, and you would like their dependencies
3660 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003661 """
3662 if git_common.is_dirty_git_tree('upload-branch-deps'):
3663 return 1
3664
3665 root_branch = cl.GetBranch()
3666 if root_branch is None:
3667 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3668 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003669 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3671 'patchset dependencies without an uploaded CL.')
3672
3673 branches = RunGit(['for-each-ref',
3674 '--format=%(refname:short) %(upstream:short)',
3675 'refs/heads'])
3676 if not branches:
3677 print('No local branches found.')
3678 return 0
3679
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003680 # Create a dictionary of all local branches to the branches that are
3681 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003682 tracked_to_dependents = collections.defaultdict(list)
3683 for b in branches.splitlines():
3684 tokens = b.split()
3685 if len(tokens) == 2:
3686 branch_name, tracked = tokens
3687 tracked_to_dependents[tracked].append(branch_name)
3688
vapiera7fbd5a2016-06-16 09:17:49 -07003689 print()
3690 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003691 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003692
rmistry@google.com2dd99862015-06-22 12:22:18 +00003693 def traverse_dependents_preorder(branch, padding=''):
3694 dependents_to_process = tracked_to_dependents.get(branch, [])
3695 padding += ' '
3696 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003697 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003698 dependents.append(dependent)
3699 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003700
rmistry@google.com2dd99862015-06-22 12:22:18 +00003701 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003702 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003703
3704 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003705 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003706 return 0
3707
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003708 confirm_or_exit('This command will checkout all dependent branches and run '
3709 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003710
rmistry@google.com2dd99862015-06-22 12:22:18 +00003711 # Record all dependents that failed to upload.
3712 failures = {}
3713 # Go through all dependents, checkout the branch and upload.
3714 try:
3715 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003716 print()
3717 print('--------------------------------------')
3718 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003719 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003720 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003721 try:
3722 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003723 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003724 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003725 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003726 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003727 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003728 finally:
3729 # Swap back to the original root branch.
3730 RunGit(['checkout', '-q', root_branch])
3731
vapiera7fbd5a2016-06-16 09:17:49 -07003732 print()
3733 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003734 for dependent_branch in dependents:
3735 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003736 print(' %s : %s' % (dependent_branch, upload_status))
3737 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003738
3739 return 0
3740
3741
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003742def GetArchiveTagForBranch(issue_num, branch_name, existing_tags):
3743 """Given a proposed tag name, returns a tag name that is guaranteed to be
3744 unique. If 'foo' is proposed but already exists, then 'foo-2' is used,
3745 or 'foo-3', and so on."""
3746
3747 proposed_tag = 'git-cl-archived-%s-%s' % (issue_num, branch_name)
3748 for suffix_num in itertools.count(1):
3749 if suffix_num == 1:
3750 to_check = proposed_tag
3751 else:
3752 to_check = '%s-%d' % (proposed_tag, suffix_num)
3753
3754 if to_check not in existing_tags:
3755 return to_check
3756
3757
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003758@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003759def CMDarchive(parser, args):
3760 """Archives and deletes branches associated with closed changelists."""
3761 parser.add_option(
3762 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003763 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003764 parser.add_option(
3765 '-f', '--force', action='store_true',
3766 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003767 parser.add_option(
3768 '-d', '--dry-run', action='store_true',
3769 help='Skip the branch tagging and removal steps.')
3770 parser.add_option(
3771 '-t', '--notags', action='store_true',
3772 help='Do not tag archived branches. '
3773 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003774
kmarshall3bff56b2016-06-06 18:31:47 -07003775 options, args = parser.parse_args(args)
3776 if args:
3777 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003778
3779 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3780 if not branches:
3781 return 0
3782
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003783 tags = RunGit(['for-each-ref', '--format=%(refname)',
3784 'refs/tags']).splitlines() or []
3785 tags = [t.split('/')[-1] for t in tags]
3786
vapiera7fbd5a2016-06-16 09:17:49 -07003787 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003788 changes = [Changelist(branchref=b)
3789 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003790 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3791 statuses = get_cl_statuses(changes,
3792 fine_grained=True,
3793 max_processes=options.maxjobs)
3794 proposal = [(cl.GetBranch(),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003795 GetArchiveTagForBranch(cl.GetIssue(), cl.GetBranch(),
3796 tags))
kmarshall3bff56b2016-06-06 18:31:47 -07003797 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003798 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003799 proposal.sort()
3800
3801 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003802 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003803 return 0
3804
3805 current_branch = GetCurrentBranch()
3806
vapiera7fbd5a2016-06-16 09:17:49 -07003807 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003808 if options.notags:
3809 for next_item in proposal:
3810 print(' ' + next_item[0])
3811 else:
3812 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3813 for next_item in proposal:
3814 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003815
kmarshall9249e012016-08-23 12:02:16 -07003816 # Quit now on precondition failure or if instructed by the user, either
3817 # via an interactive prompt or by command line flags.
3818 if options.dry_run:
3819 print('\nNo changes were made (dry run).\n')
3820 return 0
3821 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003822 print('You are currently on a branch \'%s\' which is associated with a '
3823 'closed codereview issue, so archive cannot proceed. Please '
3824 'checkout another branch and run this command again.' %
3825 current_branch)
3826 return 1
kmarshall9249e012016-08-23 12:02:16 -07003827 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003828 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3829 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003830 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003831 return 1
3832
3833 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003834 if not options.notags:
3835 RunGit(['tag', tagname, branch])
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00003836
3837 if RunGitWithCode(['branch', '-D', branch])[0] != 0:
3838 # Clean up the tag if we failed to delete the branch.
3839 RunGit(['tag', '-d', tagname])
kmarshall9249e012016-08-23 12:02:16 -07003840
vapiera7fbd5a2016-06-16 09:17:49 -07003841 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003842
3843 return 0
3844
3845
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003846@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003848 """Show status of changelists.
3849
3850 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003851 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003852 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003853 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003854 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003855 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003856 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003857 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003858
3859 Also see 'git cl comments'.
3860 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003861 parser.add_option(
3862 '--no-branch-color',
3863 action='store_true',
3864 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003865 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003866 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003867 parser.add_option('-f', '--fast', action='store_true',
3868 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003869 parser.add_option(
3870 '-j', '--maxjobs', action='store', type=int,
3871 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003872
iannuccie53c9352016-08-17 14:40:40 -07003873 _add_codereview_issue_select_options(
3874 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003875 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003876 if args:
3877 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003878
iannuccie53c9352016-08-17 14:40:40 -07003879 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003880 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003881
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003882 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003883 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003884 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003885 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003886 elif options.field == 'id':
3887 issueid = cl.GetIssue()
3888 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003889 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003890 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003891 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003892 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003893 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003894 elif options.field == 'status':
3895 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003896 elif options.field == 'url':
3897 url = cl.GetIssueURL()
3898 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003899 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003900 return 0
3901
3902 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3903 if not branches:
3904 print('No local branch found.')
3905 return 0
3906
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003907 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003908 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003909 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003910 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003911 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003912 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003913 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003914
Daniel McArdlea23bf592019-02-12 00:25:12 +00003915 current_branch = GetCurrentBranch()
3916
3917 def FormatBranchName(branch, colorize=False):
3918 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3919 an asterisk when it is the current branch."""
3920
3921 asterisk = ""
3922 color = Fore.RESET
3923 if branch == current_branch:
3924 asterisk = "* "
3925 color = Fore.GREEN
3926 branch_name = ShortBranchName(branch)
3927
3928 if colorize:
3929 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003930 return asterisk + branch_name
3931
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003932 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003933
3934 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003935 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3936 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003937 while branch not in branch_statuses:
Edward Lemur79d4f992019-11-11 23:49:02 +00003938 c, status = next(output)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003939 branch_statuses[c.GetBranch()] = status
3940 status = branch_statuses.pop(branch)
3941 url = cl.GetIssueURL()
3942 if url and (not status or status == 'error'):
3943 # The issue probably doesn't exist anymore.
3944 url += ' (broken)'
3945
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003946 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003947 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003948 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003949 color = ''
3950 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003951 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003952
Alan Cuttera3be9a52019-03-04 18:50:33 +00003953 branch_display = FormatBranchName(branch)
3954 padding = ' ' * (alignment - len(branch_display))
3955 if not options.no_branch_color:
3956 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003957
Alan Cuttera3be9a52019-03-04 18:50:33 +00003958 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3959 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003960
vapiera7fbd5a2016-06-16 09:17:49 -07003961 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003962 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003963 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003964 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003965 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003966 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003967 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003968 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003969 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003970 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003971 print('Issue description:')
3972 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003973 return 0
3974
3975
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003976def colorize_CMDstatus_doc():
3977 """To be called once in main() to add colors to git cl status help."""
3978 colors = [i for i in dir(Fore) if i[0].isupper()]
3979
3980 def colorize_line(line):
3981 for color in colors:
3982 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003983 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003984 indent = len(line) - len(line.lstrip(' ')) + 1
3985 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3986 return line
3987
3988 lines = CMDstatus.__doc__.splitlines()
3989 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3990
3991
phajdan.jre328cf92016-08-22 04:12:17 -07003992def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003993 if path == '-':
3994 json.dump(contents, sys.stdout)
3995 else:
3996 with open(path, 'w') as f:
3997 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003998
3999
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004000@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004001@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004003 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004004
4005 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004006 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004007 parser.add_option('-r', '--reverse', action='store_true',
4008 help='Lookup the branch(es) for the specified issues. If '
4009 'no issues are specified, all branches with mapped '
4010 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004011 parser.add_option('--json',
4012 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004013 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004014 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004015
dnj@chromium.org406c4402015-03-03 17:22:28 +00004016 if options.reverse:
4017 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004018 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004019 # Reverse issue lookup.
4020 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004021
4022 git_config = {}
4023 for config in RunGit(['config', '--get-regexp',
4024 r'branch\..*issue']).splitlines():
4025 name, _space, val = config.partition(' ')
4026 git_config[name] = val
4027
dnj@chromium.org406c4402015-03-03 17:22:28 +00004028 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004029 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4030 config_key = _git_branch_config_key(ShortBranchName(branch),
4031 cls.IssueConfigKey())
4032 issue = git_config.get(config_key)
4033 if issue:
4034 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004035 if not args:
4036 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004037 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004038 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00004039 try:
4040 issue_num = int(issue)
4041 except ValueError:
4042 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004043 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00004044 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07004045 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004046 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004047 if options.json:
4048 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004049 return 0
4050
4051 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004052 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004053 if not issue.valid:
4054 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4055 'or no argument to list it.\n'
4056 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004057 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004058 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004059 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004060 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004061 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4062 if options.json:
4063 write_json(options.json, {
4064 'issue': cl.GetIssue(),
4065 'issue_url': cl.GetIssueURL(),
4066 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004067 return 0
4068
4069
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004070@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004071def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004072 """Shows or posts review comments for any changelist."""
4073 parser.add_option('-a', '--add-comment', dest='comment',
4074 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004075 parser.add_option('-p', '--publish', action='store_true',
4076 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004077 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004078 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004079 parser.add_option('-m', '--machine-readable', dest='readable',
4080 action='store_false', default=True,
4081 help='output comments in a format compatible with '
4082 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004083 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004084 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004085 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004086 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004087
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004088 issue = None
4089 if options.issue:
4090 try:
4091 issue = int(options.issue)
4092 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004093 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004094
Edward Lemur934836a2019-09-09 20:16:54 +00004095 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004096
4097 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004098 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004099 return 0
4100
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004101 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4102 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004103 for comment in summary:
4104 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004105 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004106 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004107 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004108 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004109 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004110 elif comment.autogenerated:
4111 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004112 else:
4113 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004114 print('\n%s%s %s%s\n%s' % (
4115 color,
4116 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4117 comment.sender,
4118 Fore.RESET,
4119 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4120
smut@google.comc85ac942015-09-15 16:34:43 +00004121 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004122 def pre_serialize(c):
Edward Lemur79d4f992019-11-11 23:49:02 +00004123 dct = c._asdict().copy()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004124 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4125 return dct
Edward Lemur79d4f992019-11-11 23:49:02 +00004126 write_json(options.json_file, [pre_serialize(x) for x in summary])
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004127 return 0
4128
4129
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004130@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004131@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004132def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004133 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004134 parser.add_option('-d', '--display', action='store_true',
4135 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004136 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004137 help='New description to set for this issue (- for stdin, '
4138 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004139 parser.add_option('-f', '--force', action='store_true',
4140 help='Delete any unpublished Gerrit edits for this issue '
4141 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004142
4143 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004144 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004145
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004146 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004147 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004148 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004149 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004150 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004151
Edward Lemur934836a2019-09-09 20:16:54 +00004152 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004153 if target_issue_arg:
4154 kwargs['issue'] = target_issue_arg.issue
4155 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004156
4157 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004158 if not cl.GetIssue():
4159 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004160
Edward Lemur678a6842019-10-03 22:25:05 +00004161 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004162 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004163
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004164 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004165
smut@google.com34fb6b12015-07-13 20:03:26 +00004166 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004167 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004168 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004169
4170 if options.new_description:
4171 text = options.new_description
4172 if text == '-':
4173 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004174 elif text == '+':
4175 base_branch = cl.GetCommonAncestorWithUpstream()
4176 change = cl.GetChange(base_branch, None, local_description=True)
4177 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004178
4179 description.set_description(text)
4180 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004181 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004182 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004183 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004184 return 0
4185
4186
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004187@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004188def CMDlint(parser, args):
4189 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004190 parser.add_option('--filter', action='append', metavar='-x,+y',
4191 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004192 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004193
4194 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004195 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004196 try:
4197 import cpplint
4198 import cpplint_chromium
4199 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004200 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004201 return 1
4202
4203 # Change the current working directory before calling lint so that it
4204 # shows the correct base.
4205 previous_cwd = os.getcwd()
4206 os.chdir(settings.GetRoot())
4207 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004208 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004209 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4210 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004211 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004212 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004213 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004214
4215 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004216 command = args + files
4217 if options.filter:
4218 command = ['--filter=' + ','.join(options.filter)] + command
4219 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004220
4221 white_regex = re.compile(settings.GetLintRegex())
4222 black_regex = re.compile(settings.GetLintIgnoreRegex())
4223 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4224 for filename in filenames:
4225 if white_regex.match(filename):
4226 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004227 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004228 else:
4229 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4230 extra_check_functions)
4231 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004232 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004233 finally:
4234 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004235 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004236 if cpplint._cpplint_state.error_count != 0:
4237 return 1
4238 return 0
4239
4240
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004241@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004242def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004243 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004244 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004245 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004246 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004247 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004248 parser.add_option('--all', action='store_true',
4249 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004250 parser.add_option('--parallel', action='store_true',
4251 help='Run all tests specified by input_api.RunTests in all '
4252 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004253 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004254
sbc@chromium.org71437c02015-04-09 19:29:40 +00004255 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004256 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004257 return 1
4258
Edward Lemur934836a2019-09-09 20:16:54 +00004259 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004260 if args:
4261 base_branch = args[0]
4262 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004263 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004264 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004265
Aaron Gable8076c282017-11-29 14:39:41 -08004266 if options.all:
4267 base_change = cl.GetChange(base_branch, None)
4268 files = [('M', f) for f in base_change.AllFiles()]
4269 change = presubmit_support.GitChange(
4270 base_change.Name(),
4271 base_change.FullDescriptionText(),
4272 base_change.RepositoryRoot(),
4273 files,
4274 base_change.issue,
4275 base_change.patchset,
4276 base_change.author_email,
4277 base_change._upstream)
4278 else:
4279 change = cl.GetChange(base_branch, None)
4280
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004281 cl.RunHook(
4282 committing=not options.upload,
4283 may_prompt=False,
4284 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004285 change=change,
4286 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004287 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004288
4289
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004290def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004291 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004292
4293 Works the same way as
4294 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4295 but can be called on demand on all platforms.
4296
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004297 The basic idea is to generate git hash of a state of the tree, original
4298 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004299 """
4300 lines = []
4301 tree_hash = RunGitSilent(['write-tree'])
4302 lines.append('tree %s' % tree_hash.strip())
4303 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4304 if code == 0:
4305 lines.append('parent %s' % parent.strip())
4306 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4307 lines.append('author %s' % author.strip())
4308 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4309 lines.append('committer %s' % committer.strip())
4310 lines.append('')
4311 # Note: Gerrit's commit-hook actually cleans message of some lines and
4312 # whitespace. This code is not doing this, but it clearly won't decrease
4313 # entropy.
4314 lines.append(message)
4315 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004316 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004317 return 'I%s' % change_hash.strip()
4318
4319
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004320def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004321 """Computes the remote branch ref to use for the CL.
4322
4323 Args:
4324 remote (str): The git remote for the CL.
4325 remote_branch (str): The git remote branch for the CL.
4326 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004327 """
4328 if not (remote and remote_branch):
4329 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004330
wittman@chromium.org455dc922015-01-26 20:15:50 +00004331 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004332 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004333 # refs, which are then translated into the remote full symbolic refs
4334 # below.
4335 if '/' not in target_branch:
4336 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4337 else:
4338 prefix_replacements = (
4339 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4340 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4341 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4342 )
4343 match = None
4344 for regex, replacement in prefix_replacements:
4345 match = re.search(regex, target_branch)
4346 if match:
4347 remote_branch = target_branch.replace(match.group(0), replacement)
4348 break
4349 if not match:
4350 # This is a branch path but not one we recognize; use as-is.
4351 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004352 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4353 # Handle the refs that need to land in different refs.
4354 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004355
wittman@chromium.org455dc922015-01-26 20:15:50 +00004356 # Create the true path to the remote branch.
4357 # Does the following translation:
4358 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4359 # * refs/remotes/origin/master -> refs/heads/master
4360 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4361 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4362 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4363 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4364 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4365 'refs/heads/')
4366 elif remote_branch.startswith('refs/remotes/branch-heads'):
4367 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004368
wittman@chromium.org455dc922015-01-26 20:15:50 +00004369 return remote_branch
4370
4371
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004372def cleanup_list(l):
4373 """Fixes a list so that comma separated items are put as individual items.
4374
4375 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4376 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4377 """
4378 items = sum((i.split(',') for i in l), [])
4379 stripped_items = (i.strip() for i in items)
4380 return sorted(filter(None, stripped_items))
4381
4382
Aaron Gable4db38df2017-11-03 14:59:07 -07004383@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004384@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004385def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004386 """Uploads the current changelist to codereview.
4387
4388 Can skip dependency patchset uploads for a branch by running:
4389 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004390 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004391 git config --unset branch.branch_name.skip-deps-uploads
4392 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004393
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004394 If the name of the checked out branch starts with "bug-" or "fix-" followed
4395 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004396 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004397
4398 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004399 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004400 [git-cl] add support for hashtags
4401 Foo bar: implement foo
4402 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004403 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004404 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4405 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004406 parser.add_option('--bypass-watchlists', action='store_true',
4407 dest='bypass_watchlists',
4408 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004409 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004410 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004411 parser.add_option('--message', '-m', dest='message',
4412 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004413 parser.add_option('-b', '--bug',
4414 help='pre-populate the bug number(s) for this issue. '
4415 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004416 parser.add_option('--message-file', dest='message_file',
4417 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004418 parser.add_option('--title', '-t', dest='title',
4419 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004420 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004421 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004422 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004423 parser.add_option('--tbrs',
4424 action='append', default=[],
4425 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004426 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004427 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004428 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004429 parser.add_option('--hashtag', dest='hashtags',
4430 action='append', default=[],
4431 help=('Gerrit hashtag for new CL; '
4432 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004433 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004434 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004435 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004436 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004437 metavar='TARGET',
4438 help='Apply CL to remote ref TARGET. ' +
4439 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004440 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004441 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004442 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004443 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004444 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004445 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004446 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4447 const='TBR', help='add a set of OWNERS to TBR')
4448 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4449 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004450 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004451 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004452 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004453 'implies --send-mail')
4454 parser.add_option('-d', '--cq-dry-run',
4455 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004456 help='Send the patchset to do a CQ dry run right after '
4457 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004458 parser.add_option('--preserve-tryjobs', action='store_true',
4459 help='instruct the CQ to let tryjobs running even after '
4460 'new patchsets are uploaded instead of canceling '
4461 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004462 parser.add_option('--dependencies', action='store_true',
4463 help='Uploads CLs of all the local branches that depend on '
4464 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004465 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4466 help='Sends your change to the CQ after an approval. Only '
4467 'works on repos that have the Auto-Submit label '
4468 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004469 parser.add_option('--parallel', action='store_true',
4470 help='Run all tests specified by input_api.RunTests in all '
4471 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004472 parser.add_option('--no-autocc', action='store_true',
4473 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004474 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004475 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004476 parser.add_option('-R', '--retry-failed', action='store_true',
4477 help='Retry failed tryjobs from old patchset immediately '
4478 'after uploading new patchset. Cannot be used with '
4479 '--use-commit-queue or --cq-dry-run.')
4480 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4481 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004482 parser.add_option('--fixed', '-x',
4483 help='List of bugs that will be commented on and marked '
4484 'fixed (pre-populates "Fixed:" tag). Same format as '
4485 '-b option / "Bug:" tag. If fixing several issues, '
4486 'separate with commas.')
Josipe827b0f2020-01-30 00:07:20 +00004487 parser.add_option('--edit-description', action='store_true', default=False,
4488 help='Modify description before upload. Cannot be used '
4489 'with --force. It is a noop when --no-squash is set '
4490 'or a new commit is created.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004491
rmistry@google.com2dd99862015-06-22 12:22:18 +00004492 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004493 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004494 (options, args) = parser.parse_args(args)
4495
sbc@chromium.org71437c02015-04-09 19:29:40 +00004496 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004497 return 1
4498
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004499 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004500 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004501 options.cc = cleanup_list(options.cc)
4502
Josipe827b0f2020-01-30 00:07:20 +00004503 if options.edit_description and options.force:
4504 parser.error('Only one of --force and --edit-description allowed')
4505
tandriib80458a2016-06-23 12:20:07 -07004506 if options.message_file:
4507 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004508 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004509 options.message = gclient_utils.FileRead(options.message_file)
4510 options.message_file = None
4511
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004512 if ([options.cq_dry_run,
4513 options.use_commit_queue,
4514 options.retry_failed].count(True) > 1):
4515 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4516 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004517
Aaron Gableedbc4132017-09-11 13:22:28 -07004518 if options.use_commit_queue:
4519 options.send_mail = True
4520
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004521 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4522 settings.GetIsGerrit()
4523
Edward Lemur934836a2019-09-09 20:16:54 +00004524 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004525 if options.retry_failed and not cl.GetIssue():
4526 print('No previous patchsets, so --retry-failed has no effect.')
4527 options.retry_failed = False
4528 # cl.GetMostRecentPatchset uses cached information, and can return the last
4529 # patchset before upload. Calling it here makes it clear that it's the
4530 # last patchset before upload. Note that GetMostRecentPatchset will fail
4531 # if no CL has been uploaded yet.
4532 if options.retry_failed:
4533 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004534
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004535 ret = cl.CMDUpload(options, args, orig_args)
4536
4537 if options.retry_failed:
4538 if ret != 0:
4539 print('Upload failed, so --retry-failed has no effect.')
4540 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004541 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004542 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004543 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004544 if len(buckets) == 0:
4545 print('No failed tryjobs, so --retry-failed has no effect.')
4546 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004547 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004548
4549 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004550
4551
Francois Dorayd42c6812017-05-30 15:10:20 -04004552@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004553@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004554def CMDsplit(parser, args):
4555 """Splits a branch into smaller branches and uploads CLs.
4556
4557 Creates a branch and uploads a CL for each group of files modified in the
4558 current branch that share a common OWNERS file. In the CL description and
Yannic Bonenberger68409632020-01-23 18:29:01 +00004559 comment, '$directory' is replaced with the directory containing the changes
4560 in this CL, '$cl_index' is replaced with the index of the CL we're currently
4561 sending out, and '$num_cls' is replaced with the total number of CLs that
4562 we're sending out in this split.
Francois Dorayd42c6812017-05-30 15:10:20 -04004563 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004564 parser.add_option('-d', '--description', dest='description_file',
4565 help='A text file containing a CL description in which '
4566 '$directory will be replaced by each CL\'s directory.')
4567 parser.add_option('-c', '--comment', dest='comment_file',
4568 help='A text file containing a CL comment.')
4569 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004570 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004571 help='List the files and reviewers for each CL that would '
4572 'be created, but don\'t create branches or CLs.')
4573 parser.add_option('--cq-dry-run', action='store_true',
4574 help='If set, will do a cq dry run for each uploaded CL. '
4575 'Please be careful when doing this; more than ~10 CLs '
4576 'has the potential to overload our build '
4577 'infrastructure. Try to upload these not during high '
4578 'load times (usually 11-3 Mountain View time). Email '
4579 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004580 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4581 default=True,
4582 help='Sends your change to the CQ after an approval. Only '
4583 'works on repos that have the Auto-Submit label '
4584 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004585 options, _ = parser.parse_args(args)
4586
4587 if not options.description_file:
4588 parser.error('No --description flag specified.')
4589
4590 def WrappedCMDupload(args):
4591 return CMDupload(OptionParser(), args)
4592
4593 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004594 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004595 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004596
4597
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004598@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004599@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004600def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004601 """DEPRECATED: Used to commit the current changelist via git-svn."""
4602 message = ('git-cl no longer supports committing to SVN repositories via '
4603 'git-svn. You probably want to use `git cl land` instead.')
4604 print(message)
4605 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004606
4607
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004608@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004609@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004610def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004611 """Commits the current changelist via git.
4612
4613 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4614 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004615 """
4616 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4617 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004618 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004619 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004620 parser.add_option('--parallel', action='store_true',
4621 help='Run all tests specified by input_api.RunTests in all '
4622 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004623 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004624
Edward Lemur934836a2019-09-09 20:16:54 +00004625 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004626
Robert Iannucci2e73d432018-03-14 01:10:47 -07004627 if not cl.GetIssue():
4628 DieWithError('You must upload the change first to Gerrit.\n'
4629 ' If you would rather have `git cl land` upload '
4630 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004631 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004632 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004633
4634
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004635@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004636@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004637def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004638 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004639 parser.add_option('-b', dest='newbranch',
4640 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004641 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004642 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004643 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004644 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004645
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004646 group = optparse.OptionGroup(
4647 parser,
4648 'Options for continuing work on the current issue uploaded from a '
4649 'different clone (e.g. different machine). Must be used independently '
4650 'from the other options. No issue number should be specified, and the '
4651 'branch must have an issue number associated with it')
4652 group.add_option('--reapply', action='store_true', dest='reapply',
4653 help='Reset the branch and reapply the issue.\n'
4654 'CAUTION: This will undo any local changes in this '
4655 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004656
4657 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004658 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004659 parser.add_option_group(group)
4660
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004661 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004662 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004663
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004664 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004665 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004666 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004667 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004668 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004669
Edward Lemur934836a2019-09-09 20:16:54 +00004670 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004671 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004672 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004673
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004674 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004675 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004676 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004677
4678 RunGit(['reset', '--hard', upstream])
4679 if options.pull:
4680 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004681
Edward Lemur678a6842019-10-03 22:25:05 +00004682 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4683 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004684
4685 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004686 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004687
Edward Lemurf38bc172019-09-03 21:02:13 +00004688 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004689 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004690 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004691
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004692 # We don't want uncommitted changes mixed up with the patch.
4693 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004694 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004695
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004696 if options.newbranch:
4697 if options.force:
4698 RunGit(['branch', '-D', options.newbranch],
4699 stderr=subprocess2.PIPE, error_ok=True)
4700 RunGit(['new-branch', options.newbranch])
4701
Edward Lemur678a6842019-10-03 22:25:05 +00004702 cl = Changelist(
4703 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004704
Edward Lemur678a6842019-10-03 22:25:05 +00004705 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004706 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004707
Edward Lemurf38bc172019-09-03 21:02:13 +00004708 return cl.CMDPatchWithParsedIssue(
4709 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004710
4711
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004712def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004713 """Fetches the tree status and returns either 'open', 'closed',
4714 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004715 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004716 if url:
Edward Lemur79d4f992019-11-11 23:49:02 +00004717 status = urllib.request.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004718 if status.find('closed') != -1 or status == '0':
4719 return 'closed'
4720 elif status.find('open') != -1 or status == '1':
4721 return 'open'
4722 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004723 return 'unset'
4724
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004725
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004726def GetTreeStatusReason():
4727 """Fetches the tree status from a json url and returns the message
4728 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004729 url = settings.GetTreeStatusUrl()
4730 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemur79d4f992019-11-11 23:49:02 +00004731 connection = urllib.request.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004732 status = json.loads(connection.read())
4733 connection.close()
4734 return status['message']
4735
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004736
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004737@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004738def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004739 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004740 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004741 status = GetTreeStatus()
4742 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004743 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004744 return 2
4745
vapiera7fbd5a2016-06-16 09:17:49 -07004746 print('The tree is %s' % status)
4747 print()
4748 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004749 if status != 'open':
4750 return 1
4751 return 0
4752
4753
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004754@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004755def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004756 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4757 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004758 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004759 '-b', '--bot', action='append',
4760 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4761 'times to specify multiple builders. ex: '
4762 '"-b win_rel -b win_layout". See '
4763 'the try server waterfall for the builders name and the tests '
4764 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004765 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004766 '-B', '--bucket', default='',
4767 help=('Buildbucket bucket to send the try requests.'))
4768 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004769 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004770 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004771 'be determined by the try recipe that builder runs, which usually '
4772 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004773 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004774 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004775 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004776 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004777 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004778 '--category', default='git_cl_try', help='Specify custom build category.')
4779 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004780 '--project',
4781 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004782 'in recipe to determine to which repository or directory to '
4783 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004784 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004785 '-p', '--property', dest='properties', action='append', default=[],
4786 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004787 'key2=value2 etc. The value will be treated as '
4788 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004789 'NOTE: using this may make your tryjob not usable for CQ, '
4790 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004791 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004792 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4793 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004794 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004795 parser.add_option(
4796 '-R', '--retry-failed', action='store_true', default=False,
4797 help='Retry failed jobs from the latest set of tryjobs. '
4798 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004799 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004800 options, args = parser.parse_args(args)
4801
machenbach@chromium.org45453142015-09-15 08:45:22 +00004802 # Make sure that all properties are prop=value pairs.
4803 bad_params = [x for x in options.properties if '=' not in x]
4804 if bad_params:
4805 parser.error('Got properties with missing "=": %s' % bad_params)
4806
maruel@chromium.org15192402012-09-06 12:38:29 +00004807 if args:
4808 parser.error('Unknown arguments: %s' % args)
4809
Edward Lemur934836a2019-09-09 20:16:54 +00004810 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004811 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004812 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004813
Edward Lemurf38bc172019-09-03 21:02:13 +00004814 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004815 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004816
tandriie113dfd2016-10-11 10:20:12 -07004817 error_message = cl.CannotTriggerTryJobReason()
4818 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004819 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004820
Quinten Yearsley983111f2019-09-26 17:18:48 +00004821 if options.retry_failed:
4822 if options.bot or options.bucket:
4823 print('ERROR: The option --retry-failed is not compatible with '
4824 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4825 return 1
4826 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004827 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004828 if options.verbose:
4829 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004830 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004831 if not buckets:
4832 print('There are no failed jobs in the latest set of jobs '
4833 '(patchset #%d), doing nothing.' % patchset)
4834 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004835 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004836 if num_builders > 10:
4837 confirm_or_exit('There are %d builders with failed builds.'
4838 % num_builders, action='continue')
4839 else:
4840 buckets = _get_bucket_map(cl, options, parser)
4841 if buckets and any(b.startswith('master.') for b in buckets):
4842 print('ERROR: Buildbot masters are not supported.')
4843 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004844
qyearsleydd49f942016-10-28 11:57:22 -07004845 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4846 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004847 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004848 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004849 print('git cl try with no bots now defaults to CQ dry run.')
4850 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4851 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004852
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004853 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004854 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004855 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004856 'of bot requires an initial job from a parent (usually a builder). '
4857 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004858 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004859 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004860
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004861 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004862 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004863 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004864 except BuildbucketResponseException as ex:
4865 print('ERROR: %s' % ex)
4866 return 1
4867 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004868
4869
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004870@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004871def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004872 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004873 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004874 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004875 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004876 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004877 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004878 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004879 '--color', action='store_true', default=setup_color.IS_TTY,
4880 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004881 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004882 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4883 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004884 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004885 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004886 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004887 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004888 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004889 options, args = parser.parse_args(args)
4890 if args:
4891 parser.error('Unrecognized args: %s' % ' '.join(args))
4892
Edward Lemur934836a2019-09-09 20:16:54 +00004893 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004894 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004895 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004896
tandrii221ab252016-10-06 08:12:04 -07004897 patchset = options.patchset
4898 if not patchset:
4899 patchset = cl.GetMostRecentPatchset()
4900 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004901 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004902 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004903 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004904 cl.GetIssue())
4905
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004906 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004907 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004908 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004909 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004910 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004911 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004912 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004913 else:
4914 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004915 return 0
4916
4917
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004918@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004919@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004920def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004921 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004922 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004923 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004924 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004925
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004926 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004927 if args:
4928 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004929 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004930 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004931 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004932 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004933
4934 # Clear configured merge-base, if there is one.
4935 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004936 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004937 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004938 return 0
4939
4940
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004941@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004942def CMDweb(parser, args):
4943 """Opens the current CL in the web browser."""
4944 _, args = parser.parse_args(args)
4945 if args:
4946 parser.error('Unrecognized args: %s' % ' '.join(args))
4947
4948 issue_url = Changelist().GetIssueURL()
4949 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004950 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004951 return 1
4952
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004953 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004954 # allows us to hide the "Created new window in existing browser session."
4955 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004956 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004957 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004958 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004959 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004960 os.open(os.devnull, os.O_RDWR)
4961 try:
4962 webbrowser.open(issue_url)
4963 finally:
4964 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004965 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004966 return 0
4967
4968
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004969@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004970def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004971 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004972 parser.add_option('-d', '--dry-run', action='store_true',
4973 help='trigger in dry run mode')
4974 parser.add_option('-c', '--clear', action='store_true',
4975 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004976 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004977 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004978 if args:
4979 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004980 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004981 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004982
Edward Lemur934836a2019-09-09 20:16:54 +00004983 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004984 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004985 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004986 elif options.dry_run:
4987 state = _CQState.DRY_RUN
4988 else:
4989 state = _CQState.COMMIT
4990 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004991 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004992 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004993 return 0
4994
4995
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004996@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004997def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004998 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004999 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005000 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00005001 if args:
5002 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00005003 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00005004 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005005 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005006 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00005007 cl.CloseIssue()
5008 return 0
5009
5010
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005011@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005012def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005013 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005014 parser.add_option(
5015 '--stat',
5016 action='store_true',
5017 dest='stat',
5018 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005019 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005020 if args:
5021 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005022
Edward Lemur934836a2019-09-09 20:16:54 +00005023 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005024 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005025 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005026 if not issue:
5027 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005028
Aaron Gablea718c3e2017-08-28 17:47:28 -07005029 base = cl._GitGetBranchConfigValue('last-upload-hash')
5030 if not base:
5031 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5032 if not base:
5033 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5034 revision_info = detail['revisions'][detail['current_revision']]
5035 fetch_info = revision_info['fetch']['http']
5036 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5037 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005038
Aaron Gablea718c3e2017-08-28 17:47:28 -07005039 cmd = ['git', 'diff']
5040 if options.stat:
5041 cmd.append('--stat')
5042 cmd.append(base)
5043 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005044
5045 return 0
5046
5047
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005048@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005049def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005050 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005051 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005052 '--ignore-current',
5053 action='store_true',
5054 help='Ignore the CL\'s current reviewers and start from scratch.')
5055 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005056 '--ignore-self',
5057 action='store_true',
5058 help='Do not consider CL\'s author as an owners.')
5059 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005060 '--no-color',
5061 action='store_true',
5062 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005063 parser.add_option(
5064 '--batch',
5065 action='store_true',
5066 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005067 # TODO: Consider moving this to another command, since other
5068 # git-cl owners commands deal with owners for a given CL.
5069 parser.add_option(
5070 '--show-all',
5071 action='store_true',
5072 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005073 options, args = parser.parse_args(args)
5074
5075 author = RunGit(['config', 'user.email']).strip() or None
5076
Edward Lemur934836a2019-09-09 20:16:54 +00005077 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005078
Yang Guo6e269a02019-06-26 11:17:02 +00005079 if options.show_all:
5080 for arg in args:
5081 base_branch = cl.GetCommonAncestorWithUpstream()
5082 change = cl.GetChange(base_branch, None)
5083 database = owners.Database(change.RepositoryRoot(), file, os.path)
5084 database.load_data_needed_for([arg])
5085 print('Owners for %s:' % arg)
5086 for owner in sorted(database.all_possible_owners([arg], None)):
5087 print(' - %s' % owner)
5088 return 0
5089
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005090 if args:
5091 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005092 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005093 base_branch = args[0]
5094 else:
5095 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005096 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005097
5098 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005099 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5100
5101 if options.batch:
5102 db = owners.Database(change.RepositoryRoot(), file, os.path)
5103 print('\n'.join(db.reviewers_for(affected_files, author)))
5104 return 0
5105
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005106 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005107 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005108 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005109 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005110 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005111 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005112 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005113 override_files=change.OriginalOwnersFiles(),
5114 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005115
5116
Aiden Bennerc08566e2018-10-03 17:52:42 +00005117def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005118 """Generates a diff command."""
5119 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005120 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5121
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005122 if allow_prefix:
5123 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5124 # case that diff.noprefix is set in the user's git config.
5125 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5126 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005127 diff_cmd += ['--no-prefix']
5128
5129 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005130
5131 if args:
5132 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005133 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005134 diff_cmd.append(arg)
5135 else:
5136 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005137
5138 return diff_cmd
5139
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005140
Jamie Madill5e96ad12020-01-13 16:08:35 +00005141def _RunClangFormatDiff(opts, clang_diff_files, top_dir, upstream_commit):
5142 """Runs clang-format-diff and sets a return value if necessary."""
5143
5144 if not clang_diff_files:
5145 return 0
5146
5147 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5148 # formatted. This is used to block during the presubmit.
5149 return_value = 0
5150
5151 # Locate the clang-format binary in the checkout
5152 try:
5153 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
5154 except clang_format.NotFoundError as e:
5155 DieWithError(e)
5156
5157 if opts.full or settings.GetFormatFullByDefault():
5158 cmd = [clang_format_tool]
5159 if not opts.dry_run and not opts.diff:
5160 cmd.append('-i')
5161 if opts.dry_run:
5162 for diff_file in clang_diff_files:
5163 with open(diff_file, 'r') as myfile:
5164 code = myfile.read().replace('\r\n', '\n')
5165 stdout = RunCommand(cmd + [diff_file], cwd=top_dir)
5166 stdout = stdout.replace('\r\n', '\n')
5167 if opts.diff:
5168 sys.stdout.write(stdout)
5169 if code != stdout:
5170 return_value = 2
5171 else:
5172 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
5173 if opts.diff:
5174 sys.stdout.write(stdout)
5175 else:
5176 env = os.environ.copy()
5177 env['PATH'] = str(os.path.dirname(clang_format_tool))
5178 try:
5179 script = clang_format.FindClangFormatScriptInChromiumTree(
5180 'clang-format-diff.py')
5181 except clang_format.NotFoundError as e:
5182 DieWithError(e)
5183
5184 cmd = [sys.executable, script, '-p0']
5185 if not opts.dry_run and not opts.diff:
5186 cmd.append('-i')
5187
5188 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5189 diff_output = RunGit(diff_cmd)
5190
5191 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5192 if opts.diff:
5193 sys.stdout.write(stdout)
5194 if opts.dry_run and len(stdout) > 0:
5195 return_value = 2
5196
5197 return return_value
5198
5199
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005200def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005201 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005202 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005203
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005204
enne@chromium.org555cfe42014-01-29 18:21:39 +00005205@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005206@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005207def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005208 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005209 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005210 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005211 parser.add_option('--full', action='store_true',
5212 help='Reformat the full content of all touched files')
5213 parser.add_option('--dry-run', action='store_true',
5214 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005215 parser.add_option(
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005216 '--no-clang-format',
5217 dest='clang_format',
5218 action='store_false',
5219 default=True,
5220 help='Disables formatting of various file types using clang-format.')
5221 parser.add_option(
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005222 '--python',
5223 action='store_true',
5224 default=None,
5225 help='Enables python formatting on all python files.')
5226 parser.add_option(
5227 '--no-python',
5228 action='store_true',
Garrett Beaty91a6f332020-01-06 16:57:24 +00005229 default=False,
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005230 help='Disables python formatting on all python files. '
Garrett Beaty91a6f332020-01-06 16:57:24 +00005231 'If neither --python or --no-python are set, python files that have a '
5232 '.style.yapf file in an ancestor directory will be formatted. '
5233 'It is an error to set both.')
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005234 parser.add_option(
5235 '--js',
5236 action='store_true',
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005237 default=None,
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005238 help='Format javascript code with clang-format. '
5239 'Has no effect if --no-clang-format is set.')
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005240 parser.add_option(
5241 '--no-js',
5242 action='store_true',
5243 default=False,
5244 help='Disable JavaScript/TypeScript formatting code with clang-format. '
5245 'Has no effect if --no-clang-format is set.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005246 parser.add_option('--diff', action='store_true',
5247 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005248 parser.add_option('--presubmit', action='store_true',
5249 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005250 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005251
Garrett Beaty91a6f332020-01-06 16:57:24 +00005252 if opts.python is not None and opts.no_python:
5253 raise parser.error('Cannot set both --python and --no-python')
5254 if opts.no_python:
5255 opts.python = False
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005256 if opts.js is not None and opts.no_js:
5257 raise parser.error('Cannot set both --js and --no-js')
5258 if opts.no_js:
5259 opts.js = False
Garrett Beaty91a6f332020-01-06 16:57:24 +00005260
Daniel Chengc55eecf2016-12-30 03:11:02 -08005261 # Normalize any remaining args against the current path, so paths relative to
5262 # the current directory are still resolved as expected.
5263 args = [os.path.join(os.getcwd(), arg) for arg in args]
5264
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005265 # git diff generates paths against the root of the repository. Change
5266 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005267 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005268 if rel_base_path:
5269 os.chdir(rel_base_path)
5270
digit@chromium.org29e47272013-05-17 17:01:46 +00005271 # Grab the merge-base commit, i.e. the upstream commit of the current
5272 # branch when it was created or the last time it was rebased. This is
5273 # to cover the case where the user may have called "git fetch origin",
5274 # moving the origin branch to a newer commit, but hasn't rebased yet.
5275 upstream_commit = None
5276 cl = Changelist()
5277 upstream_branch = cl.GetUpstreamBranch()
5278 if upstream_branch:
5279 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5280 upstream_commit = upstream_commit.strip()
5281
5282 if not upstream_commit:
5283 DieWithError('Could not find base commit for this branch. '
5284 'Are you in detached state?')
5285
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005286 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5287 diff_output = RunGit(changed_files_cmd)
5288 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005289 # Filter out files deleted by this CL
5290 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005291
Tim van der Lippe42a51f62020-01-31 19:41:09 +00005292 js_explicitly_disabled = opts.js is not None and not opts.js
5293 if not js_explicitly_disabled:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005294 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005295
Garrett Beatyed0cc5f2020-01-06 17:26:13 +00005296 clang_diff_files = []
5297 if opts.clang_format:
5298 clang_diff_files = [
5299 x for x in diff_files if MatchingFileType(x, CLANG_EXTS)
5300 ]
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005301 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5302 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005303 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005304
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005305 top_dir = os.path.normpath(
5306 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5307
Jamie Madill5e96ad12020-01-13 16:08:35 +00005308 return_value = _RunClangFormatDiff(opts, clang_diff_files, top_dir,
5309 upstream_commit)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005310
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005311 # Similar code to above, but using yapf on .py files rather than clang-format
5312 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005313 py_explicitly_disabled = opts.python is not None and not opts.python
5314 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005315 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5316 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5317 if sys.platform.startswith('win'):
5318 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005319
Aiden Bennerc08566e2018-10-03 17:52:42 +00005320 # Used for caching.
5321 yapf_configs = {}
5322 for f in python_diff_files:
5323 # Find the yapf style config for the current file, defaults to depot
5324 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005325 _FindYapfConfigFile(f, yapf_configs, top_dir)
5326
5327 # Turn on python formatting by default if a yapf config is specified.
5328 # This breaks in the case of this repo though since the specified
5329 # style file is also the global default.
5330 if opts.python is None:
5331 filtered_py_files = []
5332 for f in python_diff_files:
5333 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5334 filtered_py_files.append(f)
5335 else:
5336 filtered_py_files = python_diff_files
5337
5338 # Note: yapf still seems to fix indentation of the entire file
5339 # even if line ranges are specified.
5340 # See https://github.com/google/yapf/issues/499
5341 if not opts.full and filtered_py_files:
5342 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5343
Brian Sheedyb4307d52019-12-02 19:18:17 +00005344 yapfignore_patterns = _GetYapfIgnorePatterns(top_dir)
5345 filtered_py_files = _FilterYapfIgnoredFiles(filtered_py_files,
5346 yapfignore_patterns)
Brian Sheedy59b06a82019-10-14 17:03:29 +00005347
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005348 for f in filtered_py_files:
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005349 yapf_style = _FindYapfConfigFile(f, yapf_configs, top_dir)
5350 # Default to pep8 if not .style.yapf is found.
5351 if not yapf_style:
5352 yapf_style = 'pep8'
Aiden Bennerc08566e2018-10-03 17:52:42 +00005353
Andrew Grievefa40bfa2020-01-07 02:32:57 +00005354 cmd = [yapf_tool, '--style', yapf_style, f]
Aiden Bennerc08566e2018-10-03 17:52:42 +00005355
5356 has_formattable_lines = False
5357 if not opts.full:
5358 # Only run yapf over changed line ranges.
5359 for diff_start, diff_len in py_line_diffs[f]:
5360 diff_end = diff_start + diff_len - 1
5361 # Yapf errors out if diff_end < diff_start but this
5362 # is a valid line range diff for a removal.
5363 if diff_end >= diff_start:
5364 has_formattable_lines = True
5365 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5366 # If all line diffs were removals we have nothing to format.
5367 if not has_formattable_lines:
5368 continue
5369
5370 if opts.diff or opts.dry_run:
5371 cmd += ['--diff']
5372 # Will return non-zero exit code if non-empty diff.
5373 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5374 if opts.diff:
5375 sys.stdout.write(stdout)
5376 elif len(stdout) > 0:
5377 return_value = 2
5378 else:
5379 cmd += ['-i']
5380 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005381
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005382 # Dart's formatter does not have the nice property of only operating on
5383 # modified chunks, so hard code full.
5384 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005385 try:
5386 command = [dart_format.FindDartFmtToolInChromiumTree()]
5387 if not opts.dry_run and not opts.diff:
5388 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005389 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005390
ppi@chromium.org6593d932016-03-03 15:41:15 +00005391 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005392 if opts.dry_run and stdout:
5393 return_value = 2
Jamie Madill5e96ad12020-01-13 16:08:35 +00005394 except dart_format.NotFoundError:
vapiera7fbd5a2016-06-16 09:17:49 -07005395 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5396 'found in this checkout. Files in other languages are still '
5397 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005398
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005399 # Format GN build files. Always run on full build files for canonical form.
5400 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005401 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005402 if opts.dry_run or opts.diff:
5403 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005404 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005405 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5406 shell=sys.platform == 'win32',
5407 cwd=top_dir)
5408 if opts.dry_run and gn_ret == 2:
5409 return_value = 2 # Not formatted.
5410 elif opts.diff and gn_ret == 2:
5411 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005412 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005413 elif gn_ret != 0:
5414 # For non-dry run cases (and non-2 return values for dry-run), a
5415 # nonzero error code indicates a failure, probably because the file
5416 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005417 DieWithError('gn format failed on ' + gn_diff_file +
5418 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005419
Ilya Shermane081cbe2017-08-15 17:51:04 -07005420 # Skip the metrics formatting from the global presubmit hook. These files have
5421 # a separate presubmit hook that issues an error if the files need formatting,
5422 # whereas the top-level presubmit script merely issues a warning. Formatting
5423 # these files is somewhat slow, so it's important not to duplicate the work.
5424 if not opts.presubmit:
5425 for xml_dir in GetDirtyMetricsDirs(diff_files):
5426 tool_dir = os.path.join(top_dir, xml_dir)
5427 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5428 if opts.dry_run or opts.diff:
5429 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005430 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005431 if opts.diff:
5432 sys.stdout.write(stdout)
5433 if opts.dry_run and stdout:
5434 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005435
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005436 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005437
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005438
Steven Holte2e664bf2017-04-21 13:10:47 -07005439def GetDirtyMetricsDirs(diff_files):
5440 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5441 metrics_xml_dirs = [
5442 os.path.join('tools', 'metrics', 'actions'),
5443 os.path.join('tools', 'metrics', 'histograms'),
5444 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005445 os.path.join('tools', 'metrics', 'ukm'),
5446 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005447 for xml_dir in metrics_xml_dirs:
5448 if any(file.startswith(xml_dir) for file in xml_diff_files):
5449 yield xml_dir
5450
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005451
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005452@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005453@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005454def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005455 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005456 _, args = parser.parse_args(args)
5457
5458 if len(args) != 1:
5459 parser.print_help()
5460 return 1
5461
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005462 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005463 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005464 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005465
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005466 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005467
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005468 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005469 output = RunGit(['config', '--local', '--get-regexp',
5470 r'branch\..*\.%s' % issueprefix],
5471 error_ok=True)
5472 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005473 if issue == target_issue:
5474 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005475
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005476 branches = []
5477 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005478 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005479 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005480 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005481 return 1
5482 if len(branches) == 1:
5483 RunGit(['checkout', branches[0]])
5484 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005485 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005486 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005487 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005488 which = raw_input('Choose by index: ')
5489 try:
5490 RunGit(['checkout', branches[int(which)]])
5491 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005492 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005493 return 1
5494
5495 return 0
5496
5497
maruel@chromium.org29404b52014-09-08 22:58:00 +00005498def CMDlol(parser, args):
5499 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005500 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005501 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5502 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5503 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005504 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005505 return 0
5506
5507
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005508class OptionParser(optparse.OptionParser):
5509 """Creates the option parse and add --verbose support."""
5510 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005511 optparse.OptionParser.__init__(
5512 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005513 self.add_option(
5514 '-v', '--verbose', action='count', default=0,
5515 help='Use 2 times for more debugging info')
5516
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005517 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005518 try:
5519 return self._parse_args(args)
5520 finally:
5521 # Regardless of success or failure of args parsing, we want to report
5522 # metrics, but only after logging has been initialized (if parsing
5523 # succeeded).
5524 global settings
5525 settings = Settings()
5526
5527 if not metrics.DISABLE_METRICS_COLLECTION:
5528 # GetViewVCUrl ultimately calls logging method.
5529 project_url = settings.GetViewVCUrl().strip('/+')
5530 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5531 metrics.collector.add('project_urls', [project_url])
5532
5533 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005534 # Create an optparse.Values object that will store only the actual passed
5535 # options, without the defaults.
5536 actual_options = optparse.Values()
5537 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5538 # Create an optparse.Values object with the default options.
5539 options = optparse.Values(self.get_default_values().__dict__)
5540 # Update it with the options passed by the user.
5541 options._update_careful(actual_options.__dict__)
5542 # Store the options passed by the user in an _actual_options attribute.
5543 # We store only the keys, and not the values, since the values can contain
5544 # arbitrary information, which might be PII.
Edward Lemur79d4f992019-11-11 23:49:02 +00005545 metrics.collector.add('arguments', list(actual_options.__dict__.keys()))
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005546
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005547 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005548 logging.basicConfig(
5549 level=levels[min(options.verbose, len(levels) - 1)],
5550 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5551 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005552
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005553 return options, args
5554
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005555
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005556def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005557 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005558 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005559 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005560 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005561
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005562 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005563 dispatcher = subcommand.CommandDispatcher(__name__)
5564 try:
5565 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005566 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005567 DieWithError(str(e))
Edward Lemur79d4f992019-11-11 23:49:02 +00005568 except urllib.error.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005569 if e.code != 500:
5570 raise
5571 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005572 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005573 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005574 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005575
5576
5577if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005578 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5579 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005580 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005581 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005582 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005583 sys.exit(main(sys.argv[1:]))