blob: b2eef88454bbfc0083c2fecc8c5efffba7a609f4 [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 Sheedy59b06a82019-10-14 17:03:29 +000017import glob
Edward Lemurd2a5a4c2019-10-23 22:55:26 +000018import httplib
Edward Lemur202c5592019-10-21 22:44:52 +000019import httplib2
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000032import time
Edward Lemurd2a5a4c2019-10-23 22:55:26 +000033import urllib
34import urllib2
35import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000036import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000037import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000038import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000039
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000040from third_party import colorama
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000041import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000042import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000043import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000044import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000045import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000046import gerrit_util
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000048import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000049import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000050import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000051import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000052import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000053import presubmit_support
54import scm
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000055import setup_color
Francois Dorayd42c6812017-05-30 15:10:20 -040056import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000057import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000058import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import watchlists
60
tandrii7400cf02016-06-21 08:48:07 -070061__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062
Edward Lemur0f58ae42019-04-30 17:24:12 +000063# Traces for git push will be stored in a traces directory inside the
64# depot_tools checkout.
65DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
66TRACES_DIR = os.path.join(DEPOT_TOOLS, 'traces')
67
68# When collecting traces, Git hashes will be reduced to 6 characters to reduce
69# the size after compression.
70GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
71# Used to redact the cookies from the gitcookies file.
72GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
73
Edward Lemurd4d1ba42019-09-20 21:46:37 +000074MAX_ATTEMPTS = 3
75
Edward Lemur1b52d872019-05-09 21:12:12 +000076# The maximum number of traces we will keep. Multiplied by 3 since we store
77# 3 files per trace.
78MAX_TRACES = 3 * 10
Edward Lemur5737f022019-05-17 01:24:00 +000079# Message to be displayed to the user to inform where to find the traces for a
80# git-cl upload execution.
Edward Lemur0f58ae42019-04-30 17:24:12 +000081TRACES_MESSAGE = (
Edward Lemur1b52d872019-05-09 21:12:12 +000082'\n'
Edward Lemur5737f022019-05-17 01:24:00 +000083'The traces of this git-cl execution have been recorded at:\n'
Edward Lemur1b52d872019-05-09 21:12:12 +000084' %(trace_name)s-traces.zip\n'
Edward Lemur5737f022019-05-17 01:24:00 +000085'Copies of your gitcookies file and git config have been recorded at:\n'
86' %(trace_name)s-git-info.zip\n')
Edward Lemur1b52d872019-05-09 21:12:12 +000087# Format of the message to be stored as part of the traces to give developers a
88# better context when they go through traces.
89TRACES_README_FORMAT = (
90'Date: %(now)s\n'
91'\n'
92'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
93'Title: %(title)s\n'
94'\n'
95'%(description)s\n'
96'\n'
97'Execution time: %(execution_time)s\n'
98'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
Edward Lemur0f58ae42019-04-30 17:24:12 +000099
tandrii9d2c7a32016-06-22 03:42:45 -0700100COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800101POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +0000103REFS_THAT_ALIAS_TO_OTHER_REFS = {
104 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
105 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
106}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000107
thestig@chromium.org44202a22014-03-11 19:22:18 +0000108# Valid extensions for files we want to lint.
109DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
110DEFAULT_LINT_IGNORE_REGEX = r"$^"
111
Aiden Bennerc08566e2018-10-03 17:52:42 +0000112# File name for yapf style config files.
113YAPF_CONFIG_FILENAME = '.style.yapf'
114
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000115# Shortcut since it quickly becomes repetitive.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000116Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +0000117
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000118# Initialized in main()
119settings = None
120
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100121# Used by tests/git_cl_test.py to add extra logging.
122# Inside the weirdly failing test, add this:
123# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700124# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100125_IS_BEING_TESTED = False
126
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000127
Christopher Lamf732cd52017-01-24 12:40:11 +1100128def DieWithError(message, change_desc=None):
129 if change_desc:
130 SaveDescriptionBackup(change_desc)
131
vapiera7fbd5a2016-06-16 09:17:49 -0700132 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000133 sys.exit(1)
134
135
Christopher Lamf732cd52017-01-24 12:40:11 +1100136def SaveDescriptionBackup(change_desc):
137 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000138 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100139 backup_file = open(backup_path, 'w')
140 backup_file.write(change_desc.description)
141 backup_file.close()
142
143
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000144def GetNoGitPagerEnv():
145 env = os.environ.copy()
146 # 'cat' is a magical git string that disables pagers on all platforms.
147 env['GIT_PAGER'] = 'cat'
148 return env
149
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000150
bsep@chromium.org627d9002016-04-29 00:00:52 +0000151def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000152 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000153 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000154 except subprocess2.CalledProcessError as e:
155 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000156 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000157 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000158 'Command "%s" failed.\n%s' % (
159 ' '.join(args), error_message or e.stdout or ''))
160 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000161
162
163def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000164 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000165 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000166
167
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000168def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000169 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700170 if suppress_stderr:
171 stderr = subprocess2.VOID
172 else:
173 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000174 try:
tandrii5d48c322016-08-18 16:19:37 -0700175 (out, _), code = subprocess2.communicate(['git'] + args,
176 env=GetNoGitPagerEnv(),
177 stdout=subprocess2.PIPE,
178 stderr=stderr)
179 return code, out
180 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900181 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700182 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000183
184
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000185def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000186 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000187 return RunGitWithCode(args, suppress_stderr=True)[1]
188
189
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000190def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000191 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000192 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000193 return (version.startswith(prefix) and
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000194 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000195
196
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000197def BranchExists(branch):
198 """Return True if specified branch exists."""
199 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
200 suppress_stderr=True)
201 return not code
202
203
tandrii2a16b952016-10-19 07:09:44 -0700204def time_sleep(seconds):
205 # Use this so that it can be mocked in tests without interfering with python
206 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700207 return time.sleep(seconds)
208
209
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000210def time_time():
211 # Use this so that it can be mocked in tests without interfering with python
212 # system machinery.
213 return time.time()
214
215
Edward Lemur1b52d872019-05-09 21:12:12 +0000216def datetime_now():
217 # Use this so that it can be mocked in tests without interfering with python
218 # system machinery.
219 return datetime.datetime.now()
220
221
maruel@chromium.org90541732011-04-01 17:54:18 +0000222def ask_for_data(prompt):
223 try:
224 return raw_input(prompt)
225 except KeyboardInterrupt:
226 # Hide the exception.
227 sys.exit(1)
228
229
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100230def confirm_or_exit(prefix='', action='confirm'):
231 """Asks user to press enter to continue or press Ctrl+C to abort."""
232 if not prefix or prefix.endswith('\n'):
233 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100234 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100235 mid = ' Press'
236 elif prefix.endswith(' '):
237 mid = 'press'
238 else:
239 mid = ' press'
240 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
241
242
243def ask_for_explicit_yes(prompt):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000244 """Returns whether user typed 'y' or 'yes' to confirm the given prompt."""
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100245 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
246 while True:
247 if 'yes'.startswith(result):
248 return True
249 if 'no'.startswith(result):
250 return False
251 result = ask_for_data('Please, type yes or no: ').lower()
252
253
tandrii5d48c322016-08-18 16:19:37 -0700254def _git_branch_config_key(branch, key):
255 """Helper method to return Git config key for a branch."""
256 assert branch, 'branch name is required to set git config for it'
257 return 'branch.%s.%s' % (branch, key)
258
259
260def _git_get_branch_config_value(key, default=None, value_type=str,
261 branch=False):
262 """Returns git config value of given or current branch if any.
263
264 Returns default in all other cases.
265 """
266 assert value_type in (int, str, bool)
267 if branch is False: # Distinguishing default arg value from None.
268 branch = GetCurrentBranch()
269
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000270 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700271 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000272
tandrii5d48c322016-08-18 16:19:37 -0700273 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700274 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700275 args.append('--bool')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000276 # `git config` also has --int, but apparently git config suffers from integer
tandrii33a46ff2016-08-23 05:53:40 -0700277 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700278 args.append(_git_branch_config_key(branch, key))
279 code, out = RunGitWithCode(args)
280 if code == 0:
281 value = out.strip()
282 if value_type == int:
283 return int(value)
284 if value_type == bool:
285 return bool(value.lower() == 'true')
286 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000287 return default
288
289
tandrii5d48c322016-08-18 16:19:37 -0700290def _git_set_branch_config_value(key, value, branch=None, **kwargs):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000291 """Sets or unsets the git branch config value.
tandrii5d48c322016-08-18 16:19:37 -0700292
Quinten Yearsleyd242ed72019-07-25 17:17:55 +0000293 If value is None, the key will be unset, otherwise it will be set.
294 If no branch is given, the currently checked out branch is used.
tandrii5d48c322016-08-18 16:19:37 -0700295 """
296 if not branch:
297 branch = GetCurrentBranch()
298 assert branch, 'a branch name OR currently checked out branch is required'
299 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700300 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700301 if value is None:
302 args.append('--unset')
303 elif isinstance(value, bool):
304 args.append('--bool')
305 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700306 else:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000307 # `git config` also has --int, but apparently git config suffers from
308 # integer overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700309 value = str(value)
310 args.append(_git_branch_config_key(branch, key))
311 if value is not None:
312 args.append(value)
313 RunGit(args, **kwargs)
314
315
machenbach@chromium.org45453142015-09-15 08:45:22 +0000316def _get_properties_from_options(options):
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000317 prop_list = getattr(options, 'properties', [])
318 properties = dict(x.split('=', 1) for x in prop_list)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000319 for key, val in properties.items():
machenbach@chromium.org45453142015-09-15 08:45:22 +0000320 try:
321 properties[key] = json.loads(val)
322 except ValueError:
323 pass # If a value couldn't be evaluated, treat it as a string.
324 return properties
325
326
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000327# TODO(crbug.com/976104): Remove this function once git-cl try-results has
328# migrated to use buildbucket v2
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000329def _buildbucket_retry(operation_name, http, *args, **kwargs):
330 """Retries requests to buildbucket service and returns parsed json content."""
331 try_count = 0
332 while True:
333 response, content = http.request(*args, **kwargs)
334 try:
335 content_json = json.loads(content)
336 except ValueError:
337 content_json = None
338
339 # Buildbucket could return an error even if status==200.
340 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000341 error = content_json.get('error')
342 if error.get('code') == 403:
343 raise BuildbucketResponseException(
344 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000345 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000346 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000347 raise BuildbucketResponseException(msg)
348
349 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700350 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000351 raise BuildbucketResponseException(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000352 'Buildbucket returned invalid JSON content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700353 'Please file bugs at http://crbug.com, '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000354 'component "Infra>Platform>Buildbucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000355 content)
356 return content_json
357 if response.status < 500 or try_count >= 2:
358 raise httplib2.HttpLib2Error(content)
359
360 # status >= 500 means transient failures.
361 logging.debug('Transient errors when %s. Will retry.', operation_name)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000362 time_sleep(0.5 + (1.5 * try_count))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000363 try_count += 1
364 assert False, 'unreachable'
365
366
Edward Lemur4c707a22019-09-24 21:13:43 +0000367def _call_buildbucket(http, buildbucket_host, method, request):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000368 """Calls a buildbucket v2 method and returns the parsed json response."""
369 headers = {
370 'Accept': 'application/json',
371 'Content-Type': 'application/json',
372 }
373 request = json.dumps(request)
374 url = 'https://%s/prpc/buildbucket.v2.Builds/%s' % (buildbucket_host, method)
375
376 logging.info('POST %s with %s' % (url, request))
377
378 attempts = 1
379 time_to_sleep = 1
380 while True:
381 response, content = http.request(url, 'POST', body=request, headers=headers)
382 if response.status == 200:
383 return json.loads(content[4:])
384 if attempts >= MAX_ATTEMPTS or 400 <= response.status < 500:
385 msg = '%s error when calling POST %s with %s: %s' % (
386 response.status, url, request, content)
387 raise BuildbucketResponseException(msg)
388 logging.debug(
389 '%s error when calling POST %s with %s. '
390 'Sleeping for %d seconds and retrying...' % (
391 response.status, url, request, time_to_sleep))
392 time.sleep(time_to_sleep)
393 time_to_sleep *= 2
394 attempts += 1
395
396 assert False, 'unreachable'
397
398
qyearsley1fdfcb62016-10-24 13:22:03 -0700399def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700400 """Returns a dict mapping bucket names to builders and tests,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000401 for triggering tryjobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700402 """
qyearsleydd49f942016-10-28 11:57:22 -0700403 # If no bots are listed, we try to get a set of builders and tests based
404 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700405 if not options.bot:
406 change = changelist.GetChange(
407 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700408 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700409 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 change=change,
411 changed_files=change.LocalPaths(),
412 repository_root=settings.GetRoot(),
413 default_presubmit=None,
414 project=None,
415 verbose=options.verbose,
416 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700417 if masters is None:
418 return None
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000419 return {m: b for m, b in masters.items()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700420
qyearsley1fdfcb62016-10-24 13:22:03 -0700421 if options.bucket:
422 return {options.bucket: {b: [] for b in options.bot}}
Andrii Shyshkalov75424372019-08-30 22:48:15 +0000423 option_parser.error(
424 'Please specify the bucket, e.g. "-B luci.chromium.try".')
qyearsley1fdfcb62016-10-24 13:22:03 -0700425
426
Edward Lemur6215c792019-10-03 21:59:05 +0000427def _parse_bucket(raw_bucket):
428 legacy = True
429 project = bucket = None
430 if '/' in raw_bucket:
431 legacy = False
432 project, bucket = raw_bucket.split('/', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000433 # Assume luci.<project>.<bucket>.
Edward Lemur6215c792019-10-03 21:59:05 +0000434 elif raw_bucket.startswith('luci.'):
435 project, bucket = raw_bucket[len('luci.'):].split('.', 1)
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000436 # Otherwise, assume prefix is also the project name.
Edward Lemur6215c792019-10-03 21:59:05 +0000437 elif '.' in raw_bucket:
438 project = raw_bucket.split('.')[0]
439 bucket = raw_bucket
440 # Legacy buckets.
441 if legacy:
442 print('WARNING Please use %s/%s to specify the bucket.' % (project, bucket))
443 return project, bucket
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000444
445
Edward Lemur5b929a42019-10-21 17:57:39 +0000446def _trigger_try_jobs(changelist, buckets, options, patchset):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000447 """Sends a request to Buildbucket to trigger tryjobs for a changelist.
qyearsley1fdfcb62016-10-24 13:22:03 -0700448
449 Args:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000450 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700451 buckets: A nested dict mapping bucket names to builders to tests.
452 options: Command-line options.
453 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000454 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000455 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000456 print('Bucket:', bucket)
457 print('\n'.join(
458 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000459 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000460 print('To see results here, run: git cl try-results')
461 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700462
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000463 requests = _make_try_job_schedule_requests(
464 changelist, buckets, options, patchset)
465 if not requests:
466 return
467
Edward Lemur5b929a42019-10-21 17:57:39 +0000468 http = auth.Authenticator().authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000469 http.force_exception_to_status_code = True
470
471 batch_request = {'requests': requests}
472 batch_response = _call_buildbucket(
473 http, options.buildbucket_host, 'Batch', batch_request)
474
475 errors = [
476 ' ' + response['error']['message']
477 for response in batch_response.get('responses', [])
478 if 'error' in response
479 ]
480 if errors:
481 raise BuildbucketResponseException(
482 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
483
484
485def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000486 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000487 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000488 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000489 shared_properties['clobber'] = True
490 shared_properties.update(_get_properties_from_options(options) or {})
491
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000492 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
493 if options.retry_failed:
494 shared_tags.append({'key': 'retry_failed',
495 'value': '1'})
496
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000497 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000498 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000499 project, bucket = _parse_bucket(raw_bucket)
500 if not project or not bucket:
501 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
502 continue
503
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000504 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000505 properties = shared_properties.copy()
506 if 'presubmit' in builder.lower():
507 properties['dry_run'] = 'true'
508 if tests:
509 properties['testfilter'] = tests
510
511 requests.append({
512 'scheduleBuild': {
513 'requestId': str(uuid.uuid4()),
514 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000515 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000516 'bucket': bucket,
517 'builder': builder,
518 },
519 'gerritChanges': gerrit_changes,
520 'properties': properties,
521 'tags': [
522 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000523 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000524 }
525 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000526 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000527
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528
Edward Lemur5b929a42019-10-21 17:57:39 +0000529def fetch_try_jobs(changelist, buildbucket_host, patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000530 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000531
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000532 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000534 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000535 request = {
536 'predicate': {
537 'gerritChanges': [changelist.GetGerritChange(patchset)],
538 },
539 'fields': ','.join('builds.*.' + field for field in fields),
540 }
tandrii221ab252016-10-06 08:12:04 -0700541
Edward Lemur5b929a42019-10-21 17:57:39 +0000542 authenticator = auth.Authenticator()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000543 if authenticator.has_cached_credentials():
544 http = authenticator.authorize(httplib2.Http())
545 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700546 print('Warning: Some results might be missing because %s' %
547 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000548 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000549 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 http.force_exception_to_status_code = True
551
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000552 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
553 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554
Edward Lemur5b929a42019-10-21 17:57:39 +0000555def _fetch_latest_builds(changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000556 """Fetches builds from the latest patchset that has builds (within
557 the last few patchsets).
558
559 Args:
Quinten Yearsley983111f2019-09-26 17:18:48 +0000560 changelist (Changelist): The CL to fetch builds for
561 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000562 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
563 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000564 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000565 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
566 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000567 """
568 assert buildbucket_host
569 assert changelist.GetIssue(), 'CL must be uploaded first'
570 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000571 if latest_patchset is None:
572 assert changelist.GetMostRecentPatchset()
573 ps = changelist.GetMostRecentPatchset()
574 else:
575 assert latest_patchset > 0, latest_patchset
576 ps = latest_patchset
577
Quinten Yearsley983111f2019-09-26 17:18:48 +0000578 min_ps = max(1, ps - 5)
579 while ps >= min_ps:
Edward Lemur5b929a42019-10-21 17:57:39 +0000580 builds = fetch_try_jobs(changelist, buildbucket_host, patchset=ps)
Quinten Yearsley983111f2019-09-26 17:18:48 +0000581 if len(builds):
582 return builds, ps
583 ps -= 1
584 return [], 0
585
586
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000587def _filter_failed_for_retry(all_builds):
588 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000589
590 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000591 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000592 i.e. a list of buildbucket.v2.Builds which includes status and builder
593 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000594
595 Returns:
596 A dict of bucket to builder to tests (empty list). This is the same format
597 accepted by _trigger_try_jobs and returned by _get_bucket_map.
598 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000599
600 def _builder_of(build):
601 builder = build['builder']
602 return (builder['project'], builder['bucket'], builder['builder'])
603
604 res = collections.defaultdict(dict)
605 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
606 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
607 # If builder had several builds, retry only if the last one failed.
608 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
609 # build, but in case of retrying failed jobs retrying a flaky one makes
610 # sense.
611 builds = list(builds)
612 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
613 continue
614 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
615 for t in builds[-1]['tags']):
616 # Don't retry experimental build previously triggered by CQ.
617 continue
618 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
619 # Don't retry if any are running.
620 continue
621 res[proj + '/' + buck][bldr] = []
622 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000623
624
qyearsleyeab3c042016-08-24 09:18:28 -0700625def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000626 """Prints nicely result of fetch_try_jobs."""
627 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000628 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000629 return
630
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000631 longest_builder = max(len(b['builder']['builder']) for b in builds)
632 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000633 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000634 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
635 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000637 builds_by_status = {}
638 for b in builds:
639 builds_by_status.setdefault(b['status'], []).append({
640 'id': b['id'],
641 'name': name_fmt.format(
642 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
643 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000644
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000645 sort_key = lambda b: (b['name'], b['id'])
646
647 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000648 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000649 if not builds:
650 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000651
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000652 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000653 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000654 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000655 else:
656 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
657
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000658 print(colorize(title))
659 for b in sorted(builds, key=sort_key):
660 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000661
662 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 print_builds(
664 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
665 print_builds(
666 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
667 color=Fore.MAGENTA)
668 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
669 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
670 color=Fore.MAGENTA)
671 print_builds('Started:', builds_by_status.pop('STARTED', []))
672 print_builds(
673 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000675 print_builds(
676 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000677 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000678
679
Aiden Bennerc08566e2018-10-03 17:52:42 +0000680def _ComputeDiffLineRanges(files, upstream_commit):
681 """Gets the changed line ranges for each file since upstream_commit.
682
683 Parses a git diff on provided files and returns a dict that maps a file name
684 to an ordered list of range tuples in the form (start_line, count).
685 Ranges are in the same format as a git diff.
686 """
687 # If files is empty then diff_output will be a full diff.
688 if len(files) == 0:
689 return {}
690
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000691 # Take the git diff and find the line ranges where there are changes.
Jamie Madill3671a6a2019-10-24 15:13:21 +0000692 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000693 diff_output = RunGit(diff_cmd)
694
695 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
696 # 2 capture groups
697 # 0 == fname of diff file
698 # 1 == 'diff_start,diff_count' or 'diff_start'
699 # will match each of
700 # diff --git a/foo.foo b/foo.py
701 # @@ -12,2 +14,3 @@
702 # @@ -12,2 +17 @@
703 # running re.findall on the above string with pattern will give
704 # [('foo.py', ''), ('', '14,3'), ('', '17')]
705
706 curr_file = None
707 line_diffs = {}
708 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
709 if match[0] != '':
710 # Will match the second filename in diff --git a/a.py b/b.py.
711 curr_file = match[0]
712 line_diffs[curr_file] = []
713 else:
714 # Matches +14,3
715 if ',' in match[1]:
716 diff_start, diff_count = match[1].split(',')
717 else:
718 # Single line changes are of the form +12 instead of +12,1.
719 diff_start = match[1]
720 diff_count = 1
721
722 diff_start = int(diff_start)
723 diff_count = int(diff_count)
724
725 # If diff_count == 0 this is a removal we can ignore.
726 line_diffs[curr_file].append((diff_start, diff_count))
727
728 return line_diffs
729
730
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000731def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000732 """Checks if a yapf file is in any parent directory of fpath until top_dir.
733
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000734 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000735 is found returns None. Uses yapf_config_cache as a cache for previously found
736 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000737 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000738 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000739 # Return result if we've already computed it.
740 if fpath in yapf_config_cache:
741 return yapf_config_cache[fpath]
742
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000743 parent_dir = os.path.dirname(fpath)
744 if os.path.isfile(fpath):
745 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000746 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000747 # Otherwise fpath is a directory
748 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
749 if os.path.isfile(yapf_file):
750 ret = yapf_file
751 elif fpath == top_dir or parent_dir == fpath:
752 # If we're at the top level directory, or if we're at root
753 # there is no provided style.
754 ret = None
755 else:
756 # Otherwise recurse on the current directory.
757 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000758 yapf_config_cache[fpath] = ret
759 return ret
760
761
Brian Sheedy59b06a82019-10-14 17:03:29 +0000762def _GetYapfIgnoreFilepaths(top_dir):
763 """Returns all filepaths that match the ignored files in the .yapfignore file.
764
765 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
766 but this functionality appears to break when explicitly passing files to
767 yapf for formatting. According to
768 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
769 the .yapfignore file should be in the directory that yapf is invoked from,
770 which we assume to be the top level directory in this case.
771
772 Args:
773 top_dir: The top level directory for the repository being formatted.
774
775 Returns:
776 A set of all filepaths that should be ignored by yapf.
777 """
778 yapfignore_file = os.path.join(top_dir, '.yapfignore')
779 ignore_filepaths = set()
780 if not os.path.exists(yapfignore_file):
781 return ignore_filepaths
782
783 # glob works relative to the current working directory, so we need to ensure
784 # that we're at the top level directory.
785 old_cwd = os.getcwd()
786 try:
787 os.chdir(top_dir)
788 with open(yapfignore_file) as f:
789 for line in f.readlines():
790 stripped_line = line.strip()
791 # Comments and blank lines should be ignored.
792 if stripped_line.startswith('#') or stripped_line == '':
793 continue
794 ignore_filepaths |= set(glob.glob(stripped_line))
795 return ignore_filepaths
796 finally:
797 os.chdir(old_cwd)
798
799
Aaron Gable13101a62018-02-09 13:20:41 -0800800def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000801 """Prints statistics about the change to the user."""
802 # --no-ext-diff is broken in some versions of Git, so try to work around
803 # this by overriding the environment (but there is still a problem if the
804 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000805 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000806 if 'GIT_EXTERNAL_DIFF' in env:
807 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000808
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000809 try:
810 stdout = sys.stdout.fileno()
811 except AttributeError:
812 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000813 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800814 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000815 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000816
817
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000818class BuildbucketResponseException(Exception):
819 pass
820
821
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822class Settings(object):
823 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000824 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000825 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826 self.tree_status_url = None
827 self.viewvc_url = None
828 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000829 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000830 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000831 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000832 self.git_editor = None
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000833 self.format_full_by_default = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834
835 def LazyUpdateIfNeeded(self):
836 """Updates the settings from a codereview.settings file, if available."""
837 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000838 # The only value that actually changes the behavior is
839 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000840 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000841 error_ok=True
842 ).strip().lower()
843
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000844 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000845 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000846 LoadCodereviewSettingsFromFile(cr_settings_file)
847 self.updated = True
848
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000849 @staticmethod
850 def GetRelativeRoot():
851 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000852
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000853 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000854 if self.root is None:
855 self.root = os.path.abspath(self.GetRelativeRoot())
856 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000857
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000858 def GetTreeStatusUrl(self, error_ok=False):
859 if not self.tree_status_url:
860 error_message = ('You must configure your tree status URL by running '
861 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000862 self.tree_status_url = self._GetConfig(
863 'rietveld.tree-status-url', error_ok=error_ok,
864 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000865 return self.tree_status_url
866
867 def GetViewVCUrl(self):
868 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000869 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000870 return self.viewvc_url
871
rmistry@google.com90752582014-01-14 21:04:50 +0000872 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000873 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000874
rmistry@google.com5626a922015-02-26 14:03:30 +0000875 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000876 run_post_upload_hook = self._GetConfig(
877 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000878 return run_post_upload_hook == "True"
879
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000880 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000881 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000882
ukai@chromium.orge8077812012-02-03 03:41:46 +0000883 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000884 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000885 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700886 self.is_gerrit = (
887 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000888 return self.is_gerrit
889
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000890 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000891 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000892 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700893 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
894 if self.squash_gerrit_uploads is None:
895 # Default is squash now (http://crbug.com/611892#c23).
896 self.squash_gerrit_uploads = not (
897 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
898 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000899 return self.squash_gerrit_uploads
900
tandriia60502f2016-06-20 02:01:53 -0700901 def GetSquashGerritUploadsOverride(self):
902 """Return True or False if codereview.settings should be overridden.
903
904 Returns None if no override has been defined.
905 """
906 # See also http://crbug.com/611892#c23
907 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
908 error_ok=True).strip()
909 if result == 'true':
910 return True
911 if result == 'false':
912 return False
913 return None
914
tandrii@chromium.org28253532016-04-14 13:46:56 +0000915 def GetGerritSkipEnsureAuthenticated(self):
916 """Return True if EnsureAuthenticated should not be done for Gerrit
917 uploads."""
918 if self.gerrit_skip_ensure_authenticated is None:
919 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000920 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000921 error_ok=True).strip() == 'true')
922 return self.gerrit_skip_ensure_authenticated
923
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000924 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000925 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000926 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000927 # Git requires single quotes for paths with spaces. We need to replace
928 # them with double quotes for Windows to treat such paths as a single
929 # path.
930 self.git_editor = self._GetConfig(
931 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000932 return self.git_editor or None
933
thestig@chromium.org44202a22014-03-11 19:22:18 +0000934 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000935 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000936 DEFAULT_LINT_REGEX)
937
938 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000939 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000940 DEFAULT_LINT_IGNORE_REGEX)
941
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000942 def GetFormatFullByDefault(self):
943 if self.format_full_by_default is None:
944 result = (
945 RunGit(['config', '--bool', 'rietveld.format-full-by-default'],
946 error_ok=True).strip())
947 self.format_full_by_default = (result == 'true')
948 return self.format_full_by_default
949
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000950 def _GetConfig(self, param, **kwargs):
951 self.LazyUpdateIfNeeded()
952 return RunGit(['config', param], **kwargs).strip()
953
954
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000955def ShortBranchName(branch):
956 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000957 return branch.replace('refs/heads/', '', 1)
958
959
960def GetCurrentBranchRef():
961 """Returns branch ref (e.g., refs/heads/master) or None."""
962 return RunGit(['symbolic-ref', 'HEAD'],
963 stderr=subprocess2.VOID, error_ok=True).strip() or None
964
965
966def GetCurrentBranch():
967 """Returns current branch or None.
968
969 For refs/heads/* branches, returns just last part. For others, full ref.
970 """
971 branchref = GetCurrentBranchRef()
972 if branchref:
973 return ShortBranchName(branchref)
974 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000975
976
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000977class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000978 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000979 NONE = 'none'
980 DRY_RUN = 'dry_run'
981 COMMIT = 'commit'
982
983 ALL_STATES = [NONE, DRY_RUN, COMMIT]
984
985
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000986class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000987 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000988 self.issue = issue
989 self.patchset = patchset
990 self.hostname = hostname
991
992 @property
993 def valid(self):
994 return self.issue is not None
995
996
Edward Lemurf38bc172019-09-03 21:02:13 +0000997def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000998 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
999 fail_result = _ParsedIssueNumberArgument()
1000
Edward Lemur678a6842019-10-03 22:25:05 +00001001 if isinstance(arg, int):
1002 return _ParsedIssueNumberArgument(issue=arg)
1003 if not isinstance(arg, basestring):
1004 return fail_result
1005
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001006 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001007 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001008 if not arg.startswith('http'):
1009 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001010
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001011 url = gclient_utils.UpgradeToHttps(arg)
1012 try:
1013 parsed_url = urlparse.urlparse(url)
1014 except ValueError:
1015 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001016
Edward Lemur678a6842019-10-03 22:25:05 +00001017 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1018 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1019 # Short urls like https://domain/<issue_number> can be used, but don't allow
1020 # specifying the patchset (you'd 404), but we allow that here.
1021 if parsed_url.path == '/':
1022 part = parsed_url.fragment
1023 else:
1024 part = parsed_url.path
1025
1026 match = re.match(
1027 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1028 if not match:
1029 return fail_result
1030
1031 issue = int(match.group('issue'))
1032 patchset = match.group('patchset')
1033 return _ParsedIssueNumberArgument(
1034 issue=issue,
1035 patchset=int(patchset) if patchset else None,
1036 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001037
1038
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001039def _create_description_from_log(args):
1040 """Pulls out the commit log to use as a base for the CL description."""
1041 log_args = []
1042 if len(args) == 1 and not args[0].endswith('.'):
1043 log_args = [args[0] + '..']
1044 elif len(args) == 1 and args[0].endswith('...'):
1045 log_args = [args[0][:-1]]
1046 elif len(args) == 2:
1047 log_args = [args[0] + '..' + args[1]]
1048 else:
1049 log_args = args[:] # Hope for the best!
1050 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1051
1052
Aaron Gablea45ee112016-11-22 15:14:38 -08001053class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001054 def __init__(self, issue, url):
1055 self.issue = issue
1056 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001057 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001058
1059 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001060 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001061 self.issue, self.url)
1062
1063
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001064_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001065 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001066 # TODO(tandrii): these two aren't known in Gerrit.
1067 'approval', 'disapproval'])
1068
1069
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001070class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001071 """Changelist works with one changelist in local branch.
1072
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001073 Notes:
1074 * Not safe for concurrent multi-{thread,process} use.
1075 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001076 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001077 """
1078
Edward Lemur125d60a2019-09-13 18:25:41 +00001079 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001080 """Create a new ChangeList instance.
1081
Edward Lemurf38bc172019-09-03 21:02:13 +00001082 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001083 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001084 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001085 global settings
1086 if not settings:
1087 # Happens when git_cl.py is used as a utility library.
1088 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001090 self.branchref = branchref
1091 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001092 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001093 self.branch = ShortBranchName(self.branchref)
1094 else:
1095 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001097 self.lookedup_issue = False
1098 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099 self.has_description = False
1100 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001101 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001102 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001103 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001104 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001105 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001106 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001107
Edward Lemur125d60a2019-09-13 18:25:41 +00001108 # Lazily cached values.
1109 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1110 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1111 # Map from change number (issue) to its detail cache.
1112 self._detail_cache = {}
1113
1114 if codereview_host is not None:
1115 assert not codereview_host.startswith('https://'), codereview_host
1116 self._gerrit_host = codereview_host
1117 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001118
1119 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001120 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001121
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001122 The return value is a string suitable for passing to git cl with the --cc
1123 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001124 """
1125 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001126 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001127 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001128 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1129 return self.cc
1130
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001131 def GetCCListWithoutDefault(self):
1132 """Return the users cc'd on this CL excluding default ones."""
1133 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001134 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001135 return self.cc
1136
Daniel Cheng7227d212017-11-17 08:12:37 -08001137 def ExtendCC(self, more_cc):
1138 """Extends the list of users to cc on this CL based on the changed files."""
1139 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140
1141 def GetBranch(self):
1142 """Returns the short branch name, e.g. 'master'."""
1143 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001144 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001145 if not branchref:
1146 return None
1147 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001148 self.branch = ShortBranchName(self.branchref)
1149 return self.branch
1150
1151 def GetBranchRef(self):
1152 """Returns the full branch name, e.g. 'refs/heads/master'."""
1153 self.GetBranch() # Poke the lazy loader.
1154 return self.branchref
1155
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001156 def ClearBranch(self):
1157 """Clears cached branch data of this object."""
1158 self.branch = self.branchref = None
1159
tandrii5d48c322016-08-18 16:19:37 -07001160 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1161 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1162 kwargs['branch'] = self.GetBranch()
1163 return _git_get_branch_config_value(key, default, **kwargs)
1164
1165 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1166 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1167 assert self.GetBranch(), (
1168 'this CL must have an associated branch to %sset %s%s' %
1169 ('un' if value is None else '',
1170 key,
1171 '' if value is None else ' to %r' % value))
1172 kwargs['branch'] = self.GetBranch()
1173 return _git_set_branch_config_value(key, value, **kwargs)
1174
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001175 @staticmethod
1176 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001177 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001178 e.g. 'origin', 'refs/heads/master'
1179 """
1180 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001181 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1182
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001183 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001184 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001185 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001186 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1187 error_ok=True).strip()
1188 if upstream_branch:
1189 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001190 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001191 # Else, try to guess the origin remote.
1192 remote_branches = RunGit(['branch', '-r']).split()
1193 if 'origin/master' in remote_branches:
1194 # Fall back on origin/master if it exits.
1195 remote = 'origin'
1196 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001198 DieWithError(
1199 'Unable to determine default branch to diff against.\n'
1200 'Either pass complete "git diff"-style arguments, like\n'
1201 ' git cl upload origin/master\n'
1202 'or verify this branch is set up to track another \n'
1203 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001204
1205 return remote, upstream_branch
1206
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001207 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001208 upstream_branch = self.GetUpstreamBranch()
1209 if not BranchExists(upstream_branch):
1210 DieWithError('The upstream for the current branch (%s) does not exist '
1211 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001212 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001213 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001214
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 def GetUpstreamBranch(self):
1216 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001217 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001218 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001219 upstream_branch = upstream_branch.replace('refs/heads/',
1220 'refs/remotes/%s/' % remote)
1221 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1222 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 self.upstream_branch = upstream_branch
1224 return self.upstream_branch
1225
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001226 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001227 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001228 remote, branch = None, self.GetBranch()
1229 seen_branches = set()
1230 while branch not in seen_branches:
1231 seen_branches.add(branch)
1232 remote, branch = self.FetchUpstreamTuple(branch)
1233 branch = ShortBranchName(branch)
1234 if remote != '.' or branch.startswith('refs/remotes'):
1235 break
1236 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001237 remotes = RunGit(['remote'], error_ok=True).split()
1238 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001239 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001240 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001241 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001242 logging.warn('Could not determine which remote this change is '
1243 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001244 else:
1245 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001246 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001247 branch = 'HEAD'
1248 if branch.startswith('refs/remotes'):
1249 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001250 elif branch.startswith('refs/branch-heads/'):
1251 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001252 else:
1253 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001254 return self._remote
1255
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001256 def GitSanityChecks(self, upstream_git_obj):
1257 """Checks git repo status and ensures diff is from local commits."""
1258
sbc@chromium.org79706062015-01-14 21:18:12 +00001259 if upstream_git_obj is None:
1260 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001261 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001262 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001263 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001264 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001265 return False
1266
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001267 # Verify the commit we're diffing against is in our current branch.
1268 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1269 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1270 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001271 print('ERROR: %s is not in the current branch. You may need to rebase '
1272 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001273 return False
1274
1275 # List the commits inside the diff, and verify they are all local.
1276 commits_in_diff = RunGit(
1277 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1278 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1279 remote_branch = remote_branch.strip()
1280 if code != 0:
1281 _, remote_branch = self.GetRemoteBranch()
1282
1283 commits_in_remote = RunGit(
1284 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1285
1286 common_commits = set(commits_in_diff) & set(commits_in_remote)
1287 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001288 print('ERROR: Your diff contains %d commits already in %s.\n'
1289 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1290 'the diff. If you are using a custom git flow, you can override'
1291 ' the reference used for this check with "git config '
1292 'gitcl.remotebranch <git-ref>".' % (
1293 len(common_commits), remote_branch, upstream_git_obj),
1294 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001295 return False
1296 return True
1297
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001298 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001299 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001300
1301 Returns None if it is not set.
1302 """
tandrii5d48c322016-08-18 16:19:37 -07001303 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001304
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305 def GetRemoteUrl(self):
1306 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1307
1308 Returns None if there is no remote.
1309 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001310 is_cached, value = self._cached_remote_url
1311 if is_cached:
1312 return value
1313
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001314 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001315 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1316
Edward Lemur298f2cf2019-02-22 21:40:39 +00001317 # Check if the remote url can be parsed as an URL.
1318 host = urlparse.urlparse(url).netloc
1319 if host:
1320 self._cached_remote_url = (True, url)
1321 return url
1322
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001323 # If it cannot be parsed as an url, assume it is a local directory,
1324 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001325 logging.warning('"%s" doesn\'t appear to point to a git host. '
1326 'Interpreting it as a local directory.', url)
1327 if not os.path.isdir(url):
1328 logging.error(
1329 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001330 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001331 return None
1332
1333 cache_path = url
1334 url = RunGit(['config', 'remote.%s.url' % remote],
1335 error_ok=True,
1336 cwd=url).strip()
1337
1338 host = urlparse.urlparse(url).netloc
1339 if not host:
1340 logging.error(
1341 'Remote "%(remote)s" for branch "%(branch)s" points to '
1342 '"%(cache_path)s", but it is misconfigured.\n'
1343 '"%(cache_path)s" must be a git repo and must have a remote named '
1344 '"%(remote)s" pointing to the git host.', {
1345 'remote': remote,
1346 'cache_path': cache_path,
1347 'branch': self.GetBranch()})
1348 return None
1349
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001350 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001351 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001352
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001353 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001354 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001355 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001356 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001357 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001358 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001359 return self.issue
1360
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001361 def GetIssueURL(self):
1362 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001363 issue = self.GetIssue()
1364 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001365 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001366 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001367
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001368 def GetDescription(self, pretty=False, force=False):
1369 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001371 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001372 self.has_description = True
1373 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001374 # Set width to 72 columns + 2 space indent.
1375 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001376 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001377 lines = self.description.splitlines()
1378 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 return self.description
1380
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001381 def GetDescriptionFooters(self):
1382 """Returns (non_footer_lines, footers) for the commit message.
1383
1384 Returns:
1385 non_footer_lines (list(str)) - Simple list of description lines without
1386 any footer. The lines do not contain newlines, nor does the list contain
1387 the empty line between the message and the footers.
1388 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1389 [("Change-Id", "Ideadbeef...."), ...]
1390 """
1391 raw_description = self.GetDescription()
1392 msg_lines, _, footers = git_footers.split_footers(raw_description)
1393 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001394 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001395 return msg_lines, footers
1396
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001397 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001398 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001399 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001400 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001401 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001402 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 return self.patchset
1404
1405 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001406 """Set this branch's patchset. If patchset=0, clears the patchset."""
1407 assert self.GetBranch()
1408 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001409 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001410 else:
1411 self.patchset = int(patchset)
1412 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001413 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001415 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001416 """Set this branch's issue. If issue isn't given, clears the issue."""
1417 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001419 issue = int(issue)
1420 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001421 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001422 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001423 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001424 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001425 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001426 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001427 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001428 else:
tandrii5d48c322016-08-18 16:19:37 -07001429 # Reset all of these just to be clean.
1430 reset_suffixes = [
1431 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001432 self.IssueConfigKey(),
1433 self.PatchsetConfigKey(),
1434 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001435 ] + self._PostUnsetIssueProperties()
1436 for prop in reset_suffixes:
1437 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001438 msg = RunGit(['log', '-1', '--format=%B']).strip()
1439 if msg and git_footers.get_footer_change_id(msg):
1440 print('WARNING: The change patched into this branch has a Change-Id. '
1441 'Removing it.')
1442 RunGit(['commit', '--amend', '-m',
1443 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001444 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001445 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001446 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001447
dnjba1b0f32016-09-02 12:37:42 -07001448 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001449 if not self.GitSanityChecks(upstream_branch):
1450 DieWithError('\nGit sanity check failure')
1451
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001452 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001453 if not root:
1454 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001455 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001456
1457 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001458 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001459 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001460 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001461 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001462 except subprocess2.CalledProcessError:
1463 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001464 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001465 'This branch probably doesn\'t exist anymore. To reset the\n'
1466 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001467 ' git branch --set-upstream-to origin/master %s\n'
1468 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001469 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001470
maruel@chromium.org52424302012-08-29 15:14:30 +00001471 issue = self.GetIssue()
1472 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001473 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001474 description = self.GetDescription()
1475 else:
1476 # If the change was never uploaded, use the log messages of all commits
1477 # up to the branch point, as git cl upload will prefill the description
1478 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001479 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1480 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001481
1482 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001483 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001484 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001485 name,
1486 description,
1487 absroot,
1488 files,
1489 issue,
1490 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001491 author,
1492 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001493
dsansomee2d6fd92016-09-08 00:10:47 -07001494 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001495 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001496 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001497 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001498
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001499 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1500 """Sets the description for this CL remotely.
1501
1502 You can get description_lines and footers with GetDescriptionFooters.
1503
1504 Args:
1505 description_lines (list(str)) - List of CL description lines without
1506 newline characters.
1507 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1508 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1509 `List-Of-Tokens`). It will be case-normalized so that each token is
1510 title-cased.
1511 """
1512 new_description = '\n'.join(description_lines)
1513 if footers:
1514 new_description += '\n'
1515 for k, v in footers:
1516 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1517 if not git_footers.FOOTER_PATTERN.match(foot):
1518 raise ValueError('Invalid footer %r' % foot)
1519 new_description += foot + '\n'
1520 self.UpdateDescription(new_description, force)
1521
Edward Lesmes8e282792018-04-03 18:50:29 -04001522 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001523 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1524 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001525 start = time_time()
1526 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001527 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1528 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001529 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001530 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001531 metrics.collector.add_repeated('sub_commands', {
1532 'command': 'presubmit',
1533 'execution_time': time_time() - start,
1534 'exit_code': 0 if result.should_continue() else 1,
1535 })
1536 return result
vapierfd77ac72016-06-16 08:33:57 -07001537 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001538 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001539
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001540 def CMDUpload(self, options, git_diff_args, orig_args):
1541 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001542 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001543 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001544 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545 else:
1546 if self.GetBranch() is None:
1547 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1548
1549 # Default to diffing against common ancestor of upstream branch
1550 base_branch = self.GetCommonAncestorWithUpstream()
1551 git_diff_args = [base_branch, 'HEAD']
1552
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001553 # Fast best-effort checks to abort before running potentially expensive
1554 # hooks if uploading is likely to fail anyway. Passing these checks does
1555 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001556 self.EnsureAuthenticated(force=options.force)
1557 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001558
1559 # Apply watchlists on upload.
1560 change = self.GetChange(base_branch, None)
1561 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1562 files = [f.LocalPath() for f in change.AffectedFiles()]
1563 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001564 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001565
1566 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001567 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001568 # Set the reviewer list now so that presubmit checks can access it.
1569 change_description = ChangeDescription(change.FullDescriptionText())
1570 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001571 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001572 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001573 change)
1574 change.SetDescriptionText(change_description.description)
1575 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001576 may_prompt=not options.force,
1577 verbose=options.verbose,
1578 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001579 if not hook_results.should_continue():
1580 return 1
1581 if not options.reviewers and hook_results.reviewers:
1582 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001583 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584
Aaron Gable13101a62018-02-09 13:20:41 -08001585 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001586 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001588 _git_set_branch_config_value('last-upload-hash',
1589 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 # Run post upload hooks, if specified.
1591 if settings.GetRunPostUploadHook():
1592 presubmit_support.DoPostUploadExecuter(
1593 change,
1594 self,
1595 settings.GetRoot(),
1596 options.verbose,
1597 sys.stdout)
1598
1599 # Upload all dependencies if specified.
1600 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001601 print()
1602 print('--dependencies has been specified.')
1603 print('All dependent local branches will be re-uploaded.')
1604 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 # Remove the dependencies flag from args so that we do not end up in a
1606 # loop.
1607 orig_args.remove('--dependencies')
1608 ret = upload_branch_deps(self, orig_args)
1609 return ret
1610
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001611 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001612 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001613
1614 Issue must have been already uploaded and known.
1615 """
1616 assert new_state in _CQState.ALL_STATES
1617 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001618 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001619 vote_map = {
1620 _CQState.NONE: 0,
1621 _CQState.DRY_RUN: 1,
1622 _CQState.COMMIT: 2,
1623 }
1624 labels = {'Commit-Queue': vote_map[new_state]}
1625 notify = False if new_state == _CQState.DRY_RUN else None
1626 gerrit_util.SetReview(
1627 self._GetGerritHost(), self._GerritChangeIdentifier(),
1628 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001629 return 0
1630 except KeyboardInterrupt:
1631 raise
1632 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001633 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001634 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001635 ' * Your project has no CQ,\n'
1636 ' * You don\'t have permission to change the CQ state,\n'
1637 ' * There\'s a bug in this code (see stack trace below).\n'
1638 'Consider specifying which bots to trigger manually or asking your '
1639 'project owners for permissions or contacting Chrome Infra at:\n'
1640 'https://www.chromium.org/infra\n\n' %
1641 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001642 # Still raise exception so that stack trace is printed.
1643 raise
1644
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001645 def _GetGerritHost(self):
1646 # Lazy load of configs.
1647 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001648 if self._gerrit_host and '.' not in self._gerrit_host:
1649 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1650 # This happens for internal stuff http://crbug.com/614312.
1651 parsed = urlparse.urlparse(self.GetRemoteUrl())
1652 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001653 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001654 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001655 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1656 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001657 return self._gerrit_host
1658
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001659 def _GetGitHost(self):
1660 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001661 remote_url = self.GetRemoteUrl()
1662 if not remote_url:
1663 return None
1664 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001665
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001666 def GetCodereviewServer(self):
1667 if not self._gerrit_server:
1668 # If we're on a branch then get the server potentially associated
1669 # with that branch.
1670 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001671 self._gerrit_server = self._GitGetBranchConfigValue(
1672 self.CodereviewServerConfigKey())
1673 if self._gerrit_server:
1674 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675 if not self._gerrit_server:
1676 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1677 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001678 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001679 parts[0] = parts[0] + '-review'
1680 self._gerrit_host = '.'.join(parts)
1681 self._gerrit_server = 'https://%s' % self._gerrit_host
1682 return self._gerrit_server
1683
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001684 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001685 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001686 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001687 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001688 logging.warn('can\'t detect Gerrit project.')
1689 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001690 project = urlparse.urlparse(remote_url).path.strip('/')
1691 if project.endswith('.git'):
1692 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001693 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1694 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1695 # gitiles/git-over-https protocol. E.g.,
1696 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1697 # as
1698 # https://chromium.googlesource.com/v8/v8
1699 if project.startswith('a/'):
1700 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001701 return project
1702
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001703 def _GerritChangeIdentifier(self):
1704 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1705
1706 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001707 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001708 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001709 project = self._GetGerritProject()
1710 if project:
1711 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1712 # Fall back on still unique, but less efficient change number.
1713 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001714
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001715 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001716 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001717 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001718
tandrii5d48c322016-08-18 16:19:37 -07001719 @classmethod
1720 def PatchsetConfigKey(cls):
1721 return 'gerritpatchset'
1722
1723 @classmethod
1724 def CodereviewServerConfigKey(cls):
1725 return 'gerritserver'
1726
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001727 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001728 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001729 if settings.GetGerritSkipEnsureAuthenticated():
1730 # For projects with unusual authentication schemes.
1731 # See http://crbug.com/603378.
1732 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001733
1734 # Check presence of cookies only if using cookies-based auth method.
1735 cookie_auth = gerrit_util.Authenticator.get()
1736 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001737 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001738
Daniel Chengcf6269b2019-05-18 01:02:12 +00001739 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1740 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001741 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001742 return
1743
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001744 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001745 self.GetCodereviewServer()
1746 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001747 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001748
1749 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1750 git_auth = cookie_auth.get_auth_header(git_host)
1751 if gerrit_auth and git_auth:
1752 if gerrit_auth == git_auth:
1753 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001754 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001755 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001756 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001757 ' %s\n'
1758 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001759 ' Consider running the following command:\n'
1760 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001761 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001762 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001763 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001764 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001765 cookie_auth.get_new_password_message(git_host)))
1766 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001767 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001768 return
1769 else:
1770 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001771 ([] if gerrit_auth else [self._gerrit_host]) +
1772 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001773 DieWithError('Credentials for the following hosts are required:\n'
1774 ' %s\n'
1775 'These are read from %s (or legacy %s)\n'
1776 '%s' % (
1777 '\n '.join(missing),
1778 cookie_auth.get_gitcookies_path(),
1779 cookie_auth.get_netrc_path(),
1780 cookie_auth.get_new_password_message(git_host)))
1781
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001782 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001783 if not self.GetIssue():
1784 return
1785
1786 # Warm change details cache now to avoid RPCs later, reducing latency for
1787 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001788 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001789 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001790
1791 status = self._GetChangeDetail()['status']
1792 if status in ('MERGED', 'ABANDONED'):
1793 DieWithError('Change %s has been %s, new uploads are not allowed' %
1794 (self.GetIssueURL(),
1795 'submitted' if status == 'MERGED' else 'abandoned'))
1796
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001797 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1798 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1799 # Apparently this check is not very important? Otherwise get_auth_email
1800 # could have been added to other implementations of Authenticator.
1801 cookies_auth = gerrit_util.Authenticator.get()
1802 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001803 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001804
1805 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001806 if self.GetIssueOwner() == cookies_user:
1807 return
1808 logging.debug('change %s owner is %s, cookies user is %s',
1809 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001810 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001811 # so ask what Gerrit thinks of this user.
1812 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1813 if details['email'] == self.GetIssueOwner():
1814 return
1815 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001816 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001817 'as %s.\n'
1818 'Uploading may fail due to lack of permissions.' %
1819 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1820 confirm_or_exit(action='upload')
1821
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001822 def _PostUnsetIssueProperties(self):
1823 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001824 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001825
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001826 def GetGerritObjForPresubmit(self):
1827 return presubmit_support.GerritAccessor(self._GetGerritHost())
1828
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001829 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001830 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001831 or CQ status, assuming adherence to a common workflow.
1832
1833 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001834 * 'error' - error from review tool (including deleted issues)
1835 * 'unsent' - no reviewers added
1836 * 'waiting' - waiting for review
1837 * 'reply' - waiting for uploader to reply to review
1838 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001839 * 'dry-run' - dry-running in the CQ
1840 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001841 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001842 """
1843 if not self.GetIssue():
1844 return None
1845
1846 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001847 data = self._GetChangeDetail([
1848 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001849 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001850 return 'error'
1851
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001852 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001853 return 'closed'
1854
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001855 cq_label = data['labels'].get('Commit-Queue', {})
1856 max_cq_vote = 0
1857 for vote in cq_label.get('all', []):
1858 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1859 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001860 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001861 if max_cq_vote == 1:
1862 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001863
Aaron Gable9ab38c62017-04-06 14:36:33 -07001864 if data['labels'].get('Code-Review', {}).get('approved'):
1865 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001866
1867 if not data.get('reviewers', {}).get('REVIEWER', []):
1868 return 'unsent'
1869
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001870 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001871 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1872 last_message_author = messages.pop().get('author', {})
1873 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001874 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1875 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001876 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001877 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001878 if last_message_author.get('_account_id') == owner:
1879 # Most recent message was by owner.
1880 return 'waiting'
1881 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001882 # Some reply from non-owner.
1883 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001884
1885 # Somehow there are no messages even though there are reviewers.
1886 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001887
1888 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001889 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001890 patchset = data['revisions'][data['current_revision']]['_number']
1891 self.SetPatchset(patchset)
1892 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001893
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001894 def FetchDescription(self, force=False):
1895 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1896 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001897 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001898 return data['revisions'][current_rev]['commit']['message'].encode(
1899 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900
dsansomee2d6fd92016-09-08 00:10:47 -07001901 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001902 if gerrit_util.HasPendingChangeEdit(
1903 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001904 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001905 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001906 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001907 'unpublished edit. Either publish the edit in the Gerrit web UI '
1908 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001909
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001910 gerrit_util.DeletePendingChangeEdit(
1911 self._GetGerritHost(), self._GerritChangeIdentifier())
1912 gerrit_util.SetCommitMessage(
1913 self._GetGerritHost(), self._GerritChangeIdentifier(),
1914 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
Aaron Gable636b13f2017-07-14 10:42:48 -07001916 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001917 gerrit_util.SetReview(
1918 self._GetGerritHost(), self._GerritChangeIdentifier(),
1919 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001920
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001921 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001922 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001923 # CURRENT_REVISION is included to get the latest patchset so that
1924 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001925 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001926 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1927 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001928 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001929 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001930 robot_file_comments = gerrit_util.GetChangeRobotComments(
1931 self._GetGerritHost(), self._GerritChangeIdentifier())
1932
1933 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001934 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001935 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001936 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001937 line_comments = file_comments.setdefault(path, [])
1938 line_comments.extend(
1939 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001940
1941 # Build dictionary of file comments for easy access and sorting later.
1942 # {author+date: {path: {patchset: {line: url+message}}}}
1943 comments = collections.defaultdict(
1944 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001945 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001946 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001947 tag = comment.get('tag', '')
1948 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001949 continue
1950 key = (comment['author']['email'], comment['updated'])
1951 if comment.get('side', 'REVISION') == 'PARENT':
1952 patchset = 'Base'
1953 else:
1954 patchset = 'PS%d' % comment['patch_set']
1955 line = comment.get('line', 0)
1956 url = ('https://%s/c/%s/%s/%s#%s%s' %
1957 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1958 'b' if comment.get('side') == 'PARENT' else '',
1959 str(line) if line else ''))
1960 comments[key][path][patchset][line] = (url, comment['message'])
1961
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001962 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001963 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001964 summary = self._BuildCommentSummary(msg, comments, readable)
1965 if summary:
1966 summaries.append(summary)
1967 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001968
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001969 @staticmethod
1970 def _BuildCommentSummary(msg, comments, readable):
1971 key = (msg['author']['email'], msg['date'])
1972 # Don't bother showing autogenerated messages that don't have associated
1973 # file or line comments. this will filter out most autogenerated
1974 # messages, but will keep robot comments like those from Tricium.
1975 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1976 if is_autogenerated and not comments.get(key):
1977 return None
1978 message = msg['message']
1979 # Gerrit spits out nanoseconds.
1980 assert len(msg['date'].split('.')[-1]) == 9
1981 date = datetime.datetime.strptime(msg['date'][:-3],
1982 '%Y-%m-%d %H:%M:%S.%f')
1983 if key in comments:
1984 message += '\n'
1985 for path, patchsets in sorted(comments.get(key, {}).items()):
1986 if readable:
1987 message += '\n%s' % path
1988 for patchset, lines in sorted(patchsets.items()):
1989 for line, (url, content) in sorted(lines.items()):
1990 if line:
1991 line_str = 'Line %d' % line
1992 path_str = '%s:%d:' % (path, line)
1993 else:
1994 line_str = 'File comment'
1995 path_str = '%s:0:' % path
1996 if readable:
1997 message += '\n %s, %s: %s' % (patchset, line_str, url)
1998 message += '\n %s\n' % content
1999 else:
2000 message += '\n%s ' % path_str
2001 message += '\n%s\n' % content
2002
2003 return _CommentSummary(
2004 date=date,
2005 message=message,
2006 sender=msg['author']['email'],
2007 autogenerated=is_autogenerated,
2008 # These could be inferred from the text messages and correlated with
2009 # Code-Review label maximum, however this is not reliable.
2010 # Leaving as is until the need arises.
2011 approval=False,
2012 disapproval=False,
2013 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002014
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002015 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002016 gerrit_util.AbandonChange(
2017 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002019 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002020 gerrit_util.SubmitChange(
2021 self._GetGerritHost(), self._GerritChangeIdentifier(),
2022 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002023
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002024 def _GetChangeDetail(self, options=None, no_cache=False):
2025 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002026
2027 If fresh data is needed, set no_cache=True which will clear cache and
2028 thus new data will be fetched from Gerrit.
2029 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002030 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002031 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002032
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002033 # Optimization to avoid multiple RPCs:
2034 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2035 'CURRENT_COMMIT' not in options):
2036 options.append('CURRENT_COMMIT')
2037
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002038 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002039 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002040 options = [o.upper() for o in options]
2041
2042 # Check in cache first unless no_cache is True.
2043 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002044 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002045 else:
2046 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002047 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002048 # Assumption: data fetched before with extra options is suitable
2049 # for return for a smaller set of options.
2050 # For example, if we cached data for
2051 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2052 # and request is for options=[CURRENT_REVISION],
2053 # THEN we can return prior cached data.
2054 if options_set.issubset(cached_options_set):
2055 return data
2056
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002057 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002058 data = gerrit_util.GetChangeDetail(
2059 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002060 except gerrit_util.GerritError as e:
2061 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002062 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002063 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002064
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002065 self._detail_cache.setdefault(cache_key, []).append(
2066 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002067 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002068
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002069 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002070 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002071 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002072 data = gerrit_util.GetChangeCommit(
2073 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002074 except gerrit_util.GerritError as e:
2075 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002076 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002077 raise
agable32978d92016-11-01 12:55:02 -07002078 return data
2079
Karen Qian40c19422019-03-13 21:28:29 +00002080 def _IsCqConfigured(self):
2081 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002082 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002083 return False
2084 # TODO(crbug/753213): Remove temporary hack
2085 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002086 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002087 detail['branch'].startswith('refs/branch-heads/')):
2088 return False
2089 return True
2090
Olivier Robin75ee7252018-04-13 10:02:56 +02002091 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002092 if git_common.is_dirty_git_tree('land'):
2093 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002094
tandriid60367b2016-06-22 05:25:12 -07002095 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002096 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002097 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002098 'which can test and land changes for you. '
2099 'Are you sure you wish to bypass it?\n',
2100 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002101 differs = True
tandriic4344b52016-08-29 06:04:54 -07002102 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002103 # Note: git diff outputs nothing if there is no diff.
2104 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002105 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002106 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002107 if detail['current_revision'] == last_upload:
2108 differs = False
2109 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002110 print('WARNING: Local branch contents differ from latest uploaded '
2111 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002112 if differs:
2113 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002114 confirm_or_exit(
2115 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2116 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002117 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002118 elif not bypass_hooks:
2119 hook_results = self.RunHook(
2120 committing=True,
2121 may_prompt=not force,
2122 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002123 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2124 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002125 if not hook_results.should_continue():
2126 return 1
2127
2128 self.SubmitIssue(wait_for_merge=True)
2129 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002130 links = self._GetChangeCommit().get('web_links', [])
2131 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002132 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002133 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002134 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002135 return 0
2136
Edward Lemurf38bc172019-09-03 21:02:13 +00002137 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002138 assert parsed_issue_arg.valid
2139
Edward Lemur125d60a2019-09-13 18:25:41 +00002140 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141
2142 if parsed_issue_arg.hostname:
2143 self._gerrit_host = parsed_issue_arg.hostname
2144 self._gerrit_server = 'https://%s' % self._gerrit_host
2145
tandriic2405f52016-10-10 08:13:15 -07002146 try:
2147 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002148 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002149 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150
2151 if not parsed_issue_arg.patchset:
2152 # Use current revision by default.
2153 revision_info = detail['revisions'][detail['current_revision']]
2154 patchset = int(revision_info['_number'])
2155 else:
2156 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002157 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2159 break
2160 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002161 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 (parsed_issue_arg.patchset, self.GetIssue()))
2163
Edward Lemur125d60a2019-09-13 18:25:41 +00002164 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002165 if remote_url.endswith('.git'):
2166 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002167 remote_url = remote_url.rstrip('/')
2168
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002170 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002171
2172 if remote_url != fetch_info['url']:
2173 DieWithError('Trying to patch a change from %s but this repo appears '
2174 'to be %s.' % (fetch_info['url'], remote_url))
2175
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002177
Aaron Gable62619a32017-06-16 08:22:09 -07002178 if force:
2179 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2180 print('Checked out commit for change %i patchset %i locally' %
2181 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002182 elif nocommit:
2183 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2184 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002185 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002186 RunGit(['cherry-pick', 'FETCH_HEAD'])
2187 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002188 (parsed_issue_arg.issue, patchset))
2189 print('Note: this created a local commit which does not have '
2190 'the same hash as the one uploaded for review. This will make '
2191 'uploading changes based on top of this branch difficult.\n'
2192 'If you want to do that, use "git cl patch --force" instead.')
2193
Stefan Zagerd08043c2017-10-12 12:07:02 -07002194 if self.GetBranch():
2195 self.SetIssue(parsed_issue_arg.issue)
2196 self.SetPatchset(patchset)
2197 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2198 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2199 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2200 else:
2201 print('WARNING: You are in detached HEAD state.\n'
2202 'The patch has been applied to your checkout, but you will not be '
2203 'able to upload a new patch set to the gerrit issue.\n'
2204 'Try using the \'-b\' option if you would like to work on a '
2205 'branch and/or upload a new patch set.')
2206
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002207 return 0
2208
tandrii16e0b4e2016-06-07 10:34:28 -07002209 def _GerritCommitMsgHookCheck(self, offer_removal):
2210 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2211 if not os.path.exists(hook):
2212 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002213 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2214 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002215 data = gclient_utils.FileRead(hook)
2216 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2217 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002218 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002219 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002220 'and may interfere with it in subtle ways.\n'
2221 'We recommend you remove the commit-msg hook.')
2222 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002223 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002224 gclient_utils.rm_file_or_tree(hook)
2225 print('Gerrit commit-msg hook removed.')
2226 else:
2227 print('OK, will keep Gerrit commit-msg hook in place.')
2228
Edward Lemur1b52d872019-05-09 21:12:12 +00002229 def _CleanUpOldTraces(self):
2230 """Keep only the last |MAX_TRACES| traces."""
2231 try:
2232 traces = sorted([
2233 os.path.join(TRACES_DIR, f)
2234 for f in os.listdir(TRACES_DIR)
2235 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2236 and not f.startswith('tmp'))
2237 ])
2238 traces_to_delete = traces[:-MAX_TRACES]
2239 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002240 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002241 except OSError:
2242 print('WARNING: Failed to remove old git traces from\n'
2243 ' %s'
2244 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002245
Edward Lemur5737f022019-05-17 01:24:00 +00002246 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002247 """Zip and write the git push traces stored in traces_dir."""
2248 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002249 traces_zip = trace_name + '-traces'
2250 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002251 # Create a temporary dir to store git config and gitcookies in. It will be
2252 # compressed and stored next to the traces.
2253 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002254 git_info_zip = trace_name + '-git-info'
2255
Edward Lemur5737f022019-05-17 01:24:00 +00002256 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002257 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002258 git_push_metadata['now'] = git_push_metadata['now'].decode(
2259 sys.stdin.encoding)
2260
Edward Lemur1b52d872019-05-09 21:12:12 +00002261 git_push_metadata['trace_name'] = trace_name
2262 gclient_utils.FileWrite(
2263 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2264
2265 # Keep only the first 6 characters of the git hashes on the packet
2266 # trace. This greatly decreases size after compression.
2267 packet_traces = os.path.join(traces_dir, 'trace-packet')
2268 if os.path.isfile(packet_traces):
2269 contents = gclient_utils.FileRead(packet_traces)
2270 gclient_utils.FileWrite(
2271 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2272 shutil.make_archive(traces_zip, 'zip', traces_dir)
2273
2274 # Collect and compress the git config and gitcookies.
2275 git_config = RunGit(['config', '-l'])
2276 gclient_utils.FileWrite(
2277 os.path.join(git_info_dir, 'git-config'),
2278 git_config)
2279
2280 cookie_auth = gerrit_util.Authenticator.get()
2281 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2282 gitcookies_path = cookie_auth.get_gitcookies_path()
2283 if os.path.isfile(gitcookies_path):
2284 gitcookies = gclient_utils.FileRead(gitcookies_path)
2285 gclient_utils.FileWrite(
2286 os.path.join(git_info_dir, 'gitcookies'),
2287 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2288 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2289
Edward Lemur1b52d872019-05-09 21:12:12 +00002290 gclient_utils.rmtree(git_info_dir)
2291
2292 def _RunGitPushWithTraces(
2293 self, change_desc, refspec, refspec_opts, git_push_metadata):
2294 """Run git push and collect the traces resulting from the execution."""
2295 # Create a temporary directory to store traces in. Traces will be compressed
2296 # and stored in a 'traces' dir inside depot_tools.
2297 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002298 trace_name = os.path.join(
2299 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002300
2301 env = os.environ.copy()
2302 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2303 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002304 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002305 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2306 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2307 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2308
2309 try:
2310 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002311 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002312 before_push = time_time()
2313 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002314 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002315 env=env,
2316 print_stdout=True,
2317 # Flush after every line: useful for seeing progress when running as
2318 # recipe.
2319 filter_fn=lambda _: sys.stdout.flush())
2320 except subprocess2.CalledProcessError as e:
2321 push_returncode = e.returncode
2322 DieWithError('Failed to create a change. Please examine output above '
2323 'for the reason of the failure.\n'
2324 'Hint: run command below to diagnose common Git/Gerrit '
2325 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002326 ' git cl creds-check\n'
2327 '\n'
2328 'If git-cl is not working correctly, file a bug under the '
2329 'Infra>SDK component including the files below.\n'
2330 'Review the files before upload, since they might contain '
2331 'sensitive information.\n'
2332 'Set the Restrict-View-Google label so that they are not '
2333 'publicly accessible.\n'
2334 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002335 change_desc)
2336 finally:
2337 execution_time = time_time() - before_push
2338 metrics.collector.add_repeated('sub_commands', {
2339 'command': 'git push',
2340 'execution_time': execution_time,
2341 'exit_code': push_returncode,
2342 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2343 })
2344
Edward Lemur1b52d872019-05-09 21:12:12 +00002345 git_push_metadata['execution_time'] = execution_time
2346 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002347 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002348
Edward Lemur1b52d872019-05-09 21:12:12 +00002349 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002350 gclient_utils.rmtree(traces_dir)
2351
2352 return push_stdout
2353
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002354 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002355 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002356 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002357 # Load default for user, repo, squash=true, in this order.
2358 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002359
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002360 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002361 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002362 # This may be None; default fallback value is determined in logic below.
2363 title = options.title
2364
Dominic Battre7d1c4842017-10-27 09:17:28 +02002365 # Extract bug number from branch name.
2366 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002367 fixed = options.fixed
2368 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2369 self.GetBranch())
2370 if not bug and not fixed and match:
2371 if match.group('type') == 'bug':
2372 bug = match.group('bugnum')
2373 else:
2374 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002375
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002376 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002377 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002378 if self.GetIssue():
2379 # Try to get the message from a previous upload.
2380 message = self.GetDescription()
2381 if not message:
2382 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002383 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002384 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002385 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002386 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002387 # When uploading a subsequent patchset, -m|--message is taken
2388 # as the patchset title if --title was not provided.
2389 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002390 else:
2391 default_title = RunGit(
2392 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002393 if options.force:
2394 title = default_title
2395 else:
2396 title = ask_for_data(
2397 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002398 change_id = self._GetChangeDetail()['change_id']
2399 while True:
2400 footer_change_ids = git_footers.get_footer_change_id(message)
2401 if footer_change_ids == [change_id]:
2402 break
2403 if not footer_change_ids:
2404 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002405 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002406 continue
2407 # There is already a valid footer but with different or several ids.
2408 # Doing this automatically is non-trivial as we don't want to lose
2409 # existing other footers, yet we want to append just 1 desired
2410 # Change-Id. Thus, just create a new footer, but let user verify the
2411 # new description.
2412 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002413 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002414 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002415 print(
2416 'WARNING: change %s has Change-Id footer(s):\n'
2417 ' %s\n'
2418 'but change has Change-Id %s, according to Gerrit.\n'
2419 'Please, check the proposed correction to the description, '
2420 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2421 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2422 change_id))
2423 confirm_or_exit(action='edit')
2424 change_desc.prompt()
2425
2426 message = change_desc.description
2427 if not message:
2428 DieWithError("Description is empty. Aborting...")
2429
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002430 # Continue the while loop.
2431 # Sanity check of this code - we should end up with proper message
2432 # footer.
2433 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002434 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002435 else: # if not self.GetIssue()
2436 if options.message:
2437 message = options.message
2438 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002439 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002440 if options.title:
2441 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002442 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002443 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002444 change_desc.prompt()
2445
Aaron Gableb56ad332017-01-06 15:24:31 -08002446 # On first upload, patchset title is always this string, while
2447 # --title flag gets converted to first line of message.
2448 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002449 if not change_desc.description:
2450 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002451 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002452 if len(change_ids) > 1:
2453 DieWithError('too many Change-Id footers, at most 1 allowed.')
2454 if not change_ids:
2455 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002456 change_desc.set_description(git_footers.add_footer_change_id(
2457 change_desc.description,
2458 GenerateGerritChangeId(change_desc.description)))
2459 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002460 assert len(change_ids) == 1
2461 change_id = change_ids[0]
2462
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002463 if options.reviewers or options.tbrs or options.add_owners_to:
2464 change_desc.update_reviewers(options.reviewers, options.tbrs,
2465 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002466 if options.preserve_tryjobs:
2467 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002468
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002469 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002470 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2471 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002472 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002473 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2474 desc_tempfile.write(change_desc.description)
2475 desc_tempfile.close()
2476 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2477 '-F', desc_tempfile.name]).strip()
2478 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002479 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002480 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002481 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002482 if not change_desc.description:
2483 DieWithError("Description is empty. Aborting...")
2484
2485 if not git_footers.get_footer_change_id(change_desc.description):
2486 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002487 change_desc.set_description(
2488 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002489 if options.reviewers or options.tbrs or options.add_owners_to:
2490 change_desc.update_reviewers(options.reviewers, options.tbrs,
2491 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002492 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002493 # For no-squash mode, we assume the remote called "origin" is the one we
2494 # want. It is not worthwhile to support different workflows for
2495 # no-squash mode.
2496 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002497 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2498
2499 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002500 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002501 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2502 ref_to_push)]).splitlines()
2503 if len(commits) > 1:
2504 print('WARNING: This will upload %d commits. Run the following command '
2505 'to see which commits will be uploaded: ' % len(commits))
2506 print('git log %s..%s' % (parent, ref_to_push))
2507 print('You can also use `git squash-branch` to squash these into a '
2508 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002509 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002510
Aaron Gable6dadfbf2017-05-09 14:27:58 -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)
2514
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002515 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002516 cc = []
2517 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2518 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2519 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002520 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002521 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002522 if options.cc:
2523 cc.extend(options.cc)
2524 cc = filter(None, [email.strip() for email in cc])
2525 if change_desc.get_cced():
2526 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002527 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2528 valid_accounts = set(reviewers + cc)
2529 # TODO(crbug/877717): relax this for all hosts.
2530 else:
2531 valid_accounts = gerrit_util.ValidAccounts(
2532 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002533 logging.info('accounts %s are recognized, %s invalid',
2534 sorted(valid_accounts),
2535 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002536
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002537 # Extra options that can be specified at push time. Doc:
2538 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002539 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002540
Aaron Gable844cf292017-06-28 11:32:59 -07002541 # By default, new changes are started in WIP mode, and subsequent patchsets
2542 # don't send email. At any time, passing --send-mail will mark the change
2543 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002544 if options.send_mail:
2545 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002546 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002547 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002548 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002549 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002550 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002551
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002552 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002553 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002554
Aaron Gable9b713dd2016-12-14 16:04:21 -08002555 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002556 # Punctuation and whitespace in |title| must be percent-encoded.
2557 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002558
agablec6787972016-09-09 16:13:34 -07002559 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002560 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002561
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002562 for r in sorted(reviewers):
2563 if r in valid_accounts:
2564 refspec_opts.append('r=%s' % r)
2565 reviewers.remove(r)
2566 else:
2567 # TODO(tandrii): this should probably be a hard failure.
2568 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2569 % r)
2570 for c in sorted(cc):
2571 # refspec option will be rejected if cc doesn't correspond to an
2572 # account, even though REST call to add such arbitrary cc may succeed.
2573 if c in valid_accounts:
2574 refspec_opts.append('cc=%s' % c)
2575 cc.remove(c)
2576
rmistry9eadede2016-09-19 11:22:43 -07002577 if options.topic:
2578 # Documentation on Gerrit topics is here:
2579 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002580 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002581
Edward Lemur687ca902018-12-05 02:30:30 +00002582 if options.enable_auto_submit:
2583 refspec_opts.append('l=Auto-Submit+1')
2584 if options.use_commit_queue:
2585 refspec_opts.append('l=Commit-Queue+2')
2586 elif options.cq_dry_run:
2587 refspec_opts.append('l=Commit-Queue+1')
2588
2589 if change_desc.get_reviewers(tbr_only=True):
2590 score = gerrit_util.GetCodeReviewTbrScore(
2591 self._GetGerritHost(),
2592 self._GetGerritProject())
2593 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002594
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002595 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002596 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002597 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002598 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002599 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2600
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002601 refspec_suffix = ''
2602 if refspec_opts:
2603 refspec_suffix = '%' + ','.join(refspec_opts)
2604 assert ' ' not in refspec_suffix, (
2605 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2606 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2607
Edward Lemur1b52d872019-05-09 21:12:12 +00002608 git_push_metadata = {
2609 'gerrit_host': self._GetGerritHost(),
2610 'title': title or '<untitled>',
2611 'change_id': change_id,
2612 'description': change_desc.description,
2613 }
2614 push_stdout = self._RunGitPushWithTraces(
2615 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002616
2617 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002618 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002619 change_numbers = [m.group(1)
2620 for m in map(regex.match, push_stdout.splitlines())
2621 if m]
2622 if len(change_numbers) != 1:
2623 DieWithError(
2624 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002625 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002626 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002627 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002628
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002629 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002630 # GetIssue() is not set in case of non-squash uploads according to tests.
2631 # TODO(agable): non-squash uploads in git cl should be removed.
2632 gerrit_util.AddReviewers(
2633 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002634 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002635 reviewers, cc,
2636 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002637
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002638 return 0
2639
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002640 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2641 change_desc):
2642 """Computes parent of the generated commit to be uploaded to Gerrit.
2643
2644 Returns revision or a ref name.
2645 """
2646 if custom_cl_base:
2647 # Try to avoid creating additional unintended CLs when uploading, unless
2648 # user wants to take this risk.
2649 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2650 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2651 local_ref_of_target_remote])
2652 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002653 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002654 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2655 'If you proceed with upload, more than 1 CL may be created by '
2656 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2657 'If you are certain that specified base `%s` has already been '
2658 'uploaded to Gerrit as another CL, you may proceed.\n' %
2659 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2660 if not force:
2661 confirm_or_exit(
2662 'Do you take responsibility for cleaning up potential mess '
2663 'resulting from proceeding with upload?',
2664 action='upload')
2665 return custom_cl_base
2666
Aaron Gablef97e33d2017-03-30 15:44:27 -07002667 if remote != '.':
2668 return self.GetCommonAncestorWithUpstream()
2669
2670 # If our upstream branch is local, we base our squashed commit on its
2671 # squashed version.
2672 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2673
Aaron Gablef97e33d2017-03-30 15:44:27 -07002674 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002675 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002676
2677 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002678 # TODO(tandrii): consider checking parent change in Gerrit and using its
2679 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2680 # the tree hash of the parent branch. The upside is less likely bogus
2681 # requests to reupload parent change just because it's uploadhash is
2682 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002683 parent = RunGit(['config',
2684 'branch.%s.gerritsquashhash' % upstream_branch_name],
2685 error_ok=True).strip()
2686 # Verify that the upstream branch has been uploaded too, otherwise
2687 # Gerrit will create additional CLs when uploading.
2688 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2689 RunGitSilent(['rev-parse', parent + ':'])):
2690 DieWithError(
2691 '\nUpload upstream branch %s first.\n'
2692 'It is likely that this branch has been rebased since its last '
2693 'upload, so you just need to upload it again.\n'
2694 '(If you uploaded it with --no-squash, then branch dependencies '
2695 'are not supported, and you should reupload with --squash.)'
2696 % upstream_branch_name,
2697 change_desc)
2698 return parent
2699
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002700 def _AddChangeIdToCommitMessage(self, options, args):
2701 """Re-commits using the current message, assumes the commit hook is in
2702 place.
2703 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002704 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002705 git_command = ['commit', '--amend', '-m', log_desc]
2706 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002707 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002708 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002709 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002710 return new_log_desc
2711 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002712 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002713
tandriie113dfd2016-10-11 10:20:12 -07002714 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002715 try:
2716 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002717 except GerritChangeNotExists:
2718 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002719
2720 if data['status'] in ('ABANDONED', 'MERGED'):
2721 return 'CL %s is closed' % self.GetIssue()
2722
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002723 def GetGerritChange(self, patchset=None):
2724 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2725 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2726 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002727 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002728 data = self._GetChangeDetail(['ALL_REVISIONS'])
2729
2730 assert host and issue and patchset, 'CL must be uploaded first'
2731
2732 has_patchset = any(
2733 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002734 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002735 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002736 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002737 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002738
tandrii8c5a3532016-11-04 07:52:02 -07002739 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002740 'host': host,
2741 'change': issue,
2742 'project': data['project'],
2743 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002744 }
tandriie113dfd2016-10-11 10:20:12 -07002745
tandriide281ae2016-10-12 06:02:30 -07002746 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002747 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002748
Edward Lemur707d70b2018-02-07 00:50:14 +01002749 def GetReviewers(self):
2750 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002751 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002752
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002753
2754_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002755 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002756}
2757
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002758
iannuccie53c9352016-08-17 14:40:40 -07002759def _add_codereview_issue_select_options(parser, extra=""):
2760 _add_codereview_select_options(parser)
2761
2762 text = ('Operate on this issue number instead of the current branch\'s '
2763 'implicit issue.')
2764 if extra:
2765 text += ' '+extra
2766 parser.add_option('-i', '--issue', type=int, help=text)
2767
2768
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002769def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002770 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002771 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002772 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002773 parser.add_option_group(parser.codereview_group)
2774 parser.codereview_group.add_option(
2775 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002776 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002777
2778
tandriif9aefb72016-07-01 09:06:51 -07002779def _get_bug_line_values(default_project, bugs):
2780 """Given default_project and comma separated list of bugs, yields bug line
2781 values.
2782
2783 Each bug can be either:
2784 * a number, which is combined with default_project
2785 * string, which is left as is.
2786
2787 This function may produce more than one line, because bugdroid expects one
2788 project per line.
2789
2790 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2791 ['v8:123', 'chromium:789']
2792 """
2793 default_bugs = []
2794 others = []
2795 for bug in bugs.split(','):
2796 bug = bug.strip()
2797 if bug:
2798 try:
2799 default_bugs.append(int(bug))
2800 except ValueError:
2801 others.append(bug)
2802
2803 if default_bugs:
2804 default_bugs = ','.join(map(str, default_bugs))
2805 if default_project:
2806 yield '%s:%s' % (default_project, default_bugs)
2807 else:
2808 yield default_bugs
2809 for other in sorted(others):
2810 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2811 yield other
2812
2813
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002814class ChangeDescription(object):
2815 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002816 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002817 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002818 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002819 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002820 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002821 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2822 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2823 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2824 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002825
Dan Beamd8b04ca2019-10-10 21:23:26 +00002826 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002827 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002828 if bug:
2829 regexp = re.compile(self.BUG_LINE)
2830 prefix = settings.GetBugPrefix()
2831 if not any((regexp.match(line) for line in self._description_lines)):
2832 values = list(_get_bug_line_values(prefix, bug))
2833 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002834 if fixed:
2835 regexp = re.compile(self.FIXED_LINE)
2836 prefix = settings.GetBugPrefix()
2837 if not any((regexp.match(line) for line in self._description_lines)):
2838 values = list(_get_bug_line_values(prefix, fixed))
2839 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002840
agable@chromium.org42c20792013-09-12 17:34:49 +00002841 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002842 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002843 return '\n'.join(self._description_lines)
2844
2845 def set_description(self, desc):
2846 if isinstance(desc, basestring):
2847 lines = desc.splitlines()
2848 else:
2849 lines = [line.rstrip() for line in desc]
2850 while lines and not lines[0]:
2851 lines.pop(0)
2852 while lines and not lines[-1]:
2853 lines.pop(-1)
2854 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002855
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002856 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2857 """Rewrites the R=/TBR= line(s) as a single line each.
2858
2859 Args:
2860 reviewers (list(str)) - list of additional emails to use for reviewers.
2861 tbrs (list(str)) - list of additional emails to use for TBRs.
2862 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2863 the change that are missing OWNER coverage. If this is not None, you
2864 must also pass a value for `change`.
2865 change (Change) - The Change that should be used for OWNERS lookups.
2866 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002867 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002868 assert isinstance(tbrs, list), tbrs
2869
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002870 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002871 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002872
2873 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002874 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002875
2876 reviewers = set(reviewers)
2877 tbrs = set(tbrs)
2878 LOOKUP = {
2879 'TBR': tbrs,
2880 'R': reviewers,
2881 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002882
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002883 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002884 regexp = re.compile(self.R_LINE)
2885 matches = [regexp.match(line) for line in self._description_lines]
2886 new_desc = [l for i, l in enumerate(self._description_lines)
2887 if not matches[i]]
2888 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002889
agable@chromium.org42c20792013-09-12 17:34:49 +00002890 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002891
2892 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002893 for match in matches:
2894 if not match:
2895 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002896 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2897
2898 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002899 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002900 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002901 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002902 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002903 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002904 LOOKUP[add_owners_to].update(
2905 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002906
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002907 # If any folks ended up in both groups, remove them from tbrs.
2908 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002909
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002910 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2911 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002912
2913 # Put the new lines in the description where the old first R= line was.
2914 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2915 if 0 <= line_loc < len(self._description_lines):
2916 if new_tbr_line:
2917 self._description_lines.insert(line_loc, new_tbr_line)
2918 if new_r_line:
2919 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002920 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002921 if new_r_line:
2922 self.append_footer(new_r_line)
2923 if new_tbr_line:
2924 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002925
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002926 def set_preserve_tryjobs(self):
2927 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2928 footers = git_footers.parse_footers(self.description)
2929 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2930 if v.lower() == 'true':
2931 return
2932 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2933
Anthony Polito8b955342019-09-24 19:01:36 +00002934 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002935 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002936 self.set_description([
2937 '# Enter a description of the change.',
2938 '# This will be displayed on the codereview site.',
2939 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002940 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002941 '--------------------',
2942 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002943 bug_regexp = re.compile(self.BUG_LINE)
2944 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002945 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002946 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2947 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002948 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002949
agable@chromium.org42c20792013-09-12 17:34:49 +00002950 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002951 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002952 if not content:
2953 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002954 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002955
Bruce Dawson2377b012018-01-11 16:46:49 -08002956 # Strip off comments and default inserted "Bug:" line.
2957 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002958 (line.startswith('#') or
2959 line.rstrip() == "Bug:" or
2960 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002961 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002962 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002963 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002964
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002965 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002966 """Adds a footer line to the description.
2967
2968 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2969 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2970 that Gerrit footers are always at the end.
2971 """
2972 parsed_footer_line = git_footers.parse_footer(line)
2973 if parsed_footer_line:
2974 # Line is a gerrit footer in the form: Footer-Key: any value.
2975 # Thus, must be appended observing Gerrit footer rules.
2976 self.set_description(
2977 git_footers.add_footer(self.description,
2978 key=parsed_footer_line[0],
2979 value=parsed_footer_line[1]))
2980 return
2981
2982 if not self._description_lines:
2983 self._description_lines.append(line)
2984 return
2985
2986 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2987 if gerrit_footers:
2988 # git_footers.split_footers ensures that there is an empty line before
2989 # actual (gerrit) footers, if any. We have to keep it that way.
2990 assert top_lines and top_lines[-1] == ''
2991 top_lines, separator = top_lines[:-1], top_lines[-1:]
2992 else:
2993 separator = [] # No need for separator if there are no gerrit_footers.
2994
2995 prev_line = top_lines[-1] if top_lines else ''
2996 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2997 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2998 top_lines.append('')
2999 top_lines.append(line)
3000 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003001
tandrii99a72f22016-08-17 14:33:24 -07003002 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003003 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003004 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003005 reviewers = [match.group(2).strip()
3006 for match in matches
3007 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003008 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003009
bradnelsond975b302016-10-23 12:20:23 -07003010 def get_cced(self):
3011 """Retrieves the list of reviewers."""
3012 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3013 cced = [match.group(2).strip() for match in matches if match]
3014 return cleanup_list(cced)
3015
Nodir Turakulov23b82142017-11-16 11:04:25 -08003016 def get_hash_tags(self):
3017 """Extracts and sanitizes a list of Gerrit hashtags."""
3018 subject = (self._description_lines or ('',))[0]
3019 subject = re.sub(
3020 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3021
3022 tags = []
3023 start = 0
3024 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3025 while True:
3026 m = bracket_exp.match(subject, start)
3027 if not m:
3028 break
3029 tags.append(self.sanitize_hash_tag(m.group(1)))
3030 start = m.end()
3031
3032 if not tags:
3033 # Try "Tag: " prefix.
3034 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3035 if m:
3036 tags.append(self.sanitize_hash_tag(m.group(1)))
3037 return tags
3038
3039 @classmethod
3040 def sanitize_hash_tag(cls, tag):
3041 """Returns a sanitized Gerrit hash tag.
3042
3043 A sanitized hashtag can be used as a git push refspec parameter value.
3044 """
3045 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3046
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003047 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3048 """Updates this commit description given the parent.
3049
3050 This is essentially what Gnumbd used to do.
3051 Consult https://goo.gl/WMmpDe for more details.
3052 """
3053 assert parent_msg # No, orphan branch creation isn't supported.
3054 assert parent_hash
3055 assert dest_ref
3056 parent_footer_map = git_footers.parse_footers(parent_msg)
3057 # This will also happily parse svn-position, which GnumbD is no longer
3058 # supporting. While we'd generate correct footers, the verifier plugin
3059 # installed in Gerrit will block such commit (ie git push below will fail).
3060 parent_position = git_footers.get_position(parent_footer_map)
3061
3062 # Cherry-picks may have last line obscuring their prior footers,
3063 # from git_footers perspective. This is also what Gnumbd did.
3064 cp_line = None
3065 if (self._description_lines and
3066 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3067 cp_line = self._description_lines.pop()
3068
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003069 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003070
3071 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3072 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003073 for i, line in enumerate(footer_lines):
3074 k, v = git_footers.parse_footer(line) or (None, None)
3075 if k and k.startswith('Cr-'):
3076 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003077
3078 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003079 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003080 if parent_position[0] == dest_ref:
3081 # Same branch as parent.
3082 number = int(parent_position[1]) + 1
3083 else:
3084 number = 1 # New branch, and extra lineage.
3085 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3086 int(parent_position[1])))
3087
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003088 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3089 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003090
3091 self._description_lines = top_lines
3092 if cp_line:
3093 self._description_lines.append(cp_line)
3094 if self._description_lines[-1] != '':
3095 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003096 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003097
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003098
Aaron Gablea1bab272017-04-11 16:38:18 -07003099def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003100 """Retrieves the reviewers that approved a CL from the issue properties with
3101 messages.
3102
3103 Note that the list may contain reviewers that are not committer, thus are not
3104 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003105
3106 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003107 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003108 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003109 return sorted(
3110 set(
3111 message['sender']
3112 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003113 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003114 )
3115 )
3116
3117
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003118def FindCodereviewSettingsFile(filename='codereview.settings'):
3119 """Finds the given file starting in the cwd and going up.
3120
3121 Only looks up to the top of the repository unless an
3122 'inherit-review-settings-ok' file exists in the root of the repository.
3123 """
3124 inherit_ok_file = 'inherit-review-settings-ok'
3125 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003126 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003127 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3128 root = '/'
3129 while True:
3130 if filename in os.listdir(cwd):
3131 if os.path.isfile(os.path.join(cwd, filename)):
3132 return open(os.path.join(cwd, filename))
3133 if cwd == root:
3134 break
3135 cwd = os.path.dirname(cwd)
3136
3137
3138def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003139 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003140 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003141
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003142 def SetProperty(name, setting, unset_error_ok=False):
3143 fullname = 'rietveld.' + name
3144 if setting in keyvals:
3145 RunGit(['config', fullname, keyvals[setting]])
3146 else:
3147 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3148
tandrii48df5812016-10-17 03:55:37 -07003149 if not keyvals.get('GERRIT_HOST', False):
3150 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003151 # Only server setting is required. Other settings can be absent.
3152 # In that case, we ignore errors raised during option deletion attempt.
3153 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3154 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3155 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003156 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003157 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3158 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003159 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3160 unset_error_ok=True)
Jamie Madilldc4d19e2019-10-24 21:50:02 +00003161 SetProperty(
3162 'format-full-by-default', 'FORMAT_FULL_BY_DEFAULT', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003163
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003164 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003165 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003166
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003167 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003168 RunGit(['config', 'gerrit.squash-uploads',
3169 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003170
tandrii@chromium.org28253532016-04-14 13:46:56 +00003171 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003172 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003173 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3174
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003175 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003176 # should be of the form
3177 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3178 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003179 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3180 keyvals['ORIGIN_URL_CONFIG']])
3181
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003182
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003183def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003184 """Downloads a network object to a local file, like urllib.urlretrieve.
3185
3186 This is necessary because urllib is broken for SSL connections via a proxy.
3187 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003188 with open(destination, 'w') as f:
Edward Lemurd2a5a4c2019-10-23 22:55:26 +00003189 f.write(urllib2.urlopen(source).read())
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003190
3191
ukai@chromium.org712d6102013-11-27 00:52:58 +00003192def hasSheBang(fname):
3193 """Checks fname is a #! script."""
3194 with open(fname) as f:
3195 return f.read(2).startswith('#!')
3196
3197
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003198# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3199def DownloadHooks(*args, **kwargs):
3200 pass
3201
3202
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003203def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003204 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003205
3206 Args:
3207 force: True to update hooks. False to install hooks if not present.
3208 """
3209 if not settings.GetIsGerrit():
3210 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003211 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003212 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3213 if not os.access(dst, os.X_OK):
3214 if os.path.exists(dst):
3215 if not force:
3216 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003217 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003218 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003219 if not hasSheBang(dst):
3220 DieWithError('Not a script: %s\n'
3221 'You need to download from\n%s\n'
3222 'into .git/hooks/commit-msg and '
3223 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003224 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3225 except Exception:
3226 if os.path.exists(dst):
3227 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003228 DieWithError('\nFailed to download hooks.\n'
3229 'You need to download from\n%s\n'
3230 'into .git/hooks/commit-msg and '
3231 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003232
3233
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003234class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003235 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003236
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003237 _GOOGLESOURCE = 'googlesource.com'
3238
3239 def __init__(self):
3240 # Cached list of [host, identity, source], where source is either
3241 # .gitcookies or .netrc.
3242 self._all_hosts = None
3243
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003244 def ensure_configured_gitcookies(self):
3245 """Runs checks and suggests fixes to make git use .gitcookies from default
3246 path."""
3247 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3248 configured_path = RunGitSilent(
3249 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003250 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003251 if configured_path:
3252 self._ensure_default_gitcookies_path(configured_path, default)
3253 else:
3254 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003255
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003256 @staticmethod
3257 def _ensure_default_gitcookies_path(configured_path, default_path):
3258 assert configured_path
3259 if configured_path == default_path:
3260 print('git is already configured to use your .gitcookies from %s' %
3261 configured_path)
3262 return
3263
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003264 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003265 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3266 (configured_path, default_path))
3267
3268 if not os.path.exists(configured_path):
3269 print('However, your configured .gitcookies file is missing.')
3270 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3271 action='reconfigure')
3272 RunGit(['config', '--global', 'http.cookiefile', default_path])
3273 return
3274
3275 if os.path.exists(default_path):
3276 print('WARNING: default .gitcookies file already exists %s' %
3277 default_path)
3278 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3279 default_path)
3280
3281 confirm_or_exit('Move existing .gitcookies to default location?',
3282 action='move')
3283 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003284 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003285 print('Moved and reconfigured git to use .gitcookies from %s' %
3286 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003287
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003288 @staticmethod
3289 def _configure_gitcookies_path(default_path):
3290 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3291 if os.path.exists(netrc_path):
3292 print('You seem to be using outdated .netrc for git credentials: %s' %
3293 netrc_path)
3294 print('This tool will guide you through setting up recommended '
3295 '.gitcookies store for git credentials.\n'
3296 '\n'
3297 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3298 ' git config --global --unset http.cookiefile\n'
3299 ' mv %s %s.backup\n\n' % (default_path, default_path))
3300 confirm_or_exit(action='setup .gitcookies')
3301 RunGit(['config', '--global', 'http.cookiefile', default_path])
3302 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003303
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003304 def get_hosts_with_creds(self, include_netrc=False):
3305 if self._all_hosts is None:
3306 a = gerrit_util.CookiesAuthenticator()
3307 self._all_hosts = [
3308 (h, u, s)
3309 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003310 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3311 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003312 )
3313 if h.endswith(self._GOOGLESOURCE)
3314 ]
3315
3316 if include_netrc:
3317 return self._all_hosts
3318 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3319
3320 def print_current_creds(self, include_netrc=False):
3321 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3322 if not hosts:
3323 print('No Git/Gerrit credentials found')
3324 return
3325 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3326 header = [('Host', 'User', 'Which file'),
3327 ['=' * l for l in lengths]]
3328 for row in (header + hosts):
3329 print('\t'.join((('%%+%ds' % l) % s)
3330 for l, s in zip(lengths, row)))
3331
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003332 @staticmethod
3333 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003334 """Parses identity "git-<username>.domain" into <username> and domain."""
3335 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003336 # distinguishable from sub-domains. But we do know typical domains:
3337 if identity.endswith('.chromium.org'):
3338 domain = 'chromium.org'
3339 username = identity[:-len('.chromium.org')]
3340 else:
3341 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003342 if username.startswith('git-'):
3343 username = username[len('git-'):]
3344 return username, domain
3345
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003346 def _canonical_git_googlesource_host(self, host):
3347 """Normalizes Gerrit hosts (with '-review') to Git host."""
3348 assert host.endswith(self._GOOGLESOURCE)
3349 # Prefix doesn't include '.' at the end.
3350 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3351 if prefix.endswith('-review'):
3352 prefix = prefix[:-len('-review')]
3353 return prefix + '.' + self._GOOGLESOURCE
3354
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003355 def _canonical_gerrit_googlesource_host(self, host):
3356 git_host = self._canonical_git_googlesource_host(host)
3357 prefix = git_host.split('.', 1)[0]
3358 return prefix + '-review.' + self._GOOGLESOURCE
3359
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003360 def _get_counterpart_host(self, host):
3361 assert host.endswith(self._GOOGLESOURCE)
3362 git = self._canonical_git_googlesource_host(host)
3363 gerrit = self._canonical_gerrit_googlesource_host(git)
3364 return git if gerrit == host else gerrit
3365
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003366 def has_generic_host(self):
3367 """Returns whether generic .googlesource.com has been configured.
3368
3369 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3370 """
3371 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3372 if host == '.' + self._GOOGLESOURCE:
3373 return True
3374 return False
3375
3376 def _get_git_gerrit_identity_pairs(self):
3377 """Returns map from canonic host to pair of identities (Git, Gerrit).
3378
3379 One of identities might be None, meaning not configured.
3380 """
3381 host_to_identity_pairs = {}
3382 for host, identity, _ in self.get_hosts_with_creds():
3383 canonical = self._canonical_git_googlesource_host(host)
3384 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3385 idx = 0 if canonical == host else 1
3386 pair[idx] = identity
3387 return host_to_identity_pairs
3388
3389 def get_partially_configured_hosts(self):
3390 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003391 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003392 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003393 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003394
3395 def get_conflicting_hosts(self):
3396 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003397 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003398 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003399 if None not in (i1, i2) and i1 != i2)
3400
3401 def get_duplicated_hosts(self):
3402 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003403 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003404
3405 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3406 'chromium.googlesource.com': 'chromium.org',
3407 'chrome-internal.googlesource.com': 'google.com',
3408 }
3409
3410 def get_hosts_with_wrong_identities(self):
3411 """Finds hosts which **likely** reference wrong identities.
3412
3413 Note: skips hosts which have conflicting identities for Git and Gerrit.
3414 """
3415 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003416 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003417 pair = self._get_git_gerrit_identity_pairs().get(host)
3418 if pair and pair[0] == pair[1]:
3419 _, domain = self._parse_identity(pair[0])
3420 if domain != expected:
3421 hosts.add(host)
3422 return hosts
3423
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003424 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003425 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003426 hosts = sorted(hosts)
3427 assert hosts
3428 if extra_column_func is None:
3429 extras = [''] * len(hosts)
3430 else:
3431 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003432 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3433 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003434 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003435 lines.append(tmpl % he)
3436 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003437
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003438 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003439 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003440 yield ('.googlesource.com wildcard record detected',
3441 ['Chrome Infrastructure team recommends to list full host names '
3442 'explicitly.'],
3443 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003444
3445 dups = self.get_duplicated_hosts()
3446 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003447 yield ('The following hosts were defined twice',
3448 self._format_hosts(dups),
3449 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003450
3451 partial = self.get_partially_configured_hosts()
3452 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003453 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3454 'These hosts are missing',
3455 self._format_hosts(partial, lambda host: 'but %s defined' %
3456 self._get_counterpart_host(host)),
3457 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003458
3459 conflicting = self.get_conflicting_hosts()
3460 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003461 yield ('The following Git hosts have differing credentials from their '
3462 'Gerrit counterparts',
3463 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3464 tuple(self._get_git_gerrit_identity_pairs()[host])),
3465 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003466
3467 wrong = self.get_hosts_with_wrong_identities()
3468 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003469 yield ('These hosts likely use wrong identity',
3470 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3471 (self._get_git_gerrit_identity_pairs()[host][0],
3472 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3473 wrong)
3474
3475 def find_and_report_problems(self):
3476 """Returns True if there was at least one problem, else False."""
3477 found = False
3478 bad_hosts = set()
3479 for title, sublines, hosts in self._find_problems():
3480 if not found:
3481 found = True
3482 print('\n\n.gitcookies problem report:\n')
3483 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003484 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003485 if sublines:
3486 print()
3487 print(' %s' % '\n '.join(sublines))
3488 print()
3489
3490 if bad_hosts:
3491 assert found
3492 print(' You can manually remove corresponding lines in your %s file and '
3493 'visit the following URLs with correct account to generate '
3494 'correct credential lines:\n' %
3495 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3496 print(' %s' % '\n '.join(sorted(set(
3497 gerrit_util.CookiesAuthenticator().get_new_password_url(
3498 self._canonical_git_googlesource_host(host))
3499 for host in bad_hosts
3500 ))))
3501 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003502
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003503
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003504@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003505def CMDcreds_check(parser, args):
3506 """Checks credentials and suggests changes."""
3507 _, _ = parser.parse_args(args)
3508
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003509 # Code below checks .gitcookies. Abort if using something else.
3510 authn = gerrit_util.Authenticator.get()
3511 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3512 if isinstance(authn, gerrit_util.GceAuthenticator):
3513 DieWithError(
3514 'This command is not designed for GCE, are you on a bot?\n'
3515 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3516 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003517 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003518 'This command is not designed for bot environment. It checks '
3519 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003520
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003521 checker = _GitCookiesChecker()
3522 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003523
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003524 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003525 checker.print_current_creds(include_netrc=True)
3526
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003527 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003528 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003529 return 0
3530 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003531
3532
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003533@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003534def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003535 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003536 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3537 branch = ShortBranchName(branchref)
3538 _, args = parser.parse_args(args)
3539 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003540 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003541 return RunGit(['config', 'branch.%s.base-url' % branch],
3542 error_ok=False).strip()
3543 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003544 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003545 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3546 error_ok=False).strip()
3547
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003548
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003549def color_for_status(status):
3550 """Maps a Changelist status to color, for CMDstatus and other tools."""
3551 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003552 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003553 'waiting': Fore.BLUE,
3554 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003555 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003556 'lgtm': Fore.GREEN,
3557 'commit': Fore.MAGENTA,
3558 'closed': Fore.CYAN,
3559 'error': Fore.WHITE,
3560 }.get(status, Fore.WHITE)
3561
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003562
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003563def get_cl_statuses(changes, fine_grained, max_processes=None):
3564 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003565
3566 If fine_grained is true, this will fetch CL statuses from the server.
3567 Otherwise, simply indicate if there's a matching url for the given branches.
3568
3569 If max_processes is specified, it is used as the maximum number of processes
3570 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3571 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003572
3573 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003574 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003575 if not changes:
3576 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003577
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003578 if not fine_grained:
3579 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003580 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003581 for cl in changes:
3582 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003583 return
3584
3585 # First, sort out authentication issues.
3586 logging.debug('ensuring credentials exist')
3587 for cl in changes:
3588 cl.EnsureAuthenticated(force=False, refresh=True)
3589
3590 def fetch(cl):
3591 try:
3592 return (cl, cl.GetStatus())
3593 except:
3594 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003595 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003596 raise
3597
3598 threads_count = len(changes)
3599 if max_processes:
3600 threads_count = max(1, min(threads_count, max_processes))
3601 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3602
3603 pool = ThreadPool(threads_count)
3604 fetched_cls = set()
3605 try:
3606 it = pool.imap_unordered(fetch, changes).__iter__()
3607 while True:
3608 try:
3609 cl, status = it.next(timeout=5)
3610 except multiprocessing.TimeoutError:
3611 break
3612 fetched_cls.add(cl)
3613 yield cl, status
3614 finally:
3615 pool.close()
3616
3617 # Add any branches that failed to fetch.
3618 for cl in set(changes) - fetched_cls:
3619 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003620
rmistry@google.com2dd99862015-06-22 12:22:18 +00003621
3622def upload_branch_deps(cl, args):
3623 """Uploads CLs of local branches that are dependents of the current branch.
3624
3625 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003626
3627 test1 -> test2.1 -> test3.1
3628 -> test3.2
3629 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003630
3631 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3632 run on the dependent branches in this order:
3633 test2.1, test3.1, test3.2, test2.2, test3.3
3634
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003635 Note: This function does not rebase your local dependent branches. Use it
3636 when you make a change to the parent branch that will not conflict
3637 with its dependent branches, and you would like their dependencies
3638 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003639 """
3640 if git_common.is_dirty_git_tree('upload-branch-deps'):
3641 return 1
3642
3643 root_branch = cl.GetBranch()
3644 if root_branch is None:
3645 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3646 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003647 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003648 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3649 'patchset dependencies without an uploaded CL.')
3650
3651 branches = RunGit(['for-each-ref',
3652 '--format=%(refname:short) %(upstream:short)',
3653 'refs/heads'])
3654 if not branches:
3655 print('No local branches found.')
3656 return 0
3657
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003658 # Create a dictionary of all local branches to the branches that are
3659 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003660 tracked_to_dependents = collections.defaultdict(list)
3661 for b in branches.splitlines():
3662 tokens = b.split()
3663 if len(tokens) == 2:
3664 branch_name, tracked = tokens
3665 tracked_to_dependents[tracked].append(branch_name)
3666
vapiera7fbd5a2016-06-16 09:17:49 -07003667 print()
3668 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003669 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003670
rmistry@google.com2dd99862015-06-22 12:22:18 +00003671 def traverse_dependents_preorder(branch, padding=''):
3672 dependents_to_process = tracked_to_dependents.get(branch, [])
3673 padding += ' '
3674 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003675 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003676 dependents.append(dependent)
3677 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003678
rmistry@google.com2dd99862015-06-22 12:22:18 +00003679 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003680 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003681
3682 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003683 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003684 return 0
3685
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003686 confirm_or_exit('This command will checkout all dependent branches and run '
3687 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003688
rmistry@google.com2dd99862015-06-22 12:22:18 +00003689 # Record all dependents that failed to upload.
3690 failures = {}
3691 # Go through all dependents, checkout the branch and upload.
3692 try:
3693 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003694 print()
3695 print('--------------------------------------')
3696 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003697 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003698 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003699 try:
3700 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003701 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003702 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003703 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003704 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003705 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003706 finally:
3707 # Swap back to the original root branch.
3708 RunGit(['checkout', '-q', root_branch])
3709
vapiera7fbd5a2016-06-16 09:17:49 -07003710 print()
3711 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003712 for dependent_branch in dependents:
3713 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003714 print(' %s : %s' % (dependent_branch, upload_status))
3715 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003716
3717 return 0
3718
3719
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003720@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003721def CMDarchive(parser, args):
3722 """Archives and deletes branches associated with closed changelists."""
3723 parser.add_option(
3724 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003725 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003726 parser.add_option(
3727 '-f', '--force', action='store_true',
3728 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003729 parser.add_option(
3730 '-d', '--dry-run', action='store_true',
3731 help='Skip the branch tagging and removal steps.')
3732 parser.add_option(
3733 '-t', '--notags', action='store_true',
3734 help='Do not tag archived branches. '
3735 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003736
kmarshall3bff56b2016-06-06 18:31:47 -07003737 options, args = parser.parse_args(args)
3738 if args:
3739 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003740
3741 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3742 if not branches:
3743 return 0
3744
vapiera7fbd5a2016-06-16 09:17:49 -07003745 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003746 changes = [Changelist(branchref=b)
3747 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003748 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3749 statuses = get_cl_statuses(changes,
3750 fine_grained=True,
3751 max_processes=options.maxjobs)
3752 proposal = [(cl.GetBranch(),
3753 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3754 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003755 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003756 proposal.sort()
3757
3758 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003759 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003760 return 0
3761
3762 current_branch = GetCurrentBranch()
3763
vapiera7fbd5a2016-06-16 09:17:49 -07003764 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003765 if options.notags:
3766 for next_item in proposal:
3767 print(' ' + next_item[0])
3768 else:
3769 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3770 for next_item in proposal:
3771 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003772
kmarshall9249e012016-08-23 12:02:16 -07003773 # Quit now on precondition failure or if instructed by the user, either
3774 # via an interactive prompt or by command line flags.
3775 if options.dry_run:
3776 print('\nNo changes were made (dry run).\n')
3777 return 0
3778 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003779 print('You are currently on a branch \'%s\' which is associated with a '
3780 'closed codereview issue, so archive cannot proceed. Please '
3781 'checkout another branch and run this command again.' %
3782 current_branch)
3783 return 1
kmarshall9249e012016-08-23 12:02:16 -07003784 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003785 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3786 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003787 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003788 return 1
3789
3790 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003791 if not options.notags:
3792 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003793 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003794
vapiera7fbd5a2016-06-16 09:17:49 -07003795 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003796
3797 return 0
3798
3799
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003800@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003801def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003802 """Show status of changelists.
3803
3804 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003805 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003806 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003807 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003808 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003809 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003810 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003811 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003812
3813 Also see 'git cl comments'.
3814 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003815 parser.add_option(
3816 '--no-branch-color',
3817 action='store_true',
3818 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003819 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003820 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003821 parser.add_option('-f', '--fast', action='store_true',
3822 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003823 parser.add_option(
3824 '-j', '--maxjobs', action='store', type=int,
3825 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003826
iannuccie53c9352016-08-17 14:40:40 -07003827 _add_codereview_issue_select_options(
3828 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003829 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003830 if args:
3831 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003832
iannuccie53c9352016-08-17 14:40:40 -07003833 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003834 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003835
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003836 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003837 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003838 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003839 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003840 elif options.field == 'id':
3841 issueid = cl.GetIssue()
3842 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003843 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003844 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003845 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003846 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003847 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003848 elif options.field == 'status':
3849 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003850 elif options.field == 'url':
3851 url = cl.GetIssueURL()
3852 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003853 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003854 return 0
3855
3856 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3857 if not branches:
3858 print('No local branch found.')
3859 return 0
3860
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003861 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003862 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003863 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003864 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003865 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003866 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003867 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003868
Daniel McArdlea23bf592019-02-12 00:25:12 +00003869 current_branch = GetCurrentBranch()
3870
3871 def FormatBranchName(branch, colorize=False):
3872 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3873 an asterisk when it is the current branch."""
3874
3875 asterisk = ""
3876 color = Fore.RESET
3877 if branch == current_branch:
3878 asterisk = "* "
3879 color = Fore.GREEN
3880 branch_name = ShortBranchName(branch)
3881
3882 if colorize:
3883 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003884 return asterisk + branch_name
3885
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003886 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003887
3888 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003889 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3890 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003891 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003892 c, status = output.next()
3893 branch_statuses[c.GetBranch()] = status
3894 status = branch_statuses.pop(branch)
3895 url = cl.GetIssueURL()
3896 if url and (not status or status == 'error'):
3897 # The issue probably doesn't exist anymore.
3898 url += ' (broken)'
3899
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003900 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003901 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003902 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003903 color = ''
3904 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003905 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003906
Alan Cuttera3be9a52019-03-04 18:50:33 +00003907 branch_display = FormatBranchName(branch)
3908 padding = ' ' * (alignment - len(branch_display))
3909 if not options.no_branch_color:
3910 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003911
Alan Cuttera3be9a52019-03-04 18:50:33 +00003912 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3913 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003914
vapiera7fbd5a2016-06-16 09:17:49 -07003915 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003916 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003917 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003918 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003919 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003920 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003921 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003922 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003923 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003924 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003925 print('Issue description:')
3926 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003927 return 0
3928
3929
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003930def colorize_CMDstatus_doc():
3931 """To be called once in main() to add colors to git cl status help."""
3932 colors = [i for i in dir(Fore) if i[0].isupper()]
3933
3934 def colorize_line(line):
3935 for color in colors:
3936 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003937 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003938 indent = len(line) - len(line.lstrip(' ')) + 1
3939 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3940 return line
3941
3942 lines = CMDstatus.__doc__.splitlines()
3943 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3944
3945
phajdan.jre328cf92016-08-22 04:12:17 -07003946def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003947 if path == '-':
3948 json.dump(contents, sys.stdout)
3949 else:
3950 with open(path, 'w') as f:
3951 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003952
3953
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003954@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003955@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003956def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003957 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003958
3959 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003960 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003961 parser.add_option('-r', '--reverse', action='store_true',
3962 help='Lookup the branch(es) for the specified issues. If '
3963 'no issues are specified, all branches with mapped '
3964 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003965 parser.add_option('--json',
3966 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003967 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003968 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003969
dnj@chromium.org406c4402015-03-03 17:22:28 +00003970 if options.reverse:
3971 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003972 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003973 # Reverse issue lookup.
3974 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003975
3976 git_config = {}
3977 for config in RunGit(['config', '--get-regexp',
3978 r'branch\..*issue']).splitlines():
3979 name, _space, val = config.partition(' ')
3980 git_config[name] = val
3981
dnj@chromium.org406c4402015-03-03 17:22:28 +00003982 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003983 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3984 config_key = _git_branch_config_key(ShortBranchName(branch),
3985 cls.IssueConfigKey())
3986 issue = git_config.get(config_key)
3987 if issue:
3988 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003989 if not args:
3990 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003991 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003992 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003993 try:
3994 issue_num = int(issue)
3995 except ValueError:
3996 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003997 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003998 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003999 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00004000 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004001 if options.json:
4002 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004003 return 0
4004
4005 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004006 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004007 if not issue.valid:
4008 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4009 'or no argument to list it.\n'
4010 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004011 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004012 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004013 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004014 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004015 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4016 if options.json:
4017 write_json(options.json, {
4018 'issue': cl.GetIssue(),
4019 'issue_url': cl.GetIssueURL(),
4020 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004021 return 0
4022
4023
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004024@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004025def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004026 """Shows or posts review comments for any changelist."""
4027 parser.add_option('-a', '--add-comment', dest='comment',
4028 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004029 parser.add_option('-p', '--publish', action='store_true',
4030 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004031 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004032 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004033 parser.add_option('-m', '--machine-readable', dest='readable',
4034 action='store_false', default=True,
4035 help='output comments in a format compatible with '
4036 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004037 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004038 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004039 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004040 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004041
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004042 issue = None
4043 if options.issue:
4044 try:
4045 issue = int(options.issue)
4046 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004047 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004048
Edward Lemur934836a2019-09-09 20:16:54 +00004049 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004050
4051 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004052 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004053 return 0
4054
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004055 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4056 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004057 for comment in summary:
4058 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004059 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004060 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004061 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004062 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004063 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004064 elif comment.autogenerated:
4065 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004066 else:
4067 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004068 print('\n%s%s %s%s\n%s' % (
4069 color,
4070 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4071 comment.sender,
4072 Fore.RESET,
4073 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4074
smut@google.comc85ac942015-09-15 16:34:43 +00004075 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004076 def pre_serialize(c):
4077 dct = c.__dict__.copy()
4078 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4079 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004080 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004081 return 0
4082
4083
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004084@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004085@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004086def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004087 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004088 parser.add_option('-d', '--display', action='store_true',
4089 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004090 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004091 help='New description to set for this issue (- for stdin, '
4092 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004093 parser.add_option('-f', '--force', action='store_true',
4094 help='Delete any unpublished Gerrit edits for this issue '
4095 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004096
4097 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004098 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004099
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004100 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004101 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004102 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004103 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004104 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004105
Edward Lemur934836a2019-09-09 20:16:54 +00004106 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004107 if target_issue_arg:
4108 kwargs['issue'] = target_issue_arg.issue
4109 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004110
4111 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004112 if not cl.GetIssue():
4113 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004114
Edward Lemur678a6842019-10-03 22:25:05 +00004115 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004116 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004117
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004118 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004119
smut@google.com34fb6b12015-07-13 20:03:26 +00004120 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004121 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004122 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004123
4124 if options.new_description:
4125 text = options.new_description
4126 if text == '-':
4127 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004128 elif text == '+':
4129 base_branch = cl.GetCommonAncestorWithUpstream()
4130 change = cl.GetChange(base_branch, None, local_description=True)
4131 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004132
4133 description.set_description(text)
4134 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004135 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004136 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004137 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004138 return 0
4139
4140
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004141@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004142def CMDlint(parser, args):
4143 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004144 parser.add_option('--filter', action='append', metavar='-x,+y',
4145 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004146 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004147
4148 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004149 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004150 try:
4151 import cpplint
4152 import cpplint_chromium
4153 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004154 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004155 return 1
4156
4157 # Change the current working directory before calling lint so that it
4158 # shows the correct base.
4159 previous_cwd = os.getcwd()
4160 os.chdir(settings.GetRoot())
4161 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004162 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004163 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4164 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004165 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004167 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004168
4169 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004170 command = args + files
4171 if options.filter:
4172 command = ['--filter=' + ','.join(options.filter)] + command
4173 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004174
4175 white_regex = re.compile(settings.GetLintRegex())
4176 black_regex = re.compile(settings.GetLintIgnoreRegex())
4177 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4178 for filename in filenames:
4179 if white_regex.match(filename):
4180 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004182 else:
4183 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4184 extra_check_functions)
4185 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004186 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004187 finally:
4188 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004189 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004190 if cpplint._cpplint_state.error_count != 0:
4191 return 1
4192 return 0
4193
4194
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004195@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004197 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004198 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004199 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004200 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004201 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004202 parser.add_option('--all', action='store_true',
4203 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004204 parser.add_option('--parallel', action='store_true',
4205 help='Run all tests specified by input_api.RunTests in all '
4206 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004207 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004208
sbc@chromium.org71437c02015-04-09 19:29:40 +00004209 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004210 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004211 return 1
4212
Edward Lemur934836a2019-09-09 20:16:54 +00004213 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214 if args:
4215 base_branch = args[0]
4216 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004217 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004218 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219
Aaron Gable8076c282017-11-29 14:39:41 -08004220 if options.all:
4221 base_change = cl.GetChange(base_branch, None)
4222 files = [('M', f) for f in base_change.AllFiles()]
4223 change = presubmit_support.GitChange(
4224 base_change.Name(),
4225 base_change.FullDescriptionText(),
4226 base_change.RepositoryRoot(),
4227 files,
4228 base_change.issue,
4229 base_change.patchset,
4230 base_change.author_email,
4231 base_change._upstream)
4232 else:
4233 change = cl.GetChange(base_branch, None)
4234
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004235 cl.RunHook(
4236 committing=not options.upload,
4237 may_prompt=False,
4238 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004239 change=change,
4240 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004241 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004242
4243
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004244def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004245 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004246
4247 Works the same way as
4248 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4249 but can be called on demand on all platforms.
4250
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004251 The basic idea is to generate git hash of a state of the tree, original
4252 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004253 """
4254 lines = []
4255 tree_hash = RunGitSilent(['write-tree'])
4256 lines.append('tree %s' % tree_hash.strip())
4257 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4258 if code == 0:
4259 lines.append('parent %s' % parent.strip())
4260 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4261 lines.append('author %s' % author.strip())
4262 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4263 lines.append('committer %s' % committer.strip())
4264 lines.append('')
4265 # Note: Gerrit's commit-hook actually cleans message of some lines and
4266 # whitespace. This code is not doing this, but it clearly won't decrease
4267 # entropy.
4268 lines.append(message)
4269 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004270 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004271 return 'I%s' % change_hash.strip()
4272
4273
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004274def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004275 """Computes the remote branch ref to use for the CL.
4276
4277 Args:
4278 remote (str): The git remote for the CL.
4279 remote_branch (str): The git remote branch for the CL.
4280 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004281 """
4282 if not (remote and remote_branch):
4283 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004284
wittman@chromium.org455dc922015-01-26 20:15:50 +00004285 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004286 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004287 # refs, which are then translated into the remote full symbolic refs
4288 # below.
4289 if '/' not in target_branch:
4290 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4291 else:
4292 prefix_replacements = (
4293 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4294 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4295 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4296 )
4297 match = None
4298 for regex, replacement in prefix_replacements:
4299 match = re.search(regex, target_branch)
4300 if match:
4301 remote_branch = target_branch.replace(match.group(0), replacement)
4302 break
4303 if not match:
4304 # This is a branch path but not one we recognize; use as-is.
4305 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004306 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4307 # Handle the refs that need to land in different refs.
4308 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004309
wittman@chromium.org455dc922015-01-26 20:15:50 +00004310 # Create the true path to the remote branch.
4311 # Does the following translation:
4312 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4313 # * refs/remotes/origin/master -> refs/heads/master
4314 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4315 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4316 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4317 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4318 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4319 'refs/heads/')
4320 elif remote_branch.startswith('refs/remotes/branch-heads'):
4321 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004322
wittman@chromium.org455dc922015-01-26 20:15:50 +00004323 return remote_branch
4324
4325
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004326def cleanup_list(l):
4327 """Fixes a list so that comma separated items are put as individual items.
4328
4329 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4330 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4331 """
4332 items = sum((i.split(',') for i in l), [])
4333 stripped_items = (i.strip() for i in items)
4334 return sorted(filter(None, stripped_items))
4335
4336
Aaron Gable4db38df2017-11-03 14:59:07 -07004337@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004338@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004339def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004340 """Uploads the current changelist to codereview.
4341
4342 Can skip dependency patchset uploads for a branch by running:
4343 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004344 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004345 git config --unset branch.branch_name.skip-deps-uploads
4346 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004347
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004348 If the name of the checked out branch starts with "bug-" or "fix-" followed
4349 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004350 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004351
4352 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004353 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004354 [git-cl] add support for hashtags
4355 Foo bar: implement foo
4356 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004357 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004358 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4359 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004360 parser.add_option('--bypass-watchlists', action='store_true',
4361 dest='bypass_watchlists',
4362 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004363 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004364 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004365 parser.add_option('--message', '-m', dest='message',
4366 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004367 parser.add_option('-b', '--bug',
4368 help='pre-populate the bug number(s) for this issue. '
4369 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004370 parser.add_option('--message-file', dest='message_file',
4371 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004372 parser.add_option('--title', '-t', dest='title',
4373 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004374 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004375 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004376 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004377 parser.add_option('--tbrs',
4378 action='append', default=[],
4379 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004380 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004381 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004382 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004383 parser.add_option('--hashtag', dest='hashtags',
4384 action='append', default=[],
4385 help=('Gerrit hashtag for new CL; '
4386 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004387 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004388 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004389 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004390 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004391 metavar='TARGET',
4392 help='Apply CL to remote ref TARGET. ' +
4393 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004394 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004395 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004396 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004397 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004398 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004399 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004400 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4401 const='TBR', help='add a set of OWNERS to TBR')
4402 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4403 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004404 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004405 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004406 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004407 'implies --send-mail')
4408 parser.add_option('-d', '--cq-dry-run',
4409 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004410 help='Send the patchset to do a CQ dry run right after '
4411 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004412 parser.add_option('--preserve-tryjobs', action='store_true',
4413 help='instruct the CQ to let tryjobs running even after '
4414 'new patchsets are uploaded instead of canceling '
4415 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004416 parser.add_option('--dependencies', action='store_true',
4417 help='Uploads CLs of all the local branches that depend on '
4418 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004419 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4420 help='Sends your change to the CQ after an approval. Only '
4421 'works on repos that have the Auto-Submit label '
4422 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004423 parser.add_option('--parallel', action='store_true',
4424 help='Run all tests specified by input_api.RunTests in all '
4425 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004426 parser.add_option('--no-autocc', action='store_true',
4427 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004428 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004429 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004430 parser.add_option('-R', '--retry-failed', action='store_true',
4431 help='Retry failed tryjobs from old patchset immediately '
4432 'after uploading new patchset. Cannot be used with '
4433 '--use-commit-queue or --cq-dry-run.')
4434 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4435 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004436 parser.add_option('--fixed', '-x',
4437 help='List of bugs that will be commented on and marked '
4438 'fixed (pre-populates "Fixed:" tag). Same format as '
4439 '-b option / "Bug:" tag. If fixing several issues, '
4440 'separate with commas.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004441
rmistry@google.com2dd99862015-06-22 12:22:18 +00004442 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004443 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004444 (options, args) = parser.parse_args(args)
4445
sbc@chromium.org71437c02015-04-09 19:29:40 +00004446 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004447 return 1
4448
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004449 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004450 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004451 options.cc = cleanup_list(options.cc)
4452
tandriib80458a2016-06-23 12:20:07 -07004453 if options.message_file:
4454 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004455 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004456 options.message = gclient_utils.FileRead(options.message_file)
4457 options.message_file = None
4458
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004459 if ([options.cq_dry_run,
4460 options.use_commit_queue,
4461 options.retry_failed].count(True) > 1):
4462 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4463 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004464
Aaron Gableedbc4132017-09-11 13:22:28 -07004465 if options.use_commit_queue:
4466 options.send_mail = True
4467
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004468 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4469 settings.GetIsGerrit()
4470
Edward Lemur934836a2019-09-09 20:16:54 +00004471 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004472 if options.retry_failed and not cl.GetIssue():
4473 print('No previous patchsets, so --retry-failed has no effect.')
4474 options.retry_failed = False
4475 # cl.GetMostRecentPatchset uses cached information, and can return the last
4476 # patchset before upload. Calling it here makes it clear that it's the
4477 # last patchset before upload. Note that GetMostRecentPatchset will fail
4478 # if no CL has been uploaded yet.
4479 if options.retry_failed:
4480 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004481
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004482 ret = cl.CMDUpload(options, args, orig_args)
4483
4484 if options.retry_failed:
4485 if ret != 0:
4486 print('Upload failed, so --retry-failed has no effect.')
4487 return ret
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004488 builds, _ = _fetch_latest_builds(
Edward Lemur5b929a42019-10-21 17:57:39 +00004489 cl, options.buildbucket_host, latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004490 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004491 if len(buckets) == 0:
4492 print('No failed tryjobs, so --retry-failed has no effect.')
4493 return ret
Edward Lemur5b929a42019-10-21 17:57:39 +00004494 _trigger_try_jobs(cl, buckets, options, patchset + 1)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004495
4496 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004497
4498
Francois Dorayd42c6812017-05-30 15:10:20 -04004499@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004500@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004501def CMDsplit(parser, args):
4502 """Splits a branch into smaller branches and uploads CLs.
4503
4504 Creates a branch and uploads a CL for each group of files modified in the
4505 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004506 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004507 the shared OWNERS file.
4508 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004509 parser.add_option('-d', '--description', dest='description_file',
4510 help='A text file containing a CL description in which '
4511 '$directory will be replaced by each CL\'s directory.')
4512 parser.add_option('-c', '--comment', dest='comment_file',
4513 help='A text file containing a CL comment.')
4514 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004515 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004516 help='List the files and reviewers for each CL that would '
4517 'be created, but don\'t create branches or CLs.')
4518 parser.add_option('--cq-dry-run', action='store_true',
4519 help='If set, will do a cq dry run for each uploaded CL. '
4520 'Please be careful when doing this; more than ~10 CLs '
4521 'has the potential to overload our build '
4522 'infrastructure. Try to upload these not during high '
4523 'load times (usually 11-3 Mountain View time). Email '
4524 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004525 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4526 default=True,
4527 help='Sends your change to the CQ after an approval. Only '
4528 'works on repos that have the Auto-Submit label '
4529 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004530 options, _ = parser.parse_args(args)
4531
4532 if not options.description_file:
4533 parser.error('No --description flag specified.')
4534
4535 def WrappedCMDupload(args):
4536 return CMDupload(OptionParser(), args)
4537
4538 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004539 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004540 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004541
4542
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004543@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004544@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004546 """DEPRECATED: Used to commit the current changelist via git-svn."""
4547 message = ('git-cl no longer supports committing to SVN repositories via '
4548 'git-svn. You probably want to use `git cl land` instead.')
4549 print(message)
4550 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004551
4552
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004553@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004554@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004555def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004556 """Commits the current changelist via git.
4557
4558 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4559 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004560 """
4561 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4562 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004563 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004564 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004565 parser.add_option('--parallel', action='store_true',
4566 help='Run all tests specified by input_api.RunTests in all '
4567 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004568 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004569
Edward Lemur934836a2019-09-09 20:16:54 +00004570 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004571
Robert Iannucci2e73d432018-03-14 01:10:47 -07004572 if not cl.GetIssue():
4573 DieWithError('You must upload the change first to Gerrit.\n'
4574 ' If you would rather have `git cl land` upload '
4575 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004576 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004577 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004578
4579
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004580@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004581@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004582def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004583 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004584 parser.add_option('-b', dest='newbranch',
4585 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004586 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004587 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004588 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004589 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004590
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004591 group = optparse.OptionGroup(
4592 parser,
4593 'Options for continuing work on the current issue uploaded from a '
4594 'different clone (e.g. different machine). Must be used independently '
4595 'from the other options. No issue number should be specified, and the '
4596 'branch must have an issue number associated with it')
4597 group.add_option('--reapply', action='store_true', dest='reapply',
4598 help='Reset the branch and reapply the issue.\n'
4599 'CAUTION: This will undo any local changes in this '
4600 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004601
4602 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004603 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004604 parser.add_option_group(group)
4605
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004606 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004607 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004608
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004609 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004610 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004611 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004612 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004613 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004614
Edward Lemur934836a2019-09-09 20:16:54 +00004615 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004616 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004617 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004618
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004619 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004620 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004621 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004622
4623 RunGit(['reset', '--hard', upstream])
4624 if options.pull:
4625 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004626
Edward Lemur678a6842019-10-03 22:25:05 +00004627 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4628 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004629
4630 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004631 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004632
Edward Lemurf38bc172019-09-03 21:02:13 +00004633 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004634 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004635 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004636
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004637 # We don't want uncommitted changes mixed up with the patch.
4638 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004639 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004640
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004641 if options.newbranch:
4642 if options.force:
4643 RunGit(['branch', '-D', options.newbranch],
4644 stderr=subprocess2.PIPE, error_ok=True)
4645 RunGit(['new-branch', options.newbranch])
4646
Edward Lemur678a6842019-10-03 22:25:05 +00004647 cl = Changelist(
4648 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004649
Edward Lemur678a6842019-10-03 22:25:05 +00004650 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004651 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004652
Edward Lemurf38bc172019-09-03 21:02:13 +00004653 return cl.CMDPatchWithParsedIssue(
4654 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004655
4656
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004657def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004658 """Fetches the tree status and returns either 'open', 'closed',
4659 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004660 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004661 if url:
Edward Lemurd2a5a4c2019-10-23 22:55:26 +00004662 status = urllib2.urlopen(url).read().lower()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004663 if status.find('closed') != -1 or status == '0':
4664 return 'closed'
4665 elif status.find('open') != -1 or status == '1':
4666 return 'open'
4667 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004668 return 'unset'
4669
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004670
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004671def GetTreeStatusReason():
4672 """Fetches the tree status from a json url and returns the message
4673 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004674 url = settings.GetTreeStatusUrl()
4675 json_url = urlparse.urljoin(url, '/current?format=json')
Edward Lemurd2a5a4c2019-10-23 22:55:26 +00004676 connection = urllib2.urlopen(json_url)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004677 status = json.loads(connection.read())
4678 connection.close()
4679 return status['message']
4680
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004681
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004682@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004684 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004685 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004686 status = GetTreeStatus()
4687 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004688 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004689 return 2
4690
vapiera7fbd5a2016-06-16 09:17:49 -07004691 print('The tree is %s' % status)
4692 print()
4693 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004694 if status != 'open':
4695 return 1
4696 return 0
4697
4698
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004699@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004700def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004701 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4702 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004703 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004704 '-b', '--bot', action='append',
4705 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4706 'times to specify multiple builders. ex: '
4707 '"-b win_rel -b win_layout". See '
4708 'the try server waterfall for the builders name and the tests '
4709 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004710 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004711 '-B', '--bucket', default='',
4712 help=('Buildbucket bucket to send the try requests.'))
4713 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004714 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004715 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004716 'be determined by the try recipe that builder runs, which usually '
4717 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004718 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004719 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004720 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004721 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004722 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004723 '--category', default='git_cl_try', help='Specify custom build category.')
4724 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004725 '--project',
4726 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004727 'in recipe to determine to which repository or directory to '
4728 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004729 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004730 '-p', '--property', dest='properties', action='append', default=[],
4731 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004732 'key2=value2 etc. The value will be treated as '
4733 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004734 'NOTE: using this may make your tryjob not usable for CQ, '
4735 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004736 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004737 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4738 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004739 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004740 parser.add_option(
4741 '-R', '--retry-failed', action='store_true', default=False,
4742 help='Retry failed jobs from the latest set of tryjobs. '
4743 'Not allowed with --bucket and --bot options.')
Koji Ishii31c14782018-01-08 17:17:33 +09004744 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004745 options, args = parser.parse_args(args)
4746
machenbach@chromium.org45453142015-09-15 08:45:22 +00004747 # Make sure that all properties are prop=value pairs.
4748 bad_params = [x for x in options.properties if '=' not in x]
4749 if bad_params:
4750 parser.error('Got properties with missing "=": %s' % bad_params)
4751
maruel@chromium.org15192402012-09-06 12:38:29 +00004752 if args:
4753 parser.error('Unknown arguments: %s' % args)
4754
Edward Lemur934836a2019-09-09 20:16:54 +00004755 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004756 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004757 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004758
Edward Lemurf38bc172019-09-03 21:02:13 +00004759 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004760 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004761
tandriie113dfd2016-10-11 10:20:12 -07004762 error_message = cl.CannotTriggerTryJobReason()
4763 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004764 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004765
Quinten Yearsley983111f2019-09-26 17:18:48 +00004766 if options.retry_failed:
4767 if options.bot or options.bucket:
4768 print('ERROR: The option --retry-failed is not compatible with '
4769 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4770 return 1
4771 print('Searching for failed tryjobs...')
Edward Lemur5b929a42019-10-21 17:57:39 +00004772 builds, patchset = _fetch_latest_builds(cl, options.buildbucket_host)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004773 if options.verbose:
4774 print('Got %d builds in patchset #%d' % (len(builds), patchset))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004775 buckets = _filter_failed_for_retry(builds)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004776 if not buckets:
4777 print('There are no failed jobs in the latest set of jobs '
4778 '(patchset #%d), doing nothing.' % patchset)
4779 return 0
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004780 num_builders = sum(map(len, buckets.values()))
Quinten Yearsley983111f2019-09-26 17:18:48 +00004781 if num_builders > 10:
4782 confirm_or_exit('There are %d builders with failed builds.'
4783 % num_builders, action='continue')
4784 else:
4785 buckets = _get_bucket_map(cl, options, parser)
4786 if buckets and any(b.startswith('master.') for b in buckets):
4787 print('ERROR: Buildbot masters are not supported.')
4788 return 1
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004789
qyearsleydd49f942016-10-28 11:57:22 -07004790 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4791 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004792 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004793 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07004794 print('git cl try with no bots now defaults to CQ dry run.')
4795 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
4796 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00004797
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00004798 for builders in buckets.values():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004799 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004800 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004801 'of bot requires an initial job from a parent (usually a builder). '
4802 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004803 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004804 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004805
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004806 patchset = cl.GetMostRecentPatchset()
Edward Lemur2c210a42019-09-16 23:58:35 +00004807 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004808 _trigger_try_jobs(cl, buckets, options, patchset)
Edward Lemur2c210a42019-09-16 23:58:35 +00004809 except BuildbucketResponseException as ex:
4810 print('ERROR: %s' % ex)
4811 return 1
4812 return 0
maruel@chromium.org15192402012-09-06 12:38:29 +00004813
4814
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004815@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004816def CMDtry_results(parser, args):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00004817 """Prints info about results for tryjobs associated with the current CL."""
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004818 group = optparse.OptionGroup(parser, 'Tryjob results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004819 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004820 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004821 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004822 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004823 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004824 '--color', action='store_true', default=setup_color.IS_TTY,
4825 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004826 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004827 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4828 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004829 group.add_option(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004830 '--json', help=('Path of JSON output file to write tryjob results to,'
Stefan Zager1306bd02017-06-22 19:26:46 -07004831 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004832 parser.add_option_group(group)
Stefan Zager27db3f22017-10-10 15:15:01 -07004833 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004834 options, args = parser.parse_args(args)
4835 if args:
4836 parser.error('Unrecognized args: %s' % ' '.join(args))
4837
Edward Lemur934836a2019-09-09 20:16:54 +00004838 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004839 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004840 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004841
tandrii221ab252016-10-06 08:12:04 -07004842 patchset = options.patchset
4843 if not patchset:
4844 patchset = cl.GetMostRecentPatchset()
4845 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004846 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004847 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004848 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004849 cl.GetIssue())
4850
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004851 try:
Edward Lemur5b929a42019-10-21 17:57:39 +00004852 jobs = fetch_try_jobs(cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004853 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004854 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004855 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004856 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004857 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004858 else:
4859 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004860 return 0
4861
4862
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004863@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004864@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004865def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004866 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004867 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004868 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004869 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004870
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004871 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004872 if args:
4873 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004874 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004875 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004876 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004877 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004878
4879 # Clear configured merge-base, if there is one.
4880 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004881 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004882 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004883 return 0
4884
4885
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004886@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004887def CMDweb(parser, args):
4888 """Opens the current CL in the web browser."""
4889 _, args = parser.parse_args(args)
4890 if args:
4891 parser.error('Unrecognized args: %s' % ' '.join(args))
4892
4893 issue_url = Changelist().GetIssueURL()
4894 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004895 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004896 return 1
4897
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004898 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004899 # allows us to hide the "Created new window in existing browser session."
4900 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004901 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004902 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004903 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004904 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004905 os.open(os.devnull, os.O_RDWR)
4906 try:
4907 webbrowser.open(issue_url)
4908 finally:
4909 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004910 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004911 return 0
4912
4913
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004914@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004915def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004916 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004917 parser.add_option('-d', '--dry-run', action='store_true',
4918 help='trigger in dry run mode')
4919 parser.add_option('-c', '--clear', action='store_true',
4920 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004921 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004922 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004923 if args:
4924 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004925 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004926 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004927
Edward Lemur934836a2019-09-09 20:16:54 +00004928 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004929 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004930 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004931 elif options.dry_run:
4932 state = _CQState.DRY_RUN
4933 else:
4934 state = _CQState.COMMIT
4935 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004936 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004937 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004938 return 0
4939
4940
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004941@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004942def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004943 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004944 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004945 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004946 if args:
4947 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004948 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004949 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004950 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004951 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004952 cl.CloseIssue()
4953 return 0
4954
4955
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004956@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004957def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004958 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004959 parser.add_option(
4960 '--stat',
4961 action='store_true',
4962 dest='stat',
4963 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004964 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004965 if args:
4966 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004967
Edward Lemur934836a2019-09-09 20:16:54 +00004968 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004969 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004970 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004971 if not issue:
4972 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004973
Aaron Gablea718c3e2017-08-28 17:47:28 -07004974 base = cl._GitGetBranchConfigValue('last-upload-hash')
4975 if not base:
4976 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4977 if not base:
4978 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4979 revision_info = detail['revisions'][detail['current_revision']]
4980 fetch_info = revision_info['fetch']['http']
4981 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4982 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004983
Aaron Gablea718c3e2017-08-28 17:47:28 -07004984 cmd = ['git', 'diff']
4985 if options.stat:
4986 cmd.append('--stat')
4987 cmd.append(base)
4988 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004989
4990 return 0
4991
4992
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004993@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004994def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004995 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004996 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004997 '--ignore-current',
4998 action='store_true',
4999 help='Ignore the CL\'s current reviewers and start from scratch.')
5000 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005001 '--ignore-self',
5002 action='store_true',
5003 help='Do not consider CL\'s author as an owners.')
5004 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005005 '--no-color',
5006 action='store_true',
5007 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005008 parser.add_option(
5009 '--batch',
5010 action='store_true',
5011 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005012 # TODO: Consider moving this to another command, since other
5013 # git-cl owners commands deal with owners for a given CL.
5014 parser.add_option(
5015 '--show-all',
5016 action='store_true',
5017 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005018 options, args = parser.parse_args(args)
5019
5020 author = RunGit(['config', 'user.email']).strip() or None
5021
Edward Lemur934836a2019-09-09 20:16:54 +00005022 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005023
Yang Guo6e269a02019-06-26 11:17:02 +00005024 if options.show_all:
5025 for arg in args:
5026 base_branch = cl.GetCommonAncestorWithUpstream()
5027 change = cl.GetChange(base_branch, None)
5028 database = owners.Database(change.RepositoryRoot(), file, os.path)
5029 database.load_data_needed_for([arg])
5030 print('Owners for %s:' % arg)
5031 for owner in sorted(database.all_possible_owners([arg], None)):
5032 print(' - %s' % owner)
5033 return 0
5034
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005035 if args:
5036 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005037 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005038 base_branch = args[0]
5039 else:
5040 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005041 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005042
5043 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005044 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5045
5046 if options.batch:
5047 db = owners.Database(change.RepositoryRoot(), file, os.path)
5048 print('\n'.join(db.reviewers_for(affected_files, author)))
5049 return 0
5050
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005051 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005052 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005053 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005054 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005055 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005056 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005057 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005058 override_files=change.OriginalOwnersFiles(),
5059 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005060
5061
Aiden Bennerc08566e2018-10-03 17:52:42 +00005062def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005063 """Generates a diff command."""
5064 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005065 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5066
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005067 if allow_prefix:
5068 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5069 # case that diff.noprefix is set in the user's git config.
5070 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5071 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005072 diff_cmd += ['--no-prefix']
5073
5074 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005075
5076 if args:
5077 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005078 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005079 diff_cmd.append(arg)
5080 else:
5081 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005082
5083 return diff_cmd
5084
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005085
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005086def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005087 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005088 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005089
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005090
enne@chromium.org555cfe42014-01-29 18:21:39 +00005091@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005092@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005093def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005094 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005095 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005096 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005097 parser.add_option('--full', action='store_true',
5098 help='Reformat the full content of all touched files')
5099 parser.add_option('--dry-run', action='store_true',
5100 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005101 parser.add_option(
5102 '--python',
5103 action='store_true',
5104 default=None,
5105 help='Enables python formatting on all python files.')
5106 parser.add_option(
5107 '--no-python',
5108 action='store_true',
5109 dest='python',
5110 help='Disables python formatting on all python files. '
5111 'Takes precedence over --python. '
5112 'If neither --python or --no-python are set, python '
5113 'files that have a .style.yapf file in an ancestor '
5114 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005115 parser.add_option('--js', action='store_true',
5116 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005117 parser.add_option('--diff', action='store_true',
5118 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005119 parser.add_option('--presubmit', action='store_true',
5120 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005121 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005122
Daniel Chengc55eecf2016-12-30 03:11:02 -08005123 # Normalize any remaining args against the current path, so paths relative to
5124 # the current directory are still resolved as expected.
5125 args = [os.path.join(os.getcwd(), arg) for arg in args]
5126
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005127 # git diff generates paths against the root of the repository. Change
5128 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005129 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005130 if rel_base_path:
5131 os.chdir(rel_base_path)
5132
digit@chromium.org29e47272013-05-17 17:01:46 +00005133 # Grab the merge-base commit, i.e. the upstream commit of the current
5134 # branch when it was created or the last time it was rebased. This is
5135 # to cover the case where the user may have called "git fetch origin",
5136 # moving the origin branch to a newer commit, but hasn't rebased yet.
5137 upstream_commit = None
5138 cl = Changelist()
5139 upstream_branch = cl.GetUpstreamBranch()
5140 if upstream_branch:
5141 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5142 upstream_commit = upstream_commit.strip()
5143
5144 if not upstream_commit:
5145 DieWithError('Could not find base commit for this branch. '
5146 'Are you in detached state?')
5147
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005148 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5149 diff_output = RunGit(changed_files_cmd)
5150 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005151 # Filter out files deleted by this CL
5152 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005153
Christopher Lamc5ba6922017-01-24 11:19:14 +11005154 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005155 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005156
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005157 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5158 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5159 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005160 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005161
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005162 top_dir = os.path.normpath(
5163 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5164
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005165 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5166 # formatted. This is used to block during the presubmit.
5167 return_value = 0
5168
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005169 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005170 # Locate the clang-format binary in the checkout
5171 try:
5172 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005173 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005174 DieWithError(e)
5175
Jamie Madilldc4d19e2019-10-24 21:50:02 +00005176 if opts.full or settings.GetFormatFullByDefault():
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005177 cmd = [clang_format_tool]
5178 if not opts.dry_run and not opts.diff:
5179 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005180 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005181 if opts.diff:
5182 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005183 else:
5184 env = os.environ.copy()
5185 env['PATH'] = str(os.path.dirname(clang_format_tool))
5186 try:
5187 script = clang_format.FindClangFormatScriptInChromiumTree(
5188 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005189 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005190 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005191
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005192 cmd = [sys.executable, script, '-p0']
5193 if not opts.dry_run and not opts.diff:
5194 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005195
Jamie Madill3671a6a2019-10-24 15:13:21 +00005196 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005197 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005198
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005199 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5200 if opts.diff:
5201 sys.stdout.write(stdout)
5202 if opts.dry_run and len(stdout) > 0:
5203 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005204
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005205 # Similar code to above, but using yapf on .py files rather than clang-format
5206 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005207 py_explicitly_disabled = opts.python is not None and not opts.python
5208 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005209 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5210 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5211 if sys.platform.startswith('win'):
5212 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005213
Aiden Bennerc08566e2018-10-03 17:52:42 +00005214 # If we couldn't find a yapf file we'll default to the chromium style
5215 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005216 chromium_default_yapf_style = os.path.join(depot_tools_path,
5217 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005218 # Used for caching.
5219 yapf_configs = {}
5220 for f in python_diff_files:
5221 # Find the yapf style config for the current file, defaults to depot
5222 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005223 _FindYapfConfigFile(f, yapf_configs, top_dir)
5224
5225 # Turn on python formatting by default if a yapf config is specified.
5226 # This breaks in the case of this repo though since the specified
5227 # style file is also the global default.
5228 if opts.python is None:
5229 filtered_py_files = []
5230 for f in python_diff_files:
5231 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5232 filtered_py_files.append(f)
5233 else:
5234 filtered_py_files = python_diff_files
5235
5236 # Note: yapf still seems to fix indentation of the entire file
5237 # even if line ranges are specified.
5238 # See https://github.com/google/yapf/issues/499
5239 if not opts.full and filtered_py_files:
5240 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5241
Brian Sheedy59b06a82019-10-14 17:03:29 +00005242 ignored_yapf_files = _GetYapfIgnoreFilepaths(top_dir)
5243
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005244 for f in filtered_py_files:
Brian Sheedy59b06a82019-10-14 17:03:29 +00005245 if f in ignored_yapf_files:
5246 continue
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005247 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5248 if yapf_config is None:
5249 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005250
5251 cmd = [yapf_tool, '--style', yapf_config, f]
5252
5253 has_formattable_lines = False
5254 if not opts.full:
5255 # Only run yapf over changed line ranges.
5256 for diff_start, diff_len in py_line_diffs[f]:
5257 diff_end = diff_start + diff_len - 1
5258 # Yapf errors out if diff_end < diff_start but this
5259 # is a valid line range diff for a removal.
5260 if diff_end >= diff_start:
5261 has_formattable_lines = True
5262 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5263 # If all line diffs were removals we have nothing to format.
5264 if not has_formattable_lines:
5265 continue
5266
5267 if opts.diff or opts.dry_run:
5268 cmd += ['--diff']
5269 # Will return non-zero exit code if non-empty diff.
5270 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5271 if opts.diff:
5272 sys.stdout.write(stdout)
5273 elif len(stdout) > 0:
5274 return_value = 2
5275 else:
5276 cmd += ['-i']
5277 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005278
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005279 # Dart's formatter does not have the nice property of only operating on
5280 # modified chunks, so hard code full.
5281 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005282 try:
5283 command = [dart_format.FindDartFmtToolInChromiumTree()]
5284 if not opts.dry_run and not opts.diff:
5285 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005286 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005287
ppi@chromium.org6593d932016-03-03 15:41:15 +00005288 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005289 if opts.dry_run and stdout:
5290 return_value = 2
5291 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005292 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5293 'found in this checkout. Files in other languages are still '
5294 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005295
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005296 # Format GN build files. Always run on full build files for canonical form.
5297 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005298 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005299 if opts.dry_run or opts.diff:
5300 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005301 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005302 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5303 shell=sys.platform == 'win32',
5304 cwd=top_dir)
5305 if opts.dry_run and gn_ret == 2:
5306 return_value = 2 # Not formatted.
5307 elif opts.diff and gn_ret == 2:
5308 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005309 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005310 elif gn_ret != 0:
5311 # For non-dry run cases (and non-2 return values for dry-run), a
5312 # nonzero error code indicates a failure, probably because the file
5313 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005314 DieWithError('gn format failed on ' + gn_diff_file +
5315 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005316
Ilya Shermane081cbe2017-08-15 17:51:04 -07005317 # Skip the metrics formatting from the global presubmit hook. These files have
5318 # a separate presubmit hook that issues an error if the files need formatting,
5319 # whereas the top-level presubmit script merely issues a warning. Formatting
5320 # these files is somewhat slow, so it's important not to duplicate the work.
5321 if not opts.presubmit:
5322 for xml_dir in GetDirtyMetricsDirs(diff_files):
5323 tool_dir = os.path.join(top_dir, xml_dir)
5324 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5325 if opts.dry_run or opts.diff:
5326 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005327 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005328 if opts.diff:
5329 sys.stdout.write(stdout)
5330 if opts.dry_run and stdout:
5331 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005332
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005333 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005334
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005335
Steven Holte2e664bf2017-04-21 13:10:47 -07005336def GetDirtyMetricsDirs(diff_files):
5337 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5338 metrics_xml_dirs = [
5339 os.path.join('tools', 'metrics', 'actions'),
5340 os.path.join('tools', 'metrics', 'histograms'),
5341 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005342 os.path.join('tools', 'metrics', 'ukm'),
5343 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005344 for xml_dir in metrics_xml_dirs:
5345 if any(file.startswith(xml_dir) for file in xml_diff_files):
5346 yield xml_dir
5347
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005348
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005349@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005350@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005351def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005352 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005353 _, args = parser.parse_args(args)
5354
5355 if len(args) != 1:
5356 parser.print_help()
5357 return 1
5358
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005359 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005360 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005361 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005362
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005363 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005364
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005365 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005366 output = RunGit(['config', '--local', '--get-regexp',
5367 r'branch\..*\.%s' % issueprefix],
5368 error_ok=True)
5369 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005370 if issue == target_issue:
5371 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005372
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005373 branches = []
5374 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005375 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005376 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005377 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005378 return 1
5379 if len(branches) == 1:
5380 RunGit(['checkout', branches[0]])
5381 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005382 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005383 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005384 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005385 which = raw_input('Choose by index: ')
5386 try:
5387 RunGit(['checkout', branches[int(which)]])
5388 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005389 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005390 return 1
5391
5392 return 0
5393
5394
maruel@chromium.org29404b52014-09-08 22:58:00 +00005395def CMDlol(parser, args):
5396 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005397 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005398 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5399 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5400 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005401 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005402 return 0
5403
5404
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005405class OptionParser(optparse.OptionParser):
5406 """Creates the option parse and add --verbose support."""
5407 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005408 optparse.OptionParser.__init__(
5409 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005410 self.add_option(
5411 '-v', '--verbose', action='count', default=0,
5412 help='Use 2 times for more debugging info')
5413
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005414 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005415 try:
5416 return self._parse_args(args)
5417 finally:
5418 # Regardless of success or failure of args parsing, we want to report
5419 # metrics, but only after logging has been initialized (if parsing
5420 # succeeded).
5421 global settings
5422 settings = Settings()
5423
5424 if not metrics.DISABLE_METRICS_COLLECTION:
5425 # GetViewVCUrl ultimately calls logging method.
5426 project_url = settings.GetViewVCUrl().strip('/+')
5427 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5428 metrics.collector.add('project_urls', [project_url])
5429
5430 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005431 # Create an optparse.Values object that will store only the actual passed
5432 # options, without the defaults.
5433 actual_options = optparse.Values()
5434 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5435 # Create an optparse.Values object with the default options.
5436 options = optparse.Values(self.get_default_values().__dict__)
5437 # Update it with the options passed by the user.
5438 options._update_careful(actual_options.__dict__)
5439 # Store the options passed by the user in an _actual_options attribute.
5440 # We store only the keys, and not the values, since the values can contain
5441 # arbitrary information, which might be PII.
5442 metrics.collector.add('arguments', actual_options.__dict__.keys())
5443
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005444 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005445 logging.basicConfig(
5446 level=levels[min(options.verbose, len(levels) - 1)],
5447 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5448 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005449
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005450 return options, args
5451
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005452
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005453def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005454 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005455 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005456 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005457 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005458
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005459 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005460 dispatcher = subcommand.CommandDispatcher(__name__)
5461 try:
5462 return dispatcher.execute(OptionParser(), argv)
Edward Lemur5b929a42019-10-21 17:57:39 +00005463 except auth.LoginRequiredError as e:
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005464 DieWithError(str(e))
Edward Lemurd2a5a4c2019-10-23 22:55:26 +00005465 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005466 if e.code != 500:
5467 raise
5468 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005469 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005470 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005471 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005472
5473
5474if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005475 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5476 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005477 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005478 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005479 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005480 sys.exit(main(sys.argv[1:]))