blob: 285e271163aa9e8dfde58dece00bdf4410cc7c94 [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
sheyang@google.com6ebaf782015-05-12 19:17:54 +000018import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010019import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000020import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000022import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import optparse
24import os
25import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010026import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000027import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070029import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
Edward Lemurfec80c42018-11-01 23:14:14 +000031import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000039from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000040from third_party import httplib2
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
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800446def _trigger_try_jobs(auth_config, 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:
Aaron Gablefb28d482018-04-02 13:08:06 -0700450 auth_config: AuthConfig for Buildbucket.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000451 changelist: Changelist that the tryjobs are associated with.
qyearsley1fdfcb62016-10-24 13:22:03 -0700452 buckets: A nested dict mapping bucket names to builders to tests.
453 options: Command-line options.
454 """
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000455 print('Scheduling jobs on:')
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000456 for bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000457 print('Bucket:', bucket)
458 print('\n'.join(
459 ' %s: %s' % (builder, tests)
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000460 for builder, tests in sorted(builders_and_tests.items())))
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000461 print('To see results here, run: git cl try-results')
462 print('To see results in browser, run: git cl web')
tandriide281ae2016-10-12 06:02:30 -0700463
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000464 requests = _make_try_job_schedule_requests(
465 changelist, buckets, options, patchset)
466 if not requests:
467 return
468
Edward Lemurb4a587d2019-10-09 23:56:38 +0000469 http = auth.get_authenticator(auth_config).authorize(httplib2.Http())
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000470 http.force_exception_to_status_code = True
471
472 batch_request = {'requests': requests}
473 batch_response = _call_buildbucket(
474 http, options.buildbucket_host, 'Batch', batch_request)
475
476 errors = [
477 ' ' + response['error']['message']
478 for response in batch_response.get('responses', [])
479 if 'error' in response
480 ]
481 if errors:
482 raise BuildbucketResponseException(
483 'Failed to schedule builds for some bots:\n%s' % '\n'.join(errors))
484
485
486def _make_try_job_schedule_requests(changelist, buckets, options, patchset):
Edward Lemurf0faf482019-09-25 20:40:17 +0000487 gerrit_changes = [changelist.GetGerritChange(patchset)]
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000488 shared_properties = {'category': getattr(options, 'category', 'git_cl_try')}
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000489 if getattr(options, 'clobber', False):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000490 shared_properties['clobber'] = True
491 shared_properties.update(_get_properties_from_options(options) or {})
492
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000493 shared_tags = [{'key': 'user_agent', 'value': 'git_cl_try'}]
494 if options.retry_failed:
495 shared_tags.append({'key': 'retry_failed',
496 'value': '1'})
497
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000498 requests = []
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000499 for raw_bucket, builders_and_tests in sorted(buckets.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000500 project, bucket = _parse_bucket(raw_bucket)
501 if not project or not bucket:
502 print('WARNING Could not parse bucket "%s". Skipping.' % raw_bucket)
503 continue
504
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +0000505 for builder, tests in sorted(builders_and_tests.items()):
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000506 properties = shared_properties.copy()
507 if 'presubmit' in builder.lower():
508 properties['dry_run'] = 'true'
509 if tests:
510 properties['testfilter'] = tests
511
512 requests.append({
513 'scheduleBuild': {
514 'requestId': str(uuid.uuid4()),
515 'builder': {
Quinten Yearsleya19d3532019-09-30 21:54:39 +0000516 'project': getattr(options, 'project', None) or project,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000517 'bucket': bucket,
518 'builder': builder,
519 },
520 'gerritChanges': gerrit_changes,
521 'properties': properties,
522 'tags': [
523 {'key': 'builder', 'value': builder},
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000524 ] + shared_tags,
Edward Lemurd4d1ba42019-09-20 21:46:37 +0000525 }
526 })
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +0000527 return requests
kjellander@chromium.org44424542015-06-02 18:35:29 +0000528
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000529
tandrii221ab252016-10-06 08:12:04 -0700530def fetch_try_jobs(auth_config, changelist, buildbucket_host,
531 patchset=None):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000532 """Fetches tryjobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000534 Returns list of buildbucket.v2.Build with the try jobs for the changelist.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000536 fields = ['id', 'builder', 'status', 'createTime', 'tags']
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000537 request = {
538 'predicate': {
539 'gerritChanges': [changelist.GetGerritChange(patchset)],
540 },
541 'fields': ','.join('builds.*.' + field for field in fields),
542 }
tandrii221ab252016-10-06 08:12:04 -0700543
Edward Lemurb4a587d2019-10-09 23:56:38 +0000544 authenticator = auth.get_authenticator(auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 if authenticator.has_cached_credentials():
546 http = authenticator.authorize(httplib2.Http())
547 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700548 print('Warning: Some results might be missing because %s' %
549 # Get the message on how to login.
Edward Lemurba5bc992019-09-23 22:59:17 +0000550 (auth.LoginRequiredError().message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 http = httplib2.Http()
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 http.force_exception_to_status_code = True
553
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000554 response = _call_buildbucket(http, buildbucket_host, 'SearchBuilds', request)
555 return response.get('builds', [])
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000557def _fetch_latest_builds(
558 auth_config, changelist, buildbucket_host, latest_patchset=None):
Quinten Yearsley983111f2019-09-26 17:18:48 +0000559 """Fetches builds from the latest patchset that has builds (within
560 the last few patchsets).
561
562 Args:
563 auth_config (auth.AuthConfig): Auth info for Buildbucket
564 changelist (Changelist): The CL to fetch builds for
565 buildbucket_host (str): Buildbucket host, e.g. "cr-buildbucket.appspot.com"
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000566 lastest_patchset(int|NoneType): the patchset to start fetching builds from.
567 If None (default), starts with the latest available patchset.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000568 Returns:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000569 A tuple (builds, patchset) where builds is a list of buildbucket.v2.Build,
570 and patchset is the patchset number where those builds came from.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000571 """
572 assert buildbucket_host
573 assert changelist.GetIssue(), 'CL must be uploaded first'
574 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +0000575 if latest_patchset is None:
576 assert changelist.GetMostRecentPatchset()
577 ps = changelist.GetMostRecentPatchset()
578 else:
579 assert latest_patchset > 0, latest_patchset
580 ps = latest_patchset
581
Quinten Yearsley983111f2019-09-26 17:18:48 +0000582 min_ps = max(1, ps - 5)
583 while ps >= min_ps:
584 builds = fetch_try_jobs(
585 auth_config, changelist, buildbucket_host, patchset=ps)
586 if len(builds):
587 return builds, ps
588 ps -= 1
589 return [], 0
590
591
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000592def _filter_failed_for_retry(all_builds):
593 """Returns a list of buckets/builders that are worth retrying.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000594
595 Args:
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000596 all_builds (list): Builds, in the format returned by fetch_try_jobs,
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000597 i.e. a list of buildbucket.v2.Builds which includes status and builder
598 info.
Quinten Yearsley983111f2019-09-26 17:18:48 +0000599
600 Returns:
601 A dict of bucket to builder to tests (empty list). This is the same format
602 accepted by _trigger_try_jobs and returned by _get_bucket_map.
603 """
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +0000604
605 def _builder_of(build):
606 builder = build['builder']
607 return (builder['project'], builder['bucket'], builder['builder'])
608
609 res = collections.defaultdict(dict)
610 ordered = sorted(all_builds, key=lambda b: (_builder_of(b), b['createTime']))
611 for (proj, buck, bldr), builds in itertools.groupby(ordered, key=_builder_of):
612 # If builder had several builds, retry only if the last one failed.
613 # This is a bit different from CQ, which would re-use *any* SUCCESS-full
614 # build, but in case of retrying failed jobs retrying a flaky one makes
615 # sense.
616 builds = list(builds)
617 if builds[-1]['status'] not in ('FAILURE', 'INFRA_FAILURE'):
618 continue
619 if any(t['key'] == 'cq_experimental' and t['value'] == 'true'
620 for t in builds[-1]['tags']):
621 # Don't retry experimental build previously triggered by CQ.
622 continue
623 if any(b['status'] in ('STARTED', 'SCHEDULED') for b in builds):
624 # Don't retry if any are running.
625 continue
626 res[proj + '/' + buck][bldr] = []
627 return res
Quinten Yearsley983111f2019-09-26 17:18:48 +0000628
629
qyearsleyeab3c042016-08-24 09:18:28 -0700630def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 """Prints nicely result of fetch_try_jobs."""
632 if not builds:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000633 print('No tryjobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000634 return
635
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000636 longest_builder = max(len(b['builder']['builder']) for b in builds)
637 name_fmt = '{builder:<%d}' % longest_builder
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638 if options.print_master:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000639 longest_bucket = max(len(b['builder']['bucket']) for b in builds)
640 name_fmt = ('{bucket:>%d} ' % longest_bucket) + name_fmt
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000641
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000642 builds_by_status = {}
643 for b in builds:
644 builds_by_status.setdefault(b['status'], []).append({
645 'id': b['id'],
646 'name': name_fmt.format(
647 builder=b['builder']['builder'], bucket=b['builder']['bucket']),
648 })
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000650 sort_key = lambda b: (b['name'], b['id'])
651
652 def print_builds(title, builds, fmt=None, color=None):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000653 """Pop matching builds from `builds` dict and print them."""
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000654 if not builds:
655 return
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000656
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000657 fmt = fmt or '{name} https://ci.chromium.org/b/{id}'
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000658 if not options.color or color is None:
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000659 colorize = lambda x: x
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 else:
661 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
662
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000663 print(colorize(title))
664 for b in sorted(builds, key=sort_key):
665 print(' ', colorize(fmt.format(**b)))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000666
667 total = len(builds)
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000668 print_builds(
669 'Successes:', builds_by_status.pop('SUCCESS', []), color=Fore.GREEN)
670 print_builds(
671 'Infra Failures:', builds_by_status.pop('INFRA_FAILURE', []),
672 color=Fore.MAGENTA)
673 print_builds('Failures:', builds_by_status.pop('FAILURE', []), color=Fore.RED)
674 print_builds('Canceled:', builds_by_status.pop('CANCELED', []), fmt='{name}',
675 color=Fore.MAGENTA)
676 print_builds('Started:', builds_by_status.pop('STARTED', []))
677 print_builds(
678 'Scheduled:', builds_by_status.pop('SCHEDULED', []), fmt='{name} id={id}')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000679 # The last section is just in case buildbucket API changes OR there is a bug.
Edward Lemurbaaf6be2019-10-09 18:00:44 +0000680 print_builds(
681 'Other:', sum(builds_by_status.values(), []), fmt='{name} id={id}')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000682 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000683
684
Aiden Bennerc08566e2018-10-03 17:52:42 +0000685def _ComputeDiffLineRanges(files, upstream_commit):
686 """Gets the changed line ranges for each file since upstream_commit.
687
688 Parses a git diff on provided files and returns a dict that maps a file name
689 to an ordered list of range tuples in the form (start_line, count).
690 Ranges are in the same format as a git diff.
691 """
692 # If files is empty then diff_output will be a full diff.
693 if len(files) == 0:
694 return {}
695
Aiden Benner6c18a1a2018-11-23 20:18:23 +0000696 # Take the git diff and find the line ranges where there are changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000697 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
698 diff_output = RunGit(diff_cmd)
699
700 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
701 # 2 capture groups
702 # 0 == fname of diff file
703 # 1 == 'diff_start,diff_count' or 'diff_start'
704 # will match each of
705 # diff --git a/foo.foo b/foo.py
706 # @@ -12,2 +14,3 @@
707 # @@ -12,2 +17 @@
708 # running re.findall on the above string with pattern will give
709 # [('foo.py', ''), ('', '14,3'), ('', '17')]
710
711 curr_file = None
712 line_diffs = {}
713 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
714 if match[0] != '':
715 # Will match the second filename in diff --git a/a.py b/b.py.
716 curr_file = match[0]
717 line_diffs[curr_file] = []
718 else:
719 # Matches +14,3
720 if ',' in match[1]:
721 diff_start, diff_count = match[1].split(',')
722 else:
723 # Single line changes are of the form +12 instead of +12,1.
724 diff_start = match[1]
725 diff_count = 1
726
727 diff_start = int(diff_start)
728 diff_count = int(diff_count)
729
730 # If diff_count == 0 this is a removal we can ignore.
731 line_diffs[curr_file].append((diff_start, diff_count))
732
733 return line_diffs
734
735
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000736def _FindYapfConfigFile(fpath, yapf_config_cache, top_dir=None):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000737 """Checks if a yapf file is in any parent directory of fpath until top_dir.
738
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000739 Recursively checks parent directories to find yapf file and if no yapf file
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000740 is found returns None. Uses yapf_config_cache as a cache for previously found
741 configs.
Aiden Bennerc08566e2018-10-03 17:52:42 +0000742 """
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000743 fpath = os.path.abspath(fpath)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000744 # Return result if we've already computed it.
745 if fpath in yapf_config_cache:
746 return yapf_config_cache[fpath]
747
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000748 parent_dir = os.path.dirname(fpath)
749 if os.path.isfile(fpath):
750 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000751 else:
Aiden Benner99b0ccb2018-11-20 19:53:31 +0000752 # Otherwise fpath is a directory
753 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
754 if os.path.isfile(yapf_file):
755 ret = yapf_file
756 elif fpath == top_dir or parent_dir == fpath:
757 # If we're at the top level directory, or if we're at root
758 # there is no provided style.
759 ret = None
760 else:
761 # Otherwise recurse on the current directory.
762 ret = _FindYapfConfigFile(parent_dir, yapf_config_cache, top_dir)
Aiden Bennerc08566e2018-10-03 17:52:42 +0000763 yapf_config_cache[fpath] = ret
764 return ret
765
766
Brian Sheedy59b06a82019-10-14 17:03:29 +0000767def _GetYapfIgnoreFilepaths(top_dir):
768 """Returns all filepaths that match the ignored files in the .yapfignore file.
769
770 yapf is supposed to handle the ignoring of files listed in .yapfignore itself,
771 but this functionality appears to break when explicitly passing files to
772 yapf for formatting. According to
773 https://github.com/google/yapf/blob/master/README.rst#excluding-files-from-formatting-yapfignore,
774 the .yapfignore file should be in the directory that yapf is invoked from,
775 which we assume to be the top level directory in this case.
776
777 Args:
778 top_dir: The top level directory for the repository being formatted.
779
780 Returns:
781 A set of all filepaths that should be ignored by yapf.
782 """
783 yapfignore_file = os.path.join(top_dir, '.yapfignore')
784 ignore_filepaths = set()
785 if not os.path.exists(yapfignore_file):
786 return ignore_filepaths
787
788 # glob works relative to the current working directory, so we need to ensure
789 # that we're at the top level directory.
790 old_cwd = os.getcwd()
791 try:
792 os.chdir(top_dir)
793 with open(yapfignore_file) as f:
794 for line in f.readlines():
795 stripped_line = line.strip()
796 # Comments and blank lines should be ignored.
797 if stripped_line.startswith('#') or stripped_line == '':
798 continue
799 ignore_filepaths |= set(glob.glob(stripped_line))
800 return ignore_filepaths
801 finally:
802 os.chdir(old_cwd)
803
804
Aaron Gable13101a62018-02-09 13:20:41 -0800805def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000806 """Prints statistics about the change to the user."""
807 # --no-ext-diff is broken in some versions of Git, so try to work around
808 # this by overriding the environment (but there is still a problem if the
809 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000810 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000811 if 'GIT_EXTERNAL_DIFF' in env:
812 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000813
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000814 try:
815 stdout = sys.stdout.fileno()
816 except AttributeError:
817 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000818 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800819 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000820 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000821
822
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000823class BuildbucketResponseException(Exception):
824 pass
825
826
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827class Settings(object):
828 def __init__(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000829 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000830 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000831 self.tree_status_url = None
832 self.viewvc_url = None
833 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000834 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000835 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000836 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000837 self.git_editor = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000838
839 def LazyUpdateIfNeeded(self):
840 """Updates the settings from a codereview.settings file, if available."""
841 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000842 # The only value that actually changes the behavior is
843 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000844 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000845 error_ok=True
846 ).strip().lower()
847
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000848 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000849 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850 LoadCodereviewSettingsFromFile(cr_settings_file)
851 self.updated = True
852
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000853 @staticmethod
854 def GetRelativeRoot():
855 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000856
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000857 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000858 if self.root is None:
859 self.root = os.path.abspath(self.GetRelativeRoot())
860 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000861
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000862 def GetTreeStatusUrl(self, error_ok=False):
863 if not self.tree_status_url:
864 error_message = ('You must configure your tree status URL by running '
865 '"git cl config".')
Edward Lemur61ea3072018-12-01 00:34:36 +0000866 self.tree_status_url = self._GetConfig(
867 'rietveld.tree-status-url', error_ok=error_ok,
868 error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000869 return self.tree_status_url
870
871 def GetViewVCUrl(self):
872 if not self.viewvc_url:
Edward Lemur61ea3072018-12-01 00:34:36 +0000873 self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000874 return self.viewvc_url
875
rmistry@google.com90752582014-01-14 21:04:50 +0000876 def GetBugPrefix(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000877 return self._GetConfig('rietveld.bug-prefix', error_ok=True)
rmistry@google.com78948ed2015-07-08 23:09:57 +0000878
rmistry@google.com5626a922015-02-26 14:03:30 +0000879 def GetRunPostUploadHook(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000880 run_post_upload_hook = self._GetConfig(
881 'rietveld.run-post-upload-hook', error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +0000882 return run_post_upload_hook == "True"
883
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000884 def GetDefaultCCList(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000885 return self._GetConfig('rietveld.cc', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000886
ukai@chromium.orge8077812012-02-03 03:41:46 +0000887 def GetIsGerrit(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000888 """Returns True if this repo is associated with Gerrit."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000889 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700890 self.is_gerrit = (
891 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000892 return self.is_gerrit
893
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000894 def GetSquashGerritUploads(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000895 """Returns True if uploads to Gerrit should be squashed by default."""
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000896 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700897 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
898 if self.squash_gerrit_uploads is None:
899 # Default is squash now (http://crbug.com/611892#c23).
900 self.squash_gerrit_uploads = not (
901 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
902 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000903 return self.squash_gerrit_uploads
904
tandriia60502f2016-06-20 02:01:53 -0700905 def GetSquashGerritUploadsOverride(self):
906 """Return True or False if codereview.settings should be overridden.
907
908 Returns None if no override has been defined.
909 """
910 # See also http://crbug.com/611892#c23
911 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
912 error_ok=True).strip()
913 if result == 'true':
914 return True
915 if result == 'false':
916 return False
917 return None
918
tandrii@chromium.org28253532016-04-14 13:46:56 +0000919 def GetGerritSkipEnsureAuthenticated(self):
920 """Return True if EnsureAuthenticated should not be done for Gerrit
921 uploads."""
922 if self.gerrit_skip_ensure_authenticated is None:
923 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000924 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000925 error_ok=True).strip() == 'true')
926 return self.gerrit_skip_ensure_authenticated
927
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000928 def GetGitEditor(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000929 """Returns the editor specified in the git config, or None if none is."""
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000930 if self.git_editor is None:
Raul Tambre5a525872019-02-12 19:08:08 +0000931 # Git requires single quotes for paths with spaces. We need to replace
932 # them with double quotes for Windows to treat such paths as a single
933 # path.
934 self.git_editor = self._GetConfig(
935 'core.editor', error_ok=True).replace('\'', '"')
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000936 return self.git_editor or None
937
thestig@chromium.org44202a22014-03-11 19:22:18 +0000938 def GetLintRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000939 return (self._GetConfig('rietveld.cpplint-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000940 DEFAULT_LINT_REGEX)
941
942 def GetLintIgnoreRegex(self):
Edward Lemur61ea3072018-12-01 00:34:36 +0000943 return (self._GetConfig('rietveld.cpplint-ignore-regex', error_ok=True) or
thestig@chromium.org44202a22014-03-11 19:22:18 +0000944 DEFAULT_LINT_IGNORE_REGEX)
945
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000946 def _GetConfig(self, param, **kwargs):
947 self.LazyUpdateIfNeeded()
948 return RunGit(['config', param], **kwargs).strip()
949
950
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000951def ShortBranchName(branch):
952 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000953 return branch.replace('refs/heads/', '', 1)
954
955
956def GetCurrentBranchRef():
957 """Returns branch ref (e.g., refs/heads/master) or None."""
958 return RunGit(['symbolic-ref', 'HEAD'],
959 stderr=subprocess2.VOID, error_ok=True).strip() or None
960
961
962def GetCurrentBranch():
963 """Returns current branch or None.
964
965 For refs/heads/* branches, returns just last part. For others, full ref.
966 """
967 branchref = GetCurrentBranchRef()
968 if branchref:
969 return ShortBranchName(branchref)
970 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000971
972
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000973class _CQState(object):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +0000974 """Enum for states of CL with respect to CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000975 NONE = 'none'
976 DRY_RUN = 'dry_run'
977 COMMIT = 'commit'
978
979 ALL_STATES = [NONE, DRY_RUN, COMMIT]
980
981
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000982class _ParsedIssueNumberArgument(object):
Edward Lemurf38bc172019-09-03 21:02:13 +0000983 def __init__(self, issue=None, patchset=None, hostname=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000984 self.issue = issue
985 self.patchset = patchset
986 self.hostname = hostname
987
988 @property
989 def valid(self):
990 return self.issue is not None
991
992
Edward Lemurf38bc172019-09-03 21:02:13 +0000993def ParseIssueNumberArgument(arg):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000994 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
995 fail_result = _ParsedIssueNumberArgument()
996
Edward Lemur678a6842019-10-03 22:25:05 +0000997 if isinstance(arg, int):
998 return _ParsedIssueNumberArgument(issue=arg)
999 if not isinstance(arg, basestring):
1000 return fail_result
1001
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001002 if arg.isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00001003 return _ParsedIssueNumberArgument(issue=int(arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001004 if not arg.startswith('http'):
1005 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001006
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001007 url = gclient_utils.UpgradeToHttps(arg)
1008 try:
1009 parsed_url = urlparse.urlparse(url)
1010 except ValueError:
1011 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001012
Edward Lemur678a6842019-10-03 22:25:05 +00001013 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
1014 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
1015 # Short urls like https://domain/<issue_number> can be used, but don't allow
1016 # specifying the patchset (you'd 404), but we allow that here.
1017 if parsed_url.path == '/':
1018 part = parsed_url.fragment
1019 else:
1020 part = parsed_url.path
1021
1022 match = re.match(
1023 r'(/c(/.*/\+)?)?/(?P<issue>\d+)(/(?P<patchset>\d+)?/?)?$', part)
1024 if not match:
1025 return fail_result
1026
1027 issue = int(match.group('issue'))
1028 patchset = match.group('patchset')
1029 return _ParsedIssueNumberArgument(
1030 issue=issue,
1031 patchset=int(patchset) if patchset else None,
1032 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001033
1034
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001035def _create_description_from_log(args):
1036 """Pulls out the commit log to use as a base for the CL description."""
1037 log_args = []
1038 if len(args) == 1 and not args[0].endswith('.'):
1039 log_args = [args[0] + '..']
1040 elif len(args) == 1 and args[0].endswith('...'):
1041 log_args = [args[0][:-1]]
1042 elif len(args) == 2:
1043 log_args = [args[0] + '..' + args[1]]
1044 else:
1045 log_args = args[:] # Hope for the best!
1046 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1047
1048
Aaron Gablea45ee112016-11-22 15:14:38 -08001049class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001050 def __init__(self, issue, url):
1051 self.issue = issue
1052 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001053 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001054
1055 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001056 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001057 self.issue, self.url)
1058
1059
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001060_CommentSummary = collections.namedtuple(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001061 '_CommentSummary', ['date', 'message', 'sender', 'autogenerated',
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001062 # TODO(tandrii): these two aren't known in Gerrit.
1063 'approval', 'disapproval'])
1064
1065
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001066class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001067 """Changelist works with one changelist in local branch.
1068
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001069 Notes:
1070 * Not safe for concurrent multi-{thread,process} use.
1071 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001072 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001073 """
1074
Edward Lemur125d60a2019-09-13 18:25:41 +00001075 def __init__(self, branchref=None, issue=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001076 """Create a new ChangeList instance.
1077
Edward Lemurf38bc172019-09-03 21:02:13 +00001078 **kwargs will be passed directly to Gerrit implementation.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001079 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001081 global settings
1082 if not settings:
1083 # Happens when git_cl.py is used as a utility library.
1084 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001085
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001086 self.branchref = branchref
1087 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001088 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 self.branch = ShortBranchName(self.branchref)
1090 else:
1091 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001093 self.lookedup_issue = False
1094 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001095 self.has_description = False
1096 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001097 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001099 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001100 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001101 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001102 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001103
Edward Lemur125d60a2019-09-13 18:25:41 +00001104 # Lazily cached values.
1105 self._gerrit_host = None # e.g. chromium-review.googlesource.com
1106 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
1107 # Map from change number (issue) to its detail cache.
1108 self._detail_cache = {}
1109
1110 if codereview_host is not None:
1111 assert not codereview_host.startswith('https://'), codereview_host
1112 self._gerrit_host = codereview_host
1113 self._gerrit_server = 'https://%s' % codereview_host
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001114
1115 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001116 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001117
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001118 The return value is a string suitable for passing to git cl with the --cc
1119 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001120 """
1121 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001122 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001123 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001124 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1125 return self.cc
1126
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001127 def GetCCListWithoutDefault(self):
1128 """Return the users cc'd on this CL excluding default ones."""
1129 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001130 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001131 return self.cc
1132
Daniel Cheng7227d212017-11-17 08:12:37 -08001133 def ExtendCC(self, more_cc):
1134 """Extends the list of users to cc on this CL based on the changed files."""
1135 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001136
1137 def GetBranch(self):
1138 """Returns the short branch name, e.g. 'master'."""
1139 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001140 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001141 if not branchref:
1142 return None
1143 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.branch = ShortBranchName(self.branchref)
1145 return self.branch
1146
1147 def GetBranchRef(self):
1148 """Returns the full branch name, e.g. 'refs/heads/master'."""
1149 self.GetBranch() # Poke the lazy loader.
1150 return self.branchref
1151
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001152 def ClearBranch(self):
1153 """Clears cached branch data of this object."""
1154 self.branch = self.branchref = None
1155
tandrii5d48c322016-08-18 16:19:37 -07001156 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1157 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1158 kwargs['branch'] = self.GetBranch()
1159 return _git_get_branch_config_value(key, default, **kwargs)
1160
1161 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1162 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1163 assert self.GetBranch(), (
1164 'this CL must have an associated branch to %sset %s%s' %
1165 ('un' if value is None else '',
1166 key,
1167 '' if value is None else ' to %r' % value))
1168 kwargs['branch'] = self.GetBranch()
1169 return _git_set_branch_config_value(key, value, **kwargs)
1170
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001171 @staticmethod
1172 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001173 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001174 e.g. 'origin', 'refs/heads/master'
1175 """
1176 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001177 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1178
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001179 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001180 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001181 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001182 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1183 error_ok=True).strip()
1184 if upstream_branch:
1185 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001186 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001187 # Else, try to guess the origin remote.
1188 remote_branches = RunGit(['branch', '-r']).split()
1189 if 'origin/master' in remote_branches:
1190 # Fall back on origin/master if it exits.
1191 remote = 'origin'
1192 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001193 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001194 DieWithError(
1195 'Unable to determine default branch to diff against.\n'
1196 'Either pass complete "git diff"-style arguments, like\n'
1197 ' git cl upload origin/master\n'
1198 'or verify this branch is set up to track another \n'
1199 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001200
1201 return remote, upstream_branch
1202
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001203 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001204 upstream_branch = self.GetUpstreamBranch()
1205 if not BranchExists(upstream_branch):
1206 DieWithError('The upstream for the current branch (%s) does not exist '
1207 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001208 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001209 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001210
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001211 def GetUpstreamBranch(self):
1212 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001213 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Raul Tambrefe1dbe12019-05-02 04:43:57 +00001214 if remote != '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001215 upstream_branch = upstream_branch.replace('refs/heads/',
1216 'refs/remotes/%s/' % remote)
1217 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1218 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001219 self.upstream_branch = upstream_branch
1220 return self.upstream_branch
1221
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001222 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001223 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001224 remote, branch = None, self.GetBranch()
1225 seen_branches = set()
1226 while branch not in seen_branches:
1227 seen_branches.add(branch)
1228 remote, branch = self.FetchUpstreamTuple(branch)
1229 branch = ShortBranchName(branch)
1230 if remote != '.' or branch.startswith('refs/remotes'):
1231 break
1232 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001233 remotes = RunGit(['remote'], error_ok=True).split()
1234 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001235 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001236 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001237 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001238 logging.warn('Could not determine which remote this change is '
1239 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001240 else:
1241 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001242 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001243 branch = 'HEAD'
1244 if branch.startswith('refs/remotes'):
1245 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001246 elif branch.startswith('refs/branch-heads/'):
1247 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001248 else:
1249 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001250 return self._remote
1251
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001252 def GitSanityChecks(self, upstream_git_obj):
1253 """Checks git repo status and ensures diff is from local commits."""
1254
sbc@chromium.org79706062015-01-14 21:18:12 +00001255 if upstream_git_obj is None:
1256 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001257 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001258 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001259 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001260 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001261 return False
1262
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001263 # Verify the commit we're diffing against is in our current branch.
1264 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1265 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1266 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001267 print('ERROR: %s is not in the current branch. You may need to rebase '
1268 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001269 return False
1270
1271 # List the commits inside the diff, and verify they are all local.
1272 commits_in_diff = RunGit(
1273 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1274 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1275 remote_branch = remote_branch.strip()
1276 if code != 0:
1277 _, remote_branch = self.GetRemoteBranch()
1278
1279 commits_in_remote = RunGit(
1280 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1281
1282 common_commits = set(commits_in_diff) & set(commits_in_remote)
1283 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001284 print('ERROR: Your diff contains %d commits already in %s.\n'
1285 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1286 'the diff. If you are using a custom git flow, you can override'
1287 ' the reference used for this check with "git config '
1288 'gitcl.remotebranch <git-ref>".' % (
1289 len(common_commits), remote_branch, upstream_git_obj),
1290 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 return False
1292 return True
1293
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001294 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001295 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001296
1297 Returns None if it is not set.
1298 """
tandrii5d48c322016-08-18 16:19:37 -07001299 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001300
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 def GetRemoteUrl(self):
1302 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1303
1304 Returns None if there is no remote.
1305 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001306 is_cached, value = self._cached_remote_url
1307 if is_cached:
1308 return value
1309
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001310 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001311 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1312
Edward Lemur298f2cf2019-02-22 21:40:39 +00001313 # Check if the remote url can be parsed as an URL.
1314 host = urlparse.urlparse(url).netloc
1315 if host:
1316 self._cached_remote_url = (True, url)
1317 return url
1318
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001319 # If it cannot be parsed as an url, assume it is a local directory,
1320 # probably a git cache.
Edward Lemur298f2cf2019-02-22 21:40:39 +00001321 logging.warning('"%s" doesn\'t appear to point to a git host. '
1322 'Interpreting it as a local directory.', url)
1323 if not os.path.isdir(url):
1324 logging.error(
1325 'Remote "%s" for branch "%s" points to "%s", but it doesn\'t exist.',
Daniel Bratell4a60db42019-09-16 17:02:52 +00001326 remote, self.GetBranch(), url)
Edward Lemur298f2cf2019-02-22 21:40:39 +00001327 return None
1328
1329 cache_path = url
1330 url = RunGit(['config', 'remote.%s.url' % remote],
1331 error_ok=True,
1332 cwd=url).strip()
1333
1334 host = urlparse.urlparse(url).netloc
1335 if not host:
1336 logging.error(
1337 'Remote "%(remote)s" for branch "%(branch)s" points to '
1338 '"%(cache_path)s", but it is misconfigured.\n'
1339 '"%(cache_path)s" must be a git repo and must have a remote named '
1340 '"%(remote)s" pointing to the git host.', {
1341 'remote': remote,
1342 'cache_path': cache_path,
1343 'branch': self.GetBranch()})
1344 return None
1345
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001346 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001347 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001348
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001349 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001350 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001351 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001352 self.issue = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001353 self.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001354 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001355 return self.issue
1356
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001357 def GetIssueURL(self):
1358 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001359 issue = self.GetIssue()
1360 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001361 return None
Edward Lemur125d60a2019-09-13 18:25:41 +00001362 return '%s/%s' % (self.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001363
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001364 def GetDescription(self, pretty=False, force=False):
1365 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001366 if self.GetIssue():
Edward Lemur125d60a2019-09-13 18:25:41 +00001367 self.description = self.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001368 self.has_description = True
1369 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001370 # Set width to 72 columns + 2 space indent.
1371 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001372 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001373 lines = self.description.splitlines()
1374 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001375 return self.description
1376
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001377 def GetDescriptionFooters(self):
1378 """Returns (non_footer_lines, footers) for the commit message.
1379
1380 Returns:
1381 non_footer_lines (list(str)) - Simple list of description lines without
1382 any footer. The lines do not contain newlines, nor does the list contain
1383 the empty line between the message and the footers.
1384 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1385 [("Change-Id", "Ideadbeef...."), ...]
1386 """
1387 raw_description = self.GetDescription()
1388 msg_lines, _, footers = git_footers.split_footers(raw_description)
1389 if footers:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001390 msg_lines = msg_lines[:len(msg_lines) - 1]
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001391 return msg_lines, footers
1392
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001394 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001395 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001396 self.patchset = self._GitGetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001397 self.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001398 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399 return self.patchset
1400
1401 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001402 """Set this branch's patchset. If patchset=0, clears the patchset."""
1403 assert self.GetBranch()
1404 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001405 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001406 else:
1407 self.patchset = int(patchset)
1408 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001409 self.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001410
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001411 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001412 """Set this branch's issue. If issue isn't given, clears the issue."""
1413 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001415 issue = int(issue)
1416 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001417 self.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001418 self.issue = issue
Edward Lemur125d60a2019-09-13 18:25:41 +00001419 codereview_server = self.GetCodereviewServer()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001420 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001421 self._GitSetBranchConfigValue(
Edward Lemur125d60a2019-09-13 18:25:41 +00001422 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001423 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001424 else:
tandrii5d48c322016-08-18 16:19:37 -07001425 # Reset all of these just to be clean.
1426 reset_suffixes = [
1427 'last-upload-hash',
Edward Lemur125d60a2019-09-13 18:25:41 +00001428 self.IssueConfigKey(),
1429 self.PatchsetConfigKey(),
1430 self.CodereviewServerConfigKey(),
tandrii5d48c322016-08-18 16:19:37 -07001431 ] + self._PostUnsetIssueProperties()
1432 for prop in reset_suffixes:
1433 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001434 msg = RunGit(['log', '-1', '--format=%B']).strip()
1435 if msg and git_footers.get_footer_change_id(msg):
1436 print('WARNING: The change patched into this branch has a Change-Id. '
1437 'Removing it.')
1438 RunGit(['commit', '--amend', '-m',
1439 git_footers.remove_footer(msg, 'Change-Id')])
Edward Lemurf38bc172019-09-03 21:02:13 +00001440 self.lookedup_issue = True
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001441 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001442 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001443
dnjba1b0f32016-09-02 12:37:42 -07001444 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001445 if not self.GitSanityChecks(upstream_branch):
1446 DieWithError('\nGit sanity check failure')
1447
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001448 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001449 if not root:
1450 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001451 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001452
1453 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001454 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001455 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001456 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001457 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001458 except subprocess2.CalledProcessError:
1459 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001460 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001461 'This branch probably doesn\'t exist anymore. To reset the\n'
1462 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001463 ' git branch --set-upstream-to origin/master %s\n'
1464 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001465 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001466
maruel@chromium.org52424302012-08-29 15:14:30 +00001467 issue = self.GetIssue()
1468 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001469 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001470 description = self.GetDescription()
1471 else:
1472 # If the change was never uploaded, use the log messages of all commits
1473 # up to the branch point, as git cl upload will prefill the description
1474 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001475 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1476 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001477
1478 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001479 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001480 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001481 name,
1482 description,
1483 absroot,
1484 files,
1485 issue,
1486 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001487 author,
1488 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001489
dsansomee2d6fd92016-09-08 00:10:47 -07001490 def UpdateDescription(self, description, force=False):
Edward Lemur125d60a2019-09-13 18:25:41 +00001491 self.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001492 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001493 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001494
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001495 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1496 """Sets the description for this CL remotely.
1497
1498 You can get description_lines and footers with GetDescriptionFooters.
1499
1500 Args:
1501 description_lines (list(str)) - List of CL description lines without
1502 newline characters.
1503 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1504 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1505 `List-Of-Tokens`). It will be case-normalized so that each token is
1506 title-cased.
1507 """
1508 new_description = '\n'.join(description_lines)
1509 if footers:
1510 new_description += '\n'
1511 for k, v in footers:
1512 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1513 if not git_footers.FOOTER_PATTERN.match(foot):
1514 raise ValueError('Invalid footer %r' % foot)
1515 new_description += foot + '\n'
1516 self.UpdateDescription(new_description, force)
1517
Edward Lesmes8e282792018-04-03 18:50:29 -04001518 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001519 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1520 try:
Edward Lemur2c48f242019-06-04 16:14:09 +00001521 start = time_time()
1522 result = presubmit_support.DoPresubmitChecks(change, committing,
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001523 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1524 default_presubmit=None, may_prompt=may_prompt,
Edward Lemur125d60a2019-09-13 18:25:41 +00001525 gerrit_obj=self.GetGerritObjForPresubmit(),
Edward Lesmes8e282792018-04-03 18:50:29 -04001526 parallel=parallel)
Edward Lemur2c48f242019-06-04 16:14:09 +00001527 metrics.collector.add_repeated('sub_commands', {
1528 'command': 'presubmit',
1529 'execution_time': time_time() - start,
1530 'exit_code': 0 if result.should_continue() else 1,
1531 })
1532 return result
vapierfd77ac72016-06-16 08:33:57 -07001533 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001534 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001535
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001536 def CMDUpload(self, options, git_diff_args, orig_args):
1537 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001538 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001539 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001540 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001541 else:
1542 if self.GetBranch() is None:
1543 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1544
1545 # Default to diffing against common ancestor of upstream branch
1546 base_branch = self.GetCommonAncestorWithUpstream()
1547 git_diff_args = [base_branch, 'HEAD']
1548
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001549 # Fast best-effort checks to abort before running potentially expensive
1550 # hooks if uploading is likely to fail anyway. Passing these checks does
1551 # not guarantee that uploading will not fail.
Edward Lemur125d60a2019-09-13 18:25:41 +00001552 self.EnsureAuthenticated(force=options.force)
1553 self.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001554
1555 # Apply watchlists on upload.
1556 change = self.GetChange(base_branch, None)
1557 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1558 files = [f.LocalPath() for f in change.AffectedFiles()]
1559 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001560 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001561
1562 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001563 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001564 # Set the reviewer list now so that presubmit checks can access it.
1565 change_description = ChangeDescription(change.FullDescriptionText())
1566 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001567 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001568 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001569 change)
1570 change.SetDescriptionText(change_description.description)
1571 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001572 may_prompt=not options.force,
1573 verbose=options.verbose,
1574 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001575 if not hook_results.should_continue():
1576 return 1
1577 if not options.reviewers and hook_results.reviewers:
1578 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001579 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001580
Aaron Gable13101a62018-02-09 13:20:41 -08001581 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001582 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001584 _git_set_branch_config_value('last-upload-hash',
1585 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 # Run post upload hooks, if specified.
1587 if settings.GetRunPostUploadHook():
1588 presubmit_support.DoPostUploadExecuter(
1589 change,
1590 self,
1591 settings.GetRoot(),
1592 options.verbose,
1593 sys.stdout)
1594
1595 # Upload all dependencies if specified.
1596 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001597 print()
1598 print('--dependencies has been specified.')
1599 print('All dependent local branches will be re-uploaded.')
1600 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 # Remove the dependencies flag from args so that we do not end up in a
1602 # loop.
1603 orig_args.remove('--dependencies')
1604 ret = upload_branch_deps(self, orig_args)
1605 return ret
1606
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001607 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001608 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001609
1610 Issue must have been already uploaded and known.
1611 """
1612 assert new_state in _CQState.ALL_STATES
1613 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001614 try:
Edward Lemur125d60a2019-09-13 18:25:41 +00001615 vote_map = {
1616 _CQState.NONE: 0,
1617 _CQState.DRY_RUN: 1,
1618 _CQState.COMMIT: 2,
1619 }
1620 labels = {'Commit-Queue': vote_map[new_state]}
1621 notify = False if new_state == _CQState.DRY_RUN else None
1622 gerrit_util.SetReview(
1623 self._GetGerritHost(), self._GerritChangeIdentifier(),
1624 labels=labels, notify=notify)
qyearsley1fdfcb62016-10-24 13:22:03 -07001625 return 0
1626 except KeyboardInterrupt:
1627 raise
1628 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001629 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001630 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001631 ' * Your project has no CQ,\n'
1632 ' * You don\'t have permission to change the CQ state,\n'
1633 ' * There\'s a bug in this code (see stack trace below).\n'
1634 'Consider specifying which bots to trigger manually or asking your '
1635 'project owners for permissions or contacting Chrome Infra at:\n'
1636 'https://www.chromium.org/infra\n\n' %
1637 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001638 # Still raise exception so that stack trace is printed.
1639 raise
1640
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001641 def _GetGerritHost(self):
1642 # Lazy load of configs.
1643 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07001644 if self._gerrit_host and '.' not in self._gerrit_host:
1645 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
1646 # This happens for internal stuff http://crbug.com/614312.
1647 parsed = urlparse.urlparse(self.GetRemoteUrl())
1648 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001649 print('WARNING: using non-https URLs for remote is likely broken\n'
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001650 ' Your current remote is: %s' % self.GetRemoteUrl())
tandriie32e3ea2016-06-22 02:52:48 -07001651 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
1652 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001653 return self._gerrit_host
1654
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001655 def _GetGitHost(self):
1656 """Returns git host to be used when uploading change to Gerrit."""
Edward Lemur298f2cf2019-02-22 21:40:39 +00001657 remote_url = self.GetRemoteUrl()
1658 if not remote_url:
1659 return None
1660 return urlparse.urlparse(remote_url).netloc
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001661
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001662 def GetCodereviewServer(self):
1663 if not self._gerrit_server:
1664 # If we're on a branch then get the server potentially associated
1665 # with that branch.
1666 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001667 self._gerrit_server = self._GitGetBranchConfigValue(
1668 self.CodereviewServerConfigKey())
1669 if self._gerrit_server:
1670 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001671 if not self._gerrit_server:
1672 # We assume repo to be hosted on Gerrit, and hence Gerrit server
1673 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001674 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001675 parts[0] = parts[0] + '-review'
1676 self._gerrit_host = '.'.join(parts)
1677 self._gerrit_server = 'https://%s' % self._gerrit_host
1678 return self._gerrit_server
1679
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001680 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001681 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001682 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001683 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001684 logging.warn('can\'t detect Gerrit project.')
1685 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001686 project = urlparse.urlparse(remote_url).path.strip('/')
1687 if project.endswith('.git'):
1688 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001689 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
1690 # 'a/' prefix, because 'a/' prefix is used to force authentication in
1691 # gitiles/git-over-https protocol. E.g.,
1692 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
1693 # as
1694 # https://chromium.googlesource.com/v8/v8
1695 if project.startswith('a/'):
1696 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001697 return project
1698
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001699 def _GerritChangeIdentifier(self):
1700 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
1701
1702 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001703 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001704 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00001705 project = self._GetGerritProject()
1706 if project:
1707 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
1708 # Fall back on still unique, but less efficient change number.
1709 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00001710
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001711 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001712 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001713 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001714
tandrii5d48c322016-08-18 16:19:37 -07001715 @classmethod
1716 def PatchsetConfigKey(cls):
1717 return 'gerritpatchset'
1718
1719 @classmethod
1720 def CodereviewServerConfigKey(cls):
1721 return 'gerritserver'
1722
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001723 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001724 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001725 if settings.GetGerritSkipEnsureAuthenticated():
1726 # For projects with unusual authentication schemes.
1727 # See http://crbug.com/603378.
1728 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001729
1730 # Check presence of cookies only if using cookies-based auth method.
1731 cookie_auth = gerrit_util.Authenticator.get()
1732 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001733 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001734
Daniel Chengcf6269b2019-05-18 01:02:12 +00001735 if urlparse.urlparse(self.GetRemoteUrl()).scheme != 'https':
1736 print('WARNING: Ignoring branch %s with non-https remote %s' %
Edward Lemur125d60a2019-09-13 18:25:41 +00001737 (self.branch, self.GetRemoteUrl()))
Daniel Chengcf6269b2019-05-18 01:02:12 +00001738 return
1739
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001740 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001741 self.GetCodereviewServer()
1742 git_host = self._GetGitHost()
Edward Lemur298f2cf2019-02-22 21:40:39 +00001743 assert self._gerrit_server and self._gerrit_host and git_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001744
1745 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
1746 git_auth = cookie_auth.get_auth_header(git_host)
1747 if gerrit_auth and git_auth:
1748 if gerrit_auth == git_auth:
1749 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001750 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
Raul Tambre80ee78e2019-05-06 22:41:05 +00001751 print(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001752 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001753 ' %s\n'
1754 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001755 ' Consider running the following command:\n'
1756 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001757 ' %s\n'
Raul Tambre80ee78e2019-05-06 22:41:05 +00001758 ' %s' %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02001759 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02001760 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001761 cookie_auth.get_new_password_message(git_host)))
1762 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001763 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001764 return
1765 else:
1766 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02001767 ([] if gerrit_auth else [self._gerrit_host]) +
1768 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001769 DieWithError('Credentials for the following hosts are required:\n'
1770 ' %s\n'
1771 'These are read from %s (or legacy %s)\n'
1772 '%s' % (
1773 '\n '.join(missing),
1774 cookie_auth.get_gitcookies_path(),
1775 cookie_auth.get_netrc_path(),
1776 cookie_auth.get_new_password_message(git_host)))
1777
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001778 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001779 if not self.GetIssue():
1780 return
1781
1782 # Warm change details cache now to avoid RPCs later, reducing latency for
1783 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001784 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00001785 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001786
1787 status = self._GetChangeDetail()['status']
1788 if status in ('MERGED', 'ABANDONED'):
1789 DieWithError('Change %s has been %s, new uploads are not allowed' %
1790 (self.GetIssueURL(),
1791 'submitted' if status == 'MERGED' else 'abandoned'))
1792
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001793 # TODO(vadimsh): For some reason the chunk of code below was skipped if
1794 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
1795 # Apparently this check is not very important? Otherwise get_auth_email
1796 # could have been added to other implementations of Authenticator.
1797 cookies_auth = gerrit_util.Authenticator.get()
1798 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001799 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00001800
1801 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001802 if self.GetIssueOwner() == cookies_user:
1803 return
1804 logging.debug('change %s owner is %s, cookies user is %s',
1805 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001806 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001807 # so ask what Gerrit thinks of this user.
1808 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
1809 if details['email'] == self.GetIssueOwner():
1810 return
1811 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001812 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001813 'as %s.\n'
1814 'Uploading may fail due to lack of permissions.' %
1815 (self.GetIssue(), self.GetIssueOwner(), details['email']))
1816 confirm_or_exit(action='upload')
1817
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001818 def _PostUnsetIssueProperties(self):
1819 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001820 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001821
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001822 def GetGerritObjForPresubmit(self):
1823 return presubmit_support.GerritAccessor(self._GetGerritHost())
1824
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825 def GetStatus(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001826 """Applies a rough heuristic to give a simple summary of an issue's review
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001827 or CQ status, assuming adherence to a common workflow.
1828
1829 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001830 * 'error' - error from review tool (including deleted issues)
1831 * 'unsent' - no reviewers added
1832 * 'waiting' - waiting for review
1833 * 'reply' - waiting for uploader to reply to review
1834 * 'lgtm' - Code-Review label has been set
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00001835 * 'dry-run' - dry-running in the CQ
1836 * 'commit' - in the CQ
Aaron Gable9ab38c62017-04-06 14:36:33 -07001837 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001838 """
1839 if not self.GetIssue():
1840 return None
1841
1842 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001843 data = self._GetChangeDetail([
1844 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08001845 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001846 return 'error'
1847
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00001848 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001849 return 'closed'
1850
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001851 cq_label = data['labels'].get('Commit-Queue', {})
1852 max_cq_vote = 0
1853 for vote in cq_label.get('all', []):
1854 max_cq_vote = max(max_cq_vote, vote.get('value', 0))
1855 if max_cq_vote == 2:
Aaron Gable9ab38c62017-04-06 14:36:33 -07001856 return 'commit'
Andrii Shyshkalovb8268ca2019-04-03 23:33:44 +00001857 if max_cq_vote == 1:
1858 return 'dry-run'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001859
Aaron Gable9ab38c62017-04-06 14:36:33 -07001860 if data['labels'].get('Code-Review', {}).get('approved'):
1861 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001862
1863 if not data.get('reviewers', {}).get('REVIEWER', []):
1864 return 'unsent'
1865
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001866 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07001867 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
1868 last_message_author = messages.pop().get('author', {})
1869 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001870 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
1871 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07001872 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01001873 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07001874 if last_message_author.get('_account_id') == owner:
1875 # Most recent message was by owner.
1876 return 'waiting'
1877 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001878 # Some reply from non-owner.
1879 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07001880
1881 # Somehow there are no messages even though there are reviewers.
1882 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001883
1884 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00001885 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08001886 patchset = data['revisions'][data['current_revision']]['_number']
1887 self.SetPatchset(patchset)
1888 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001889
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001890 def FetchDescription(self, force=False):
1891 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
1892 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00001893 current_rev = data['current_revision']
Dan Beamcf6df902018-11-08 01:48:37 +00001894 return data['revisions'][current_rev]['commit']['message'].encode(
1895 'utf-8', 'ignore')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001896
dsansomee2d6fd92016-09-08 00:10:47 -07001897 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001898 if gerrit_util.HasPendingChangeEdit(
1899 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07001900 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001901 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07001902 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001903 'unpublished edit. Either publish the edit in the Gerrit web UI '
1904 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07001905
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001906 gerrit_util.DeletePendingChangeEdit(
1907 self._GetGerritHost(), self._GerritChangeIdentifier())
1908 gerrit_util.SetCommitMessage(
1909 self._GetGerritHost(), self._GerritChangeIdentifier(),
1910 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911
Aaron Gable636b13f2017-07-14 10:42:48 -07001912 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001913 gerrit_util.SetReview(
1914 self._GetGerritHost(), self._GerritChangeIdentifier(),
1915 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001916
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001917 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01001918 # DETAILED_ACCOUNTS is to get emails in accounts.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001919 # CURRENT_REVISION is included to get the latest patchset so that
1920 # only the robot comments from the latest patchset can be shown.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001921 messages = self._GetChangeDetail(
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001922 options=['MESSAGES', 'DETAILED_ACCOUNTS',
1923 'CURRENT_REVISION']).get('messages', [])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001924 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00001925 self._GetGerritHost(), self._GerritChangeIdentifier())
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001926 robot_file_comments = gerrit_util.GetChangeRobotComments(
1927 self._GetGerritHost(), self._GerritChangeIdentifier())
1928
1929 # Add the robot comments onto the list of comments, but only
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00001930 # keep those that are from the latest patchset.
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001931 latest_patch_set = self.GetMostRecentPatchset()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001932 for path, robot_comments in robot_file_comments.items():
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001933 line_comments = file_comments.setdefault(path, [])
1934 line_comments.extend(
1935 [c for c in robot_comments if c['patch_set'] == latest_patch_set])
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001936
1937 # Build dictionary of file comments for easy access and sorting later.
1938 # {author+date: {path: {patchset: {line: url+message}}}}
1939 comments = collections.defaultdict(
1940 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00001941 for path, line_comments in file_comments.items():
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001942 for comment in line_comments:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001943 tag = comment.get('tag', '')
1944 if tag.startswith('autogenerated') and 'robot_id' not in comment:
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001945 continue
1946 key = (comment['author']['email'], comment['updated'])
1947 if comment.get('side', 'REVISION') == 'PARENT':
1948 patchset = 'Base'
1949 else:
1950 patchset = 'PS%d' % comment['patch_set']
1951 line = comment.get('line', 0)
1952 url = ('https://%s/c/%s/%s/%s#%s%s' %
1953 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
1954 'b' if comment.get('side') == 'PARENT' else '',
1955 str(line) if line else ''))
1956 comments[key][path][patchset][line] = (url, comment['message'])
1957
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001958 summaries = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001959 for msg in messages:
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001960 summary = self._BuildCommentSummary(msg, comments, readable)
1961 if summary:
1962 summaries.append(summary)
1963 return summaries
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001964
Quinten Yearsley0e617c02019-02-20 00:37:03 +00001965 @staticmethod
1966 def _BuildCommentSummary(msg, comments, readable):
1967 key = (msg['author']['email'], msg['date'])
1968 # Don't bother showing autogenerated messages that don't have associated
1969 # file or line comments. this will filter out most autogenerated
1970 # messages, but will keep robot comments like those from Tricium.
1971 is_autogenerated = msg.get('tag', '').startswith('autogenerated')
1972 if is_autogenerated and not comments.get(key):
1973 return None
1974 message = msg['message']
1975 # Gerrit spits out nanoseconds.
1976 assert len(msg['date'].split('.')[-1]) == 9
1977 date = datetime.datetime.strptime(msg['date'][:-3],
1978 '%Y-%m-%d %H:%M:%S.%f')
1979 if key in comments:
1980 message += '\n'
1981 for path, patchsets in sorted(comments.get(key, {}).items()):
1982 if readable:
1983 message += '\n%s' % path
1984 for patchset, lines in sorted(patchsets.items()):
1985 for line, (url, content) in sorted(lines.items()):
1986 if line:
1987 line_str = 'Line %d' % line
1988 path_str = '%s:%d:' % (path, line)
1989 else:
1990 line_str = 'File comment'
1991 path_str = '%s:0:' % path
1992 if readable:
1993 message += '\n %s, %s: %s' % (patchset, line_str, url)
1994 message += '\n %s\n' % content
1995 else:
1996 message += '\n%s ' % path_str
1997 message += '\n%s\n' % content
1998
1999 return _CommentSummary(
2000 date=date,
2001 message=message,
2002 sender=msg['author']['email'],
2003 autogenerated=is_autogenerated,
2004 # These could be inferred from the text messages and correlated with
2005 # Code-Review label maximum, however this is not reliable.
2006 # Leaving as is until the need arises.
2007 approval=False,
2008 disapproval=False,
2009 )
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002010
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002011 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002012 gerrit_util.AbandonChange(
2013 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002014
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002015 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002016 gerrit_util.SubmitChange(
2017 self._GetGerritHost(), self._GerritChangeIdentifier(),
2018 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002019
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002020 def _GetChangeDetail(self, options=None, no_cache=False):
2021 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002022
2023 If fresh data is needed, set no_cache=True which will clear cache and
2024 thus new data will be fetched from Gerrit.
2025 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002026 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002027 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002028
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002029 # Optimization to avoid multiple RPCs:
2030 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2031 'CURRENT_COMMIT' not in options):
2032 options.append('CURRENT_COMMIT')
2033
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002034 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002035 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002036 options = [o.upper() for o in options]
2037
2038 # Check in cache first unless no_cache is True.
2039 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002040 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002041 else:
2042 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002043 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002044 # Assumption: data fetched before with extra options is suitable
2045 # for return for a smaller set of options.
2046 # For example, if we cached data for
2047 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2048 # and request is for options=[CURRENT_REVISION],
2049 # THEN we can return prior cached data.
2050 if options_set.issubset(cached_options_set):
2051 return data
2052
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002053 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002054 data = gerrit_util.GetChangeDetail(
2055 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002056 except gerrit_util.GerritError as e:
2057 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002058 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002059 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002060
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002061 self._detail_cache.setdefault(cache_key, []).append(
2062 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002063 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002064
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002065 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002066 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002067 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002068 data = gerrit_util.GetChangeCommit(
2069 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002070 except gerrit_util.GerritError as e:
2071 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002072 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002073 raise
agable32978d92016-11-01 12:55:02 -07002074 return data
2075
Karen Qian40c19422019-03-13 21:28:29 +00002076 def _IsCqConfigured(self):
2077 detail = self._GetChangeDetail(['LABELS'])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002078 if u'Commit-Queue' not in detail.get('labels', {}):
Karen Qian40c19422019-03-13 21:28:29 +00002079 return False
2080 # TODO(crbug/753213): Remove temporary hack
2081 if ('https://chromium.googlesource.com/chromium/src' ==
Edward Lemur125d60a2019-09-13 18:25:41 +00002082 self.GetRemoteUrl() and
Karen Qian40c19422019-03-13 21:28:29 +00002083 detail['branch'].startswith('refs/branch-heads/')):
2084 return False
2085 return True
2086
Olivier Robin75ee7252018-04-13 10:02:56 +02002087 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002088 if git_common.is_dirty_git_tree('land'):
2089 return 1
Karen Qian40c19422019-03-13 21:28:29 +00002090
tandriid60367b2016-06-22 05:25:12 -07002091 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
Karen Qian40c19422019-03-13 21:28:29 +00002092 if not force and self._IsCqConfigured():
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00002093 confirm_or_exit('\nIt seems this repository has a CQ, '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002094 'which can test and land changes for you. '
2095 'Are you sure you wish to bypass it?\n',
2096 action='bypass CQ')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002097 differs = True
tandriic4344b52016-08-29 06:04:54 -07002098 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002099 # Note: git diff outputs nothing if there is no diff.
2100 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002101 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002102 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002103 if detail['current_revision'] == last_upload:
2104 differs = False
2105 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002106 print('WARNING: Local branch contents differ from latest uploaded '
2107 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002108 if differs:
2109 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002110 confirm_or_exit(
2111 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2112 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002113 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002114 elif not bypass_hooks:
2115 hook_results = self.RunHook(
2116 committing=True,
2117 may_prompt=not force,
2118 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002119 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2120 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002121 if not hook_results.should_continue():
2122 return 1
2123
2124 self.SubmitIssue(wait_for_merge=True)
2125 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002126 links = self._GetChangeCommit().get('web_links', [])
2127 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002128 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002129 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002130 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002131 return 0
2132
Edward Lemurf38bc172019-09-03 21:02:13 +00002133 def CMDPatchWithParsedIssue(self, parsed_issue_arg, nocommit, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002134 assert parsed_issue_arg.valid
2135
Edward Lemur125d60a2019-09-13 18:25:41 +00002136 self.issue = parsed_issue_arg.issue
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002137
2138 if parsed_issue_arg.hostname:
2139 self._gerrit_host = parsed_issue_arg.hostname
2140 self._gerrit_server = 'https://%s' % self._gerrit_host
2141
tandriic2405f52016-10-10 08:13:15 -07002142 try:
2143 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002144 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002145 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002146
2147 if not parsed_issue_arg.patchset:
2148 # Use current revision by default.
2149 revision_info = detail['revisions'][detail['current_revision']]
2150 patchset = int(revision_info['_number'])
2151 else:
2152 patchset = parsed_issue_arg.patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002153 for revision_info in detail['revisions'].values():
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2155 break
2156 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002157 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 (parsed_issue_arg.patchset, self.GetIssue()))
2159
Edward Lemur125d60a2019-09-13 18:25:41 +00002160 remote_url = self.GetRemoteUrl()
Aaron Gable697a91b2018-01-19 15:20:15 -08002161 if remote_url.endswith('.git'):
2162 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002163 remote_url = remote_url.rstrip('/')
2164
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002165 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002166 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002167
2168 if remote_url != fetch_info['url']:
2169 DieWithError('Trying to patch a change from %s but this repo appears '
2170 'to be %s.' % (fetch_info['url'], remote_url))
2171
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002173
Aaron Gable62619a32017-06-16 08:22:09 -07002174 if force:
2175 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2176 print('Checked out commit for change %i patchset %i locally' %
2177 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002178 elif nocommit:
2179 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2180 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002181 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002182 RunGit(['cherry-pick', 'FETCH_HEAD'])
2183 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002184 (parsed_issue_arg.issue, patchset))
2185 print('Note: this created a local commit which does not have '
2186 'the same hash as the one uploaded for review. This will make '
2187 'uploading changes based on top of this branch difficult.\n'
2188 'If you want to do that, use "git cl patch --force" instead.')
2189
Stefan Zagerd08043c2017-10-12 12:07:02 -07002190 if self.GetBranch():
2191 self.SetIssue(parsed_issue_arg.issue)
2192 self.SetPatchset(patchset)
2193 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2194 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2195 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2196 else:
2197 print('WARNING: You are in detached HEAD state.\n'
2198 'The patch has been applied to your checkout, but you will not be '
2199 'able to upload a new patch set to the gerrit issue.\n'
2200 'Try using the \'-b\' option if you would like to work on a '
2201 'branch and/or upload a new patch set.')
2202
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002203 return 0
2204
tandrii16e0b4e2016-06-07 10:34:28 -07002205 def _GerritCommitMsgHookCheck(self, offer_removal):
2206 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2207 if not os.path.exists(hook):
2208 return
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002209 # Crude attempt to distinguish Gerrit Codereview hook from a potentially
2210 # custom developer-made one.
tandrii16e0b4e2016-06-07 10:34:28 -07002211 data = gclient_utils.FileRead(hook)
2212 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2213 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002214 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002215 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002216 'and may interfere with it in subtle ways.\n'
2217 'We recommend you remove the commit-msg hook.')
2218 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002219 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002220 gclient_utils.rm_file_or_tree(hook)
2221 print('Gerrit commit-msg hook removed.')
2222 else:
2223 print('OK, will keep Gerrit commit-msg hook in place.')
2224
Edward Lemur1b52d872019-05-09 21:12:12 +00002225 def _CleanUpOldTraces(self):
2226 """Keep only the last |MAX_TRACES| traces."""
2227 try:
2228 traces = sorted([
2229 os.path.join(TRACES_DIR, f)
2230 for f in os.listdir(TRACES_DIR)
2231 if (os.path.isfile(os.path.join(TRACES_DIR, f))
2232 and not f.startswith('tmp'))
2233 ])
2234 traces_to_delete = traces[:-MAX_TRACES]
2235 for trace in traces_to_delete:
Daniel Chengcf6269b2019-05-18 01:02:12 +00002236 os.remove(trace)
Edward Lemur1b52d872019-05-09 21:12:12 +00002237 except OSError:
2238 print('WARNING: Failed to remove old git traces from\n'
2239 ' %s'
2240 'Consider removing them manually.' % TRACES_DIR)
Edward Lemurdc8e23d2019-05-07 00:45:48 +00002241
Edward Lemur5737f022019-05-17 01:24:00 +00002242 def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
Edward Lemur1b52d872019-05-09 21:12:12 +00002243 """Zip and write the git push traces stored in traces_dir."""
2244 gclient_utils.safe_makedirs(TRACES_DIR)
Edward Lemur1b52d872019-05-09 21:12:12 +00002245 traces_zip = trace_name + '-traces'
2246 traces_readme = trace_name + '-README'
Michael Mosse7f0b4c2019-05-08 04:36:24 +00002247 # Create a temporary dir to store git config and gitcookies in. It will be
2248 # compressed and stored next to the traces.
2249 git_info_dir = tempfile.mkdtemp()
Edward Lemur1b52d872019-05-09 21:12:12 +00002250 git_info_zip = trace_name + '-git-info'
2251
Edward Lemur5737f022019-05-17 01:24:00 +00002252 git_push_metadata['now'] = datetime_now().strftime('%c')
Eric Boren67c48202019-05-30 16:52:51 +00002253 if sys.stdin.encoding and sys.stdin.encoding != 'utf-8':
sangwoo.ko7a614332019-05-22 02:46:19 +00002254 git_push_metadata['now'] = git_push_metadata['now'].decode(
2255 sys.stdin.encoding)
2256
Edward Lemur1b52d872019-05-09 21:12:12 +00002257 git_push_metadata['trace_name'] = trace_name
2258 gclient_utils.FileWrite(
2259 traces_readme, TRACES_README_FORMAT % git_push_metadata)
2260
2261 # Keep only the first 6 characters of the git hashes on the packet
2262 # trace. This greatly decreases size after compression.
2263 packet_traces = os.path.join(traces_dir, 'trace-packet')
2264 if os.path.isfile(packet_traces):
2265 contents = gclient_utils.FileRead(packet_traces)
2266 gclient_utils.FileWrite(
2267 packet_traces, GIT_HASH_RE.sub(r'\1', contents))
2268 shutil.make_archive(traces_zip, 'zip', traces_dir)
2269
2270 # Collect and compress the git config and gitcookies.
2271 git_config = RunGit(['config', '-l'])
2272 gclient_utils.FileWrite(
2273 os.path.join(git_info_dir, 'git-config'),
2274 git_config)
2275
2276 cookie_auth = gerrit_util.Authenticator.get()
2277 if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
2278 gitcookies_path = cookie_auth.get_gitcookies_path()
2279 if os.path.isfile(gitcookies_path):
2280 gitcookies = gclient_utils.FileRead(gitcookies_path)
2281 gclient_utils.FileWrite(
2282 os.path.join(git_info_dir, 'gitcookies'),
2283 GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
2284 shutil.make_archive(git_info_zip, 'zip', git_info_dir)
2285
Edward Lemur1b52d872019-05-09 21:12:12 +00002286 gclient_utils.rmtree(git_info_dir)
2287
2288 def _RunGitPushWithTraces(
2289 self, change_desc, refspec, refspec_opts, git_push_metadata):
2290 """Run git push and collect the traces resulting from the execution."""
2291 # Create a temporary directory to store traces in. Traces will be compressed
2292 # and stored in a 'traces' dir inside depot_tools.
2293 traces_dir = tempfile.mkdtemp()
Edward Lemur5737f022019-05-17 01:24:00 +00002294 trace_name = os.path.join(
2295 TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
Edward Lemur0f58ae42019-04-30 17:24:12 +00002296
2297 env = os.environ.copy()
2298 env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
2299 env['GIT_TR2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Jonathan Nieder9779b142019-05-29 23:19:29 +00002300 env['GIT_TRACE2_EVENT'] = os.path.join(traces_dir, 'tr2-event')
Edward Lemur0f58ae42019-04-30 17:24:12 +00002301 env['GIT_TRACE_CURL'] = os.path.join(traces_dir, 'trace-curl')
2302 env['GIT_TRACE_CURL_NO_DATA'] = '1'
2303 env['GIT_TRACE_PACKET'] = os.path.join(traces_dir, 'trace-packet')
2304
2305 try:
2306 push_returncode = 0
Edward Lemur1b52d872019-05-09 21:12:12 +00002307 remote_url = self.GetRemoteUrl()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002308 before_push = time_time()
2309 push_stdout = gclient_utils.CheckCallAndFilter(
Edward Lemur1b52d872019-05-09 21:12:12 +00002310 ['git', 'push', remote_url, refspec],
Edward Lemur0f58ae42019-04-30 17:24:12 +00002311 env=env,
2312 print_stdout=True,
2313 # Flush after every line: useful for seeing progress when running as
2314 # recipe.
2315 filter_fn=lambda _: sys.stdout.flush())
2316 except subprocess2.CalledProcessError as e:
2317 push_returncode = e.returncode
2318 DieWithError('Failed to create a change. Please examine output above '
2319 'for the reason of the failure.\n'
2320 'Hint: run command below to diagnose common Git/Gerrit '
2321 'credential problems:\n'
Edward Lemur5737f022019-05-17 01:24:00 +00002322 ' git cl creds-check\n'
2323 '\n'
2324 'If git-cl is not working correctly, file a bug under the '
2325 'Infra>SDK component including the files below.\n'
2326 'Review the files before upload, since they might contain '
2327 'sensitive information.\n'
2328 'Set the Restrict-View-Google label so that they are not '
2329 'publicly accessible.\n'
2330 + TRACES_MESSAGE % {'trace_name': trace_name},
Edward Lemur0f58ae42019-04-30 17:24:12 +00002331 change_desc)
2332 finally:
2333 execution_time = time_time() - before_push
2334 metrics.collector.add_repeated('sub_commands', {
2335 'command': 'git push',
2336 'execution_time': execution_time,
2337 'exit_code': push_returncode,
2338 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
2339 })
2340
Edward Lemur1b52d872019-05-09 21:12:12 +00002341 git_push_metadata['execution_time'] = execution_time
2342 git_push_metadata['exit_code'] = push_returncode
Edward Lemur5737f022019-05-17 01:24:00 +00002343 self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
Edward Lemur0f58ae42019-04-30 17:24:12 +00002344
Edward Lemur1b52d872019-05-09 21:12:12 +00002345 self._CleanUpOldTraces()
Edward Lemur0f58ae42019-04-30 17:24:12 +00002346 gclient_utils.rmtree(traces_dir)
2347
2348 return push_stdout
2349
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002350 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002351 """Upload the current branch to Gerrit."""
Mike Frysingera989d552019-08-14 20:51:23 +00002352 if options.squash is None:
tandriia60502f2016-06-20 02:01:53 -07002353 # Load default for user, repo, squash=true, in this order.
2354 options.squash = settings.GetSquashGerritUploads()
tandrii26f3e4e2016-06-10 08:37:04 -07002355
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002356 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002357 branch = GetTargetRef(remote, remote_branch, options.target_branch)
Aaron Gableb56ad332017-01-06 15:24:31 -08002358 # This may be None; default fallback value is determined in logic below.
2359 title = options.title
2360
Dominic Battre7d1c4842017-10-27 09:17:28 +02002361 # Extract bug number from branch name.
2362 bug = options.bug
Dan Beamd8b04ca2019-10-10 21:23:26 +00002363 fixed = options.fixed
2364 match = re.match(r'(?P<type>bug|fix(?:e[sd])?)[_-]?(?P<bugnum>\d+)',
2365 self.GetBranch())
2366 if not bug and not fixed and match:
2367 if match.group('type') == 'bug':
2368 bug = match.group('bugnum')
2369 else:
2370 fixed = match.group('bugnum')
Dominic Battre7d1c4842017-10-27 09:17:28 +02002371
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002372 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002373 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002374 if self.GetIssue():
2375 # Try to get the message from a previous upload.
2376 message = self.GetDescription()
2377 if not message:
2378 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002379 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002380 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002381 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002382 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002383 # When uploading a subsequent patchset, -m|--message is taken
2384 # as the patchset title if --title was not provided.
2385 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002386 else:
2387 default_title = RunGit(
2388 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002389 if options.force:
2390 title = default_title
2391 else:
2392 title = ask_for_data(
2393 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 change_id = self._GetChangeDetail()['change_id']
2395 while True:
2396 footer_change_ids = git_footers.get_footer_change_id(message)
2397 if footer_change_ids == [change_id]:
2398 break
2399 if not footer_change_ids:
2400 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002401 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002402 continue
2403 # There is already a valid footer but with different or several ids.
2404 # Doing this automatically is non-trivial as we don't want to lose
2405 # existing other footers, yet we want to append just 1 desired
2406 # Change-Id. Thus, just create a new footer, but let user verify the
2407 # new description.
2408 message = '%s\n\nChange-Id: %s' % (message, change_id)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002409 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002410 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002411 print(
2412 'WARNING: change %s has Change-Id footer(s):\n'
2413 ' %s\n'
2414 'but change has Change-Id %s, according to Gerrit.\n'
2415 'Please, check the proposed correction to the description, '
2416 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2417 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2418 change_id))
2419 confirm_or_exit(action='edit')
2420 change_desc.prompt()
2421
2422 message = change_desc.description
2423 if not message:
2424 DieWithError("Description is empty. Aborting...")
2425
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002426 # Continue the while loop.
2427 # Sanity check of this code - we should end up with proper message
2428 # footer.
2429 assert [change_id] == git_footers.get_footer_change_id(message)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002430 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
Aaron Gableb56ad332017-01-06 15:24:31 -08002431 else: # if not self.GetIssue()
2432 if options.message:
2433 message = options.message
2434 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002435 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002436 if options.title:
2437 message = options.title + '\n\n' + message
Dan Beamd8b04ca2019-10-10 21:23:26 +00002438 change_desc = ChangeDescription(message, bug=bug, fixed=fixed)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002439 if not options.force:
Anthony Polito8b955342019-09-24 19:01:36 +00002440 change_desc.prompt()
2441
Aaron Gableb56ad332017-01-06 15:24:31 -08002442 # On first upload, patchset title is always this string, while
2443 # --title flag gets converted to first line of message.
2444 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002445 if not change_desc.description:
2446 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002447 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002448 if len(change_ids) > 1:
2449 DieWithError('too many Change-Id footers, at most 1 allowed.')
2450 if not change_ids:
2451 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002452 change_desc.set_description(git_footers.add_footer_change_id(
2453 change_desc.description,
2454 GenerateGerritChangeId(change_desc.description)))
2455 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002456 assert len(change_ids) == 1
2457 change_id = change_ids[0]
2458
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002459 if options.reviewers or options.tbrs or options.add_owners_to:
2460 change_desc.update_reviewers(options.reviewers, options.tbrs,
2461 options.add_owners_to, change)
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002462 if options.preserve_tryjobs:
2463 change_desc.set_preserve_tryjobs()
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002464
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002465 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002466 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2467 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002468 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002469 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2470 desc_tempfile.write(change_desc.description)
2471 desc_tempfile.close()
2472 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2473 '-F', desc_tempfile.name]).strip()
2474 os.remove(desc_tempfile.name)
Anthony Polito8b955342019-09-24 19:01:36 +00002475 else: # if not options.squash
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002476 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002477 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002478 if not change_desc.description:
2479 DieWithError("Description is empty. Aborting...")
2480
2481 if not git_footers.get_footer_change_id(change_desc.description):
2482 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002483 change_desc.set_description(
2484 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002485 if options.reviewers or options.tbrs or options.add_owners_to:
2486 change_desc.update_reviewers(options.reviewers, options.tbrs,
2487 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002488 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002489 # For no-squash mode, we assume the remote called "origin" is the one we
2490 # want. It is not worthwhile to support different workflows for
2491 # no-squash mode.
2492 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002493 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2494
2495 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002496 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002497 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2498 ref_to_push)]).splitlines()
2499 if len(commits) > 1:
2500 print('WARNING: This will upload %d commits. Run the following command '
2501 'to see which commits will be uploaded: ' % len(commits))
2502 print('git log %s..%s' % (parent, ref_to_push))
2503 print('You can also use `git squash-branch` to squash these into a '
2504 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002505 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002506
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002507 if options.reviewers or options.tbrs or options.add_owners_to:
2508 change_desc.update_reviewers(options.reviewers, options.tbrs,
2509 options.add_owners_to, change)
2510
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002511 reviewers = sorted(change_desc.get_reviewers())
Edward Lemur4508b422019-10-03 21:56:35 +00002512 cc = []
2513 # Add CCs from WATCHLISTS and rietveld.cc git config unless this is
2514 # the initial upload, the CL is private, or auto-CCing has ben disabled.
2515 if not (self.GetIssue() or options.private or options.no_autocc):
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002516 cc = self.GetCCList().split(',')
Edward Lemur4508b422019-10-03 21:56:35 +00002517 # Add cc's from the --cc flag.
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002518 if options.cc:
2519 cc.extend(options.cc)
2520 cc = filter(None, [email.strip() for email in cc])
2521 if change_desc.get_cced():
2522 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002523 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2524 valid_accounts = set(reviewers + cc)
2525 # TODO(crbug/877717): relax this for all hosts.
2526 else:
2527 valid_accounts = gerrit_util.ValidAccounts(
2528 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002529 logging.info('accounts %s are recognized, %s invalid',
2530 sorted(valid_accounts),
2531 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002532
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002533 # Extra options that can be specified at push time. Doc:
2534 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002535 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002536
Aaron Gable844cf292017-06-28 11:32:59 -07002537 # By default, new changes are started in WIP mode, and subsequent patchsets
2538 # don't send email. At any time, passing --send-mail will mark the change
2539 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002540 if options.send_mail:
2541 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002542 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002543 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002544 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002545 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002546 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002547
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002548 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002549 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002550
Aaron Gable9b713dd2016-12-14 16:04:21 -08002551 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002552 # Punctuation and whitespace in |title| must be percent-encoded.
2553 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002554
agablec6787972016-09-09 16:13:34 -07002555 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002556 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002557
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002558 for r in sorted(reviewers):
2559 if r in valid_accounts:
2560 refspec_opts.append('r=%s' % r)
2561 reviewers.remove(r)
2562 else:
2563 # TODO(tandrii): this should probably be a hard failure.
2564 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2565 % r)
2566 for c in sorted(cc):
2567 # refspec option will be rejected if cc doesn't correspond to an
2568 # account, even though REST call to add such arbitrary cc may succeed.
2569 if c in valid_accounts:
2570 refspec_opts.append('cc=%s' % c)
2571 cc.remove(c)
2572
rmistry9eadede2016-09-19 11:22:43 -07002573 if options.topic:
2574 # Documentation on Gerrit topics is here:
2575 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002576 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002577
Edward Lemur687ca902018-12-05 02:30:30 +00002578 if options.enable_auto_submit:
2579 refspec_opts.append('l=Auto-Submit+1')
2580 if options.use_commit_queue:
2581 refspec_opts.append('l=Commit-Queue+2')
2582 elif options.cq_dry_run:
2583 refspec_opts.append('l=Commit-Queue+1')
2584
2585 if change_desc.get_reviewers(tbr_only=True):
2586 score = gerrit_util.GetCodeReviewTbrScore(
2587 self._GetGerritHost(),
2588 self._GetGerritProject())
2589 refspec_opts.append('l=Code-Review+%s' % score)
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002590
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002591 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002592 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002593 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002594 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002595 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2596
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002597 refspec_suffix = ''
2598 if refspec_opts:
2599 refspec_suffix = '%' + ','.join(refspec_opts)
2600 assert ' ' not in refspec_suffix, (
2601 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2602 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2603
Edward Lemur1b52d872019-05-09 21:12:12 +00002604 git_push_metadata = {
2605 'gerrit_host': self._GetGerritHost(),
2606 'title': title or '<untitled>',
2607 'change_id': change_id,
2608 'description': change_desc.description,
2609 }
2610 push_stdout = self._RunGitPushWithTraces(
2611 change_desc, refspec, refspec_opts, git_push_metadata)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002612
2613 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07002614 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002615 change_numbers = [m.group(1)
2616 for m in map(regex.match, push_stdout.splitlines())
2617 if m]
2618 if len(change_numbers) != 1:
2619 DieWithError(
2620 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002621 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002622 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002623 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002624
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002625 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002626 # GetIssue() is not set in case of non-squash uploads according to tests.
2627 # TODO(agable): non-squash uploads in git cl should be removed.
2628 gerrit_util.AddReviewers(
2629 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002630 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002631 reviewers, cc,
2632 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002633
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002634 return 0
2635
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002636 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
2637 change_desc):
2638 """Computes parent of the generated commit to be uploaded to Gerrit.
2639
2640 Returns revision or a ref name.
2641 """
2642 if custom_cl_base:
2643 # Try to avoid creating additional unintended CLs when uploading, unless
2644 # user wants to take this risk.
2645 local_ref_of_target_remote = self.GetRemoteBranch()[1]
2646 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
2647 local_ref_of_target_remote])
2648 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002649 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002650 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
2651 'If you proceed with upload, more than 1 CL may be created by '
2652 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
2653 'If you are certain that specified base `%s` has already been '
2654 'uploaded to Gerrit as another CL, you may proceed.\n' %
2655 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
2656 if not force:
2657 confirm_or_exit(
2658 'Do you take responsibility for cleaning up potential mess '
2659 'resulting from proceeding with upload?',
2660 action='upload')
2661 return custom_cl_base
2662
Aaron Gablef97e33d2017-03-30 15:44:27 -07002663 if remote != '.':
2664 return self.GetCommonAncestorWithUpstream()
2665
2666 # If our upstream branch is local, we base our squashed commit on its
2667 # squashed version.
2668 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2669
Aaron Gablef97e33d2017-03-30 15:44:27 -07002670 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07002671 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07002672
2673 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002674 # TODO(tandrii): consider checking parent change in Gerrit and using its
2675 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
2676 # the tree hash of the parent branch. The upside is less likely bogus
2677 # requests to reupload parent change just because it's uploadhash is
2678 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07002679 parent = RunGit(['config',
2680 'branch.%s.gerritsquashhash' % upstream_branch_name],
2681 error_ok=True).strip()
2682 # Verify that the upstream branch has been uploaded too, otherwise
2683 # Gerrit will create additional CLs when uploading.
2684 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2685 RunGitSilent(['rev-parse', parent + ':'])):
2686 DieWithError(
2687 '\nUpload upstream branch %s first.\n'
2688 'It is likely that this branch has been rebased since its last '
2689 'upload, so you just need to upload it again.\n'
2690 '(If you uploaded it with --no-squash, then branch dependencies '
2691 'are not supported, and you should reupload with --squash.)'
2692 % upstream_branch_name,
2693 change_desc)
2694 return parent
2695
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002696 def _AddChangeIdToCommitMessage(self, options, args):
2697 """Re-commits using the current message, assumes the commit hook is in
2698 place.
2699 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002700 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002701 git_command = ['commit', '--amend', '-m', log_desc]
2702 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002703 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002704 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002705 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002706 return new_log_desc
2707 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002708 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002709
tandriie113dfd2016-10-11 10:20:12 -07002710 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002711 try:
2712 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08002713 except GerritChangeNotExists:
2714 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07002715
2716 if data['status'] in ('ABANDONED', 'MERGED'):
2717 return 'CL %s is closed' % self.GetIssue()
2718
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002719 def GetGerritChange(self, patchset=None):
2720 """Returns a buildbucket.v2.GerritChange message for the current issue."""
2721 host = urlparse.urlparse(self.GetCodereviewServer()).hostname
2722 issue = self.GetIssue()
Edward Lemur2c210a42019-09-16 23:58:35 +00002723 patchset = int(patchset or self.GetPatchset())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002724 data = self._GetChangeDetail(['ALL_REVISIONS'])
2725
2726 assert host and issue and patchset, 'CL must be uploaded first'
2727
2728 has_patchset = any(
2729 int(revision_data['_number']) == patchset
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00002730 for revision_data in data['revisions'].values())
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002731 if not has_patchset:
Aaron Gablea45ee112016-11-22 15:14:38 -08002732 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07002733 (patchset, self.GetIssue()))
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002734
tandrii8c5a3532016-11-04 07:52:02 -07002735 return {
Edward Lemurd4d1ba42019-09-20 21:46:37 +00002736 'host': host,
2737 'change': issue,
2738 'project': data['project'],
2739 'patchset': patchset,
tandrii8c5a3532016-11-04 07:52:02 -07002740 }
tandriie113dfd2016-10-11 10:20:12 -07002741
tandriide281ae2016-10-12 06:02:30 -07002742 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002743 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002744
Edward Lemur707d70b2018-02-07 00:50:14 +01002745 def GetReviewers(self):
2746 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
Mohamed Heikal171c0742018-11-09 20:38:51 +00002747 return [r['email'] for r in details['reviewers'].get('REVIEWER', [])]
Edward Lemur707d70b2018-02-07 00:50:14 +01002748
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002749
2750_CODEREVIEW_IMPLEMENTATIONS = {
Edward Lemur125d60a2019-09-13 18:25:41 +00002751 'gerrit': Changelist,
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002752}
2753
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002754
iannuccie53c9352016-08-17 14:40:40 -07002755def _add_codereview_issue_select_options(parser, extra=""):
2756 _add_codereview_select_options(parser)
2757
2758 text = ('Operate on this issue number instead of the current branch\'s '
2759 'implicit issue.')
2760 if extra:
2761 text += ' '+extra
2762 parser.add_option('-i', '--issue', type=int, help=text)
2763
2764
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002765def _add_codereview_select_options(parser):
Edward Lemurf38bc172019-09-03 21:02:13 +00002766 """Appends --gerrit option to force specific codereview."""
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002767 parser.codereview_group = optparse.OptionGroup(
Edward Lemurf38bc172019-09-03 21:02:13 +00002768 parser, 'DEPRECATED! Codereview override options')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002769 parser.add_option_group(parser.codereview_group)
2770 parser.codereview_group.add_option(
2771 '--gerrit', action='store_true',
Edward Lemurf38bc172019-09-03 21:02:13 +00002772 help='Deprecated. Noop. Do not use.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002773
2774
tandriif9aefb72016-07-01 09:06:51 -07002775def _get_bug_line_values(default_project, bugs):
2776 """Given default_project and comma separated list of bugs, yields bug line
2777 values.
2778
2779 Each bug can be either:
2780 * a number, which is combined with default_project
2781 * string, which is left as is.
2782
2783 This function may produce more than one line, because bugdroid expects one
2784 project per line.
2785
2786 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2787 ['v8:123', 'chromium:789']
2788 """
2789 default_bugs = []
2790 others = []
2791 for bug in bugs.split(','):
2792 bug = bug.strip()
2793 if bug:
2794 try:
2795 default_bugs.append(int(bug))
2796 except ValueError:
2797 others.append(bug)
2798
2799 if default_bugs:
2800 default_bugs = ','.join(map(str, default_bugs))
2801 if default_project:
2802 yield '%s:%s' % (default_project, default_bugs)
2803 else:
2804 yield default_bugs
2805 for other in sorted(others):
2806 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2807 yield other
2808
2809
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002810class ChangeDescription(object):
2811 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002812 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002813 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002814 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Dan Beamd8b04ca2019-10-10 21:23:26 +00002815 FIXED_LINE = r'^[ \t]*Fixed[ \t]*:[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01002816 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08002817 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
2818 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
2819 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
2820 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002821
Dan Beamd8b04ca2019-10-10 21:23:26 +00002822 def __init__(self, description, bug=None, fixed=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002823 self._description_lines = (description or '').strip().splitlines()
Anthony Polito8b955342019-09-24 19:01:36 +00002824 if bug:
2825 regexp = re.compile(self.BUG_LINE)
2826 prefix = settings.GetBugPrefix()
2827 if not any((regexp.match(line) for line in self._description_lines)):
2828 values = list(_get_bug_line_values(prefix, bug))
2829 self.append_footer('Bug: %s' % ', '.join(values))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002830 if fixed:
2831 regexp = re.compile(self.FIXED_LINE)
2832 prefix = settings.GetBugPrefix()
2833 if not any((regexp.match(line) for line in self._description_lines)):
2834 values = list(_get_bug_line_values(prefix, fixed))
2835 self.append_footer('Fixed: %s' % ', '.join(values))
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002836
agable@chromium.org42c20792013-09-12 17:34:49 +00002837 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08002838 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00002839 return '\n'.join(self._description_lines)
2840
2841 def set_description(self, desc):
2842 if isinstance(desc, basestring):
2843 lines = desc.splitlines()
2844 else:
2845 lines = [line.rstrip() for line in desc]
2846 while lines and not lines[0]:
2847 lines.pop(0)
2848 while lines and not lines[-1]:
2849 lines.pop(-1)
2850 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002851
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002852 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
2853 """Rewrites the R=/TBR= line(s) as a single line each.
2854
2855 Args:
2856 reviewers (list(str)) - list of additional emails to use for reviewers.
2857 tbrs (list(str)) - list of additional emails to use for TBRs.
2858 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
2859 the change that are missing OWNER coverage. If this is not None, you
2860 must also pass a value for `change`.
2861 change (Change) - The Change that should be used for OWNERS lookups.
2862 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002863 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002864 assert isinstance(tbrs, list), tbrs
2865
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002866 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07002867 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002868
2869 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002870 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002871
2872 reviewers = set(reviewers)
2873 tbrs = set(tbrs)
2874 LOOKUP = {
2875 'TBR': tbrs,
2876 'R': reviewers,
2877 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002878
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002879 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00002880 regexp = re.compile(self.R_LINE)
2881 matches = [regexp.match(line) for line in self._description_lines]
2882 new_desc = [l for i, l in enumerate(self._description_lines)
2883 if not matches[i]]
2884 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002885
agable@chromium.org42c20792013-09-12 17:34:49 +00002886 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002887
2888 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00002889 for match in matches:
2890 if not match:
2891 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002892 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
2893
2894 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002895 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00002896 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02002897 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002898 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07002899 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002900 LOOKUP[add_owners_to].update(
2901 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002902
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002903 # If any folks ended up in both groups, remove them from tbrs.
2904 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002905
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002906 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
2907 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00002908
2909 # Put the new lines in the description where the old first R= line was.
2910 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2911 if 0 <= line_loc < len(self._description_lines):
2912 if new_tbr_line:
2913 self._description_lines.insert(line_loc, new_tbr_line)
2914 if new_r_line:
2915 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002916 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002917 if new_r_line:
2918 self.append_footer(new_r_line)
2919 if new_tbr_line:
2920 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002921
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00002922 def set_preserve_tryjobs(self):
2923 """Ensures description footer contains 'Cq-Do-Not-Cancel-Tryjobs: true'."""
2924 footers = git_footers.parse_footers(self.description)
2925 for v in footers.get('Cq-Do-Not-Cancel-Tryjobs', []):
2926 if v.lower() == 'true':
2927 return
2928 self.append_footer('Cq-Do-Not-Cancel-Tryjobs: true')
2929
Anthony Polito8b955342019-09-24 19:01:36 +00002930 def prompt(self):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002931 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002932 self.set_description([
2933 '# Enter a description of the change.',
2934 '# This will be displayed on the codereview site.',
2935 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002936 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002937 '--------------------',
2938 ] + self._description_lines)
Dan Beamd8b04ca2019-10-10 21:23:26 +00002939 bug_regexp = re.compile(self.BUG_LINE)
2940 fixed_regexp = re.compile(self.FIXED_LINE)
Jonas Termansend0f79112019-03-22 15:28:26 +00002941 prefix = settings.GetBugPrefix()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002942 has_issue = lambda l: bug_regexp.match(l) or fixed_regexp.match(l)
2943 if not any((has_issue(line) for line in self._description_lines)):
Anthony Polito8b955342019-09-24 19:01:36 +00002944 self.append_footer('Bug: %s' % prefix)
tandriif9aefb72016-07-01 09:06:51 -07002945
agable@chromium.org42c20792013-09-12 17:34:49 +00002946 content = gclient_utils.RunEditor(self.description, True,
Anthony Polito8b955342019-09-24 19:01:36 +00002947 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002948 if not content:
2949 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002950 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002951
Bruce Dawson2377b012018-01-11 16:46:49 -08002952 # Strip off comments and default inserted "Bug:" line.
2953 clean_lines = [line.rstrip() for line in lines if not
Jonas Termansend0f79112019-03-22 15:28:26 +00002954 (line.startswith('#') or
2955 line.rstrip() == "Bug:" or
2956 line.rstrip() == "Bug: " + prefix)]
agable@chromium.org42c20792013-09-12 17:34:49 +00002957 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002958 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002959 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002960
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002961 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002962 """Adds a footer line to the description.
2963
2964 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2965 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2966 that Gerrit footers are always at the end.
2967 """
2968 parsed_footer_line = git_footers.parse_footer(line)
2969 if parsed_footer_line:
2970 # Line is a gerrit footer in the form: Footer-Key: any value.
2971 # Thus, must be appended observing Gerrit footer rules.
2972 self.set_description(
2973 git_footers.add_footer(self.description,
2974 key=parsed_footer_line[0],
2975 value=parsed_footer_line[1]))
2976 return
2977
2978 if not self._description_lines:
2979 self._description_lines.append(line)
2980 return
2981
2982 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2983 if gerrit_footers:
2984 # git_footers.split_footers ensures that there is an empty line before
2985 # actual (gerrit) footers, if any. We have to keep it that way.
2986 assert top_lines and top_lines[-1] == ''
2987 top_lines, separator = top_lines[:-1], top_lines[-1:]
2988 else:
2989 separator = [] # No need for separator if there are no gerrit_footers.
2990
2991 prev_line = top_lines[-1] if top_lines else ''
2992 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2993 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2994 top_lines.append('')
2995 top_lines.append(line)
2996 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002997
tandrii99a72f22016-08-17 14:33:24 -07002998 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002999 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003000 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003001 reviewers = [match.group(2).strip()
3002 for match in matches
3003 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003004 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003005
bradnelsond975b302016-10-23 12:20:23 -07003006 def get_cced(self):
3007 """Retrieves the list of reviewers."""
3008 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3009 cced = [match.group(2).strip() for match in matches if match]
3010 return cleanup_list(cced)
3011
Nodir Turakulov23b82142017-11-16 11:04:25 -08003012 def get_hash_tags(self):
3013 """Extracts and sanitizes a list of Gerrit hashtags."""
3014 subject = (self._description_lines or ('',))[0]
3015 subject = re.sub(
3016 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3017
3018 tags = []
3019 start = 0
3020 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3021 while True:
3022 m = bracket_exp.match(subject, start)
3023 if not m:
3024 break
3025 tags.append(self.sanitize_hash_tag(m.group(1)))
3026 start = m.end()
3027
3028 if not tags:
3029 # Try "Tag: " prefix.
3030 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3031 if m:
3032 tags.append(self.sanitize_hash_tag(m.group(1)))
3033 return tags
3034
3035 @classmethod
3036 def sanitize_hash_tag(cls, tag):
3037 """Returns a sanitized Gerrit hash tag.
3038
3039 A sanitized hashtag can be used as a git push refspec parameter value.
3040 """
3041 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3042
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003043 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3044 """Updates this commit description given the parent.
3045
3046 This is essentially what Gnumbd used to do.
3047 Consult https://goo.gl/WMmpDe for more details.
3048 """
3049 assert parent_msg # No, orphan branch creation isn't supported.
3050 assert parent_hash
3051 assert dest_ref
3052 parent_footer_map = git_footers.parse_footers(parent_msg)
3053 # This will also happily parse svn-position, which GnumbD is no longer
3054 # supporting. While we'd generate correct footers, the verifier plugin
3055 # installed in Gerrit will block such commit (ie git push below will fail).
3056 parent_position = git_footers.get_position(parent_footer_map)
3057
3058 # Cherry-picks may have last line obscuring their prior footers,
3059 # from git_footers perspective. This is also what Gnumbd did.
3060 cp_line = None
3061 if (self._description_lines and
3062 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3063 cp_line = self._description_lines.pop()
3064
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003065 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003066
3067 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3068 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003069 for i, line in enumerate(footer_lines):
3070 k, v = git_footers.parse_footer(line) or (None, None)
3071 if k and k.startswith('Cr-'):
3072 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003073
3074 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003075 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003076 if parent_position[0] == dest_ref:
3077 # Same branch as parent.
3078 number = int(parent_position[1]) + 1
3079 else:
3080 number = 1 # New branch, and extra lineage.
3081 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3082 int(parent_position[1])))
3083
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003084 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3085 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003086
3087 self._description_lines = top_lines
3088 if cp_line:
3089 self._description_lines.append(cp_line)
3090 if self._description_lines[-1] != '':
3091 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003092 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003093
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003094
Aaron Gablea1bab272017-04-11 16:38:18 -07003095def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003096 """Retrieves the reviewers that approved a CL from the issue properties with
3097 messages.
3098
3099 Note that the list may contain reviewers that are not committer, thus are not
3100 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003101
3102 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003103 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003104 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003105 return sorted(
3106 set(
3107 message['sender']
3108 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003109 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003110 )
3111 )
3112
3113
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003114def FindCodereviewSettingsFile(filename='codereview.settings'):
3115 """Finds the given file starting in the cwd and going up.
3116
3117 Only looks up to the top of the repository unless an
3118 'inherit-review-settings-ok' file exists in the root of the repository.
3119 """
3120 inherit_ok_file = 'inherit-review-settings-ok'
3121 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003122 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003123 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3124 root = '/'
3125 while True:
3126 if filename in os.listdir(cwd):
3127 if os.path.isfile(os.path.join(cwd, filename)):
3128 return open(os.path.join(cwd, filename))
3129 if cwd == root:
3130 break
3131 cwd = os.path.dirname(cwd)
3132
3133
3134def LoadCodereviewSettingsFromFile(fileobj):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003135 """Parses a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003136 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003137
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003138 def SetProperty(name, setting, unset_error_ok=False):
3139 fullname = 'rietveld.' + name
3140 if setting in keyvals:
3141 RunGit(['config', fullname, keyvals[setting]])
3142 else:
3143 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3144
tandrii48df5812016-10-17 03:55:37 -07003145 if not keyvals.get('GERRIT_HOST', False):
3146 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003147 # Only server setting is required. Other settings can be absent.
3148 # In that case, we ignore errors raised during option deletion attempt.
3149 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
3150 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3151 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003152 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003153 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3154 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003155 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3156 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003157
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003158 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003159 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003160
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003161 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003162 RunGit(['config', 'gerrit.squash-uploads',
3163 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003164
tandrii@chromium.org28253532016-04-14 13:46:56 +00003165 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003166 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003167 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3168
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003169 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003170 # should be of the form
3171 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3172 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003173 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3174 keyvals['ORIGIN_URL_CONFIG']])
3175
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003176
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003177def urlretrieve(source, destination):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003178 """Downloads a network object to a local file, like urllib.urlretrieve.
3179
3180 This is necessary because urllib is broken for SSL connections via a proxy.
3181 """
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003182 with open(destination, 'w') as f:
3183 f.write(urllib2.urlopen(source).read())
3184
3185
ukai@chromium.org712d6102013-11-27 00:52:58 +00003186def hasSheBang(fname):
3187 """Checks fname is a #! script."""
3188 with open(fname) as f:
3189 return f.read(2).startswith('#!')
3190
3191
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003192# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3193def DownloadHooks(*args, **kwargs):
3194 pass
3195
3196
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003197def DownloadGerritHook(force):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003198 """Downloads and installs a Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003199
3200 Args:
3201 force: True to update hooks. False to install hooks if not present.
3202 """
3203 if not settings.GetIsGerrit():
3204 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003205 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003206 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3207 if not os.access(dst, os.X_OK):
3208 if os.path.exists(dst):
3209 if not force:
3210 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003211 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003212 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003213 if not hasSheBang(dst):
3214 DieWithError('Not a script: %s\n'
3215 'You need to download from\n%s\n'
3216 'into .git/hooks/commit-msg and '
3217 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003218 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3219 except Exception:
3220 if os.path.exists(dst):
3221 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003222 DieWithError('\nFailed to download hooks.\n'
3223 'You need to download from\n%s\n'
3224 'into .git/hooks/commit-msg and '
3225 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003226
3227
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003228class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003229 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003230
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003231 _GOOGLESOURCE = 'googlesource.com'
3232
3233 def __init__(self):
3234 # Cached list of [host, identity, source], where source is either
3235 # .gitcookies or .netrc.
3236 self._all_hosts = None
3237
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003238 def ensure_configured_gitcookies(self):
3239 """Runs checks and suggests fixes to make git use .gitcookies from default
3240 path."""
3241 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3242 configured_path = RunGitSilent(
3243 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003244 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003245 if configured_path:
3246 self._ensure_default_gitcookies_path(configured_path, default)
3247 else:
3248 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003249
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003250 @staticmethod
3251 def _ensure_default_gitcookies_path(configured_path, default_path):
3252 assert configured_path
3253 if configured_path == default_path:
3254 print('git is already configured to use your .gitcookies from %s' %
3255 configured_path)
3256 return
3257
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003258 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003259 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3260 (configured_path, default_path))
3261
3262 if not os.path.exists(configured_path):
3263 print('However, your configured .gitcookies file is missing.')
3264 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3265 action='reconfigure')
3266 RunGit(['config', '--global', 'http.cookiefile', default_path])
3267 return
3268
3269 if os.path.exists(default_path):
3270 print('WARNING: default .gitcookies file already exists %s' %
3271 default_path)
3272 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3273 default_path)
3274
3275 confirm_or_exit('Move existing .gitcookies to default location?',
3276 action='move')
3277 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003278 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003279 print('Moved and reconfigured git to use .gitcookies from %s' %
3280 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003281
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003282 @staticmethod
3283 def _configure_gitcookies_path(default_path):
3284 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3285 if os.path.exists(netrc_path):
3286 print('You seem to be using outdated .netrc for git credentials: %s' %
3287 netrc_path)
3288 print('This tool will guide you through setting up recommended '
3289 '.gitcookies store for git credentials.\n'
3290 '\n'
3291 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3292 ' git config --global --unset http.cookiefile\n'
3293 ' mv %s %s.backup\n\n' % (default_path, default_path))
3294 confirm_or_exit(action='setup .gitcookies')
3295 RunGit(['config', '--global', 'http.cookiefile', default_path])
3296 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003297
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003298 def get_hosts_with_creds(self, include_netrc=False):
3299 if self._all_hosts is None:
3300 a = gerrit_util.CookiesAuthenticator()
3301 self._all_hosts = [
3302 (h, u, s)
3303 for h, u, s in itertools.chain(
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003304 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.items()),
3305 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.items())
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003306 )
3307 if h.endswith(self._GOOGLESOURCE)
3308 ]
3309
3310 if include_netrc:
3311 return self._all_hosts
3312 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3313
3314 def print_current_creds(self, include_netrc=False):
3315 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3316 if not hosts:
3317 print('No Git/Gerrit credentials found')
3318 return
3319 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3320 header = [('Host', 'User', 'Which file'),
3321 ['=' * l for l in lengths]]
3322 for row in (header + hosts):
3323 print('\t'.join((('%%+%ds' % l) % s)
3324 for l, s in zip(lengths, row)))
3325
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003326 @staticmethod
3327 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003328 """Parses identity "git-<username>.domain" into <username> and domain."""
3329 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003330 # distinguishable from sub-domains. But we do know typical domains:
3331 if identity.endswith('.chromium.org'):
3332 domain = 'chromium.org'
3333 username = identity[:-len('.chromium.org')]
3334 else:
3335 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003336 if username.startswith('git-'):
3337 username = username[len('git-'):]
3338 return username, domain
3339
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003340 def _canonical_git_googlesource_host(self, host):
3341 """Normalizes Gerrit hosts (with '-review') to Git host."""
3342 assert host.endswith(self._GOOGLESOURCE)
3343 # Prefix doesn't include '.' at the end.
3344 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3345 if prefix.endswith('-review'):
3346 prefix = prefix[:-len('-review')]
3347 return prefix + '.' + self._GOOGLESOURCE
3348
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003349 def _canonical_gerrit_googlesource_host(self, host):
3350 git_host = self._canonical_git_googlesource_host(host)
3351 prefix = git_host.split('.', 1)[0]
3352 return prefix + '-review.' + self._GOOGLESOURCE
3353
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003354 def _get_counterpart_host(self, host):
3355 assert host.endswith(self._GOOGLESOURCE)
3356 git = self._canonical_git_googlesource_host(host)
3357 gerrit = self._canonical_gerrit_googlesource_host(git)
3358 return git if gerrit == host else gerrit
3359
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003360 def has_generic_host(self):
3361 """Returns whether generic .googlesource.com has been configured.
3362
3363 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3364 """
3365 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3366 if host == '.' + self._GOOGLESOURCE:
3367 return True
3368 return False
3369
3370 def _get_git_gerrit_identity_pairs(self):
3371 """Returns map from canonic host to pair of identities (Git, Gerrit).
3372
3373 One of identities might be None, meaning not configured.
3374 """
3375 host_to_identity_pairs = {}
3376 for host, identity, _ in self.get_hosts_with_creds():
3377 canonical = self._canonical_git_googlesource_host(host)
3378 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3379 idx = 0 if canonical == host else 1
3380 pair[idx] = identity
3381 return host_to_identity_pairs
3382
3383 def get_partially_configured_hosts(self):
3384 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003385 (host if i1 else self._canonical_gerrit_googlesource_host(host))
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003386 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003387 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003388
3389 def get_conflicting_hosts(self):
3390 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003391 host
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003392 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().items()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003393 if None not in (i1, i2) and i1 != i2)
3394
3395 def get_duplicated_hosts(self):
3396 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003397 return set(host for host, count in counters.items() if count > 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003398
3399 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3400 'chromium.googlesource.com': 'chromium.org',
3401 'chrome-internal.googlesource.com': 'google.com',
3402 }
3403
3404 def get_hosts_with_wrong_identities(self):
3405 """Finds hosts which **likely** reference wrong identities.
3406
3407 Note: skips hosts which have conflicting identities for Git and Gerrit.
3408 """
3409 hosts = set()
Marc-Antoine Ruel8e57b4b2019-10-11 01:01:36 +00003410 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.items():
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003411 pair = self._get_git_gerrit_identity_pairs().get(host)
3412 if pair and pair[0] == pair[1]:
3413 _, domain = self._parse_identity(pair[0])
3414 if domain != expected:
3415 hosts.add(host)
3416 return hosts
3417
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003418 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003419 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003420 hosts = sorted(hosts)
3421 assert hosts
3422 if extra_column_func is None:
3423 extras = [''] * len(hosts)
3424 else:
3425 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003426 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3427 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003428 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003429 lines.append(tmpl % he)
3430 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003431
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003432 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003433 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003434 yield ('.googlesource.com wildcard record detected',
3435 ['Chrome Infrastructure team recommends to list full host names '
3436 'explicitly.'],
3437 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003438
3439 dups = self.get_duplicated_hosts()
3440 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003441 yield ('The following hosts were defined twice',
3442 self._format_hosts(dups),
3443 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003444
3445 partial = self.get_partially_configured_hosts()
3446 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003447 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3448 'These hosts are missing',
3449 self._format_hosts(partial, lambda host: 'but %s defined' %
3450 self._get_counterpart_host(host)),
3451 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003452
3453 conflicting = self.get_conflicting_hosts()
3454 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003455 yield ('The following Git hosts have differing credentials from their '
3456 'Gerrit counterparts',
3457 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3458 tuple(self._get_git_gerrit_identity_pairs()[host])),
3459 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003460
3461 wrong = self.get_hosts_with_wrong_identities()
3462 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003463 yield ('These hosts likely use wrong identity',
3464 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3465 (self._get_git_gerrit_identity_pairs()[host][0],
3466 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3467 wrong)
3468
3469 def find_and_report_problems(self):
3470 """Returns True if there was at least one problem, else False."""
3471 found = False
3472 bad_hosts = set()
3473 for title, sublines, hosts in self._find_problems():
3474 if not found:
3475 found = True
3476 print('\n\n.gitcookies problem report:\n')
3477 bad_hosts.update(hosts or [])
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003478 print(' %s%s' % (title, (':' if sublines else '')))
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003479 if sublines:
3480 print()
3481 print(' %s' % '\n '.join(sublines))
3482 print()
3483
3484 if bad_hosts:
3485 assert found
3486 print(' You can manually remove corresponding lines in your %s file and '
3487 'visit the following URLs with correct account to generate '
3488 'correct credential lines:\n' %
3489 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3490 print(' %s' % '\n '.join(sorted(set(
3491 gerrit_util.CookiesAuthenticator().get_new_password_url(
3492 self._canonical_git_googlesource_host(host))
3493 for host in bad_hosts
3494 ))))
3495 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003496
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003497
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003498@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003499def CMDcreds_check(parser, args):
3500 """Checks credentials and suggests changes."""
3501 _, _ = parser.parse_args(args)
3502
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003503 # Code below checks .gitcookies. Abort if using something else.
3504 authn = gerrit_util.Authenticator.get()
3505 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3506 if isinstance(authn, gerrit_util.GceAuthenticator):
3507 DieWithError(
3508 'This command is not designed for GCE, are you on a bot?\n'
3509 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3510 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003511 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003512 'This command is not designed for bot environment. It checks '
3513 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003514
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003515 checker = _GitCookiesChecker()
3516 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003517
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003518 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003519 checker.print_current_creds(include_netrc=True)
3520
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003521 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003522 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003523 return 0
3524 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003525
3526
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003527@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003528def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003529 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003530 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3531 branch = ShortBranchName(branchref)
3532 _, args = parser.parse_args(args)
3533 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003534 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003535 return RunGit(['config', 'branch.%s.base-url' % branch],
3536 error_ok=False).strip()
3537 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003538 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003539 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3540 error_ok=False).strip()
3541
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003542
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003543def color_for_status(status):
3544 """Maps a Changelist status to color, for CMDstatus and other tools."""
3545 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003546 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003547 'waiting': Fore.BLUE,
3548 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003549 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003550 'lgtm': Fore.GREEN,
3551 'commit': Fore.MAGENTA,
3552 'closed': Fore.CYAN,
3553 'error': Fore.WHITE,
3554 }.get(status, Fore.WHITE)
3555
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003556
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003557def get_cl_statuses(changes, fine_grained, max_processes=None):
3558 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003559
3560 If fine_grained is true, this will fetch CL statuses from the server.
3561 Otherwise, simply indicate if there's a matching url for the given branches.
3562
3563 If max_processes is specified, it is used as the maximum number of processes
3564 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3565 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003566
3567 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003568 """
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003569 if not changes:
3570 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003571
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003572 if not fine_grained:
3573 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003574 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003575 for cl in changes:
3576 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003577 return
3578
3579 # First, sort out authentication issues.
3580 logging.debug('ensuring credentials exist')
3581 for cl in changes:
3582 cl.EnsureAuthenticated(force=False, refresh=True)
3583
3584 def fetch(cl):
3585 try:
3586 return (cl, cl.GetStatus())
3587 except:
3588 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07003589 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003590 raise
3591
3592 threads_count = len(changes)
3593 if max_processes:
3594 threads_count = max(1, min(threads_count, max_processes))
3595 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3596
3597 pool = ThreadPool(threads_count)
3598 fetched_cls = set()
3599 try:
3600 it = pool.imap_unordered(fetch, changes).__iter__()
3601 while True:
3602 try:
3603 cl, status = it.next(timeout=5)
3604 except multiprocessing.TimeoutError:
3605 break
3606 fetched_cls.add(cl)
3607 yield cl, status
3608 finally:
3609 pool.close()
3610
3611 # Add any branches that failed to fetch.
3612 for cl in set(changes) - fetched_cls:
3613 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003614
rmistry@google.com2dd99862015-06-22 12:22:18 +00003615
3616def upload_branch_deps(cl, args):
3617 """Uploads CLs of local branches that are dependents of the current branch.
3618
3619 If the local branch dependency tree looks like:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003620
3621 test1 -> test2.1 -> test3.1
3622 -> test3.2
3623 -> test2.2 -> test3.3
rmistry@google.com2dd99862015-06-22 12:22:18 +00003624
3625 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3626 run on the dependent branches in this order:
3627 test2.1, test3.1, test3.2, test2.2, test3.3
3628
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003629 Note: This function does not rebase your local dependent branches. Use it
3630 when you make a change to the parent branch that will not conflict
3631 with its dependent branches, and you would like their dependencies
3632 updated in Rietveld.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003633 """
3634 if git_common.is_dirty_git_tree('upload-branch-deps'):
3635 return 1
3636
3637 root_branch = cl.GetBranch()
3638 if root_branch is None:
3639 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3640 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00003641 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00003642 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3643 'patchset dependencies without an uploaded CL.')
3644
3645 branches = RunGit(['for-each-ref',
3646 '--format=%(refname:short) %(upstream:short)',
3647 'refs/heads'])
3648 if not branches:
3649 print('No local branches found.')
3650 return 0
3651
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003652 # Create a dictionary of all local branches to the branches that are
3653 # dependent on it.
rmistry@google.com2dd99862015-06-22 12:22:18 +00003654 tracked_to_dependents = collections.defaultdict(list)
3655 for b in branches.splitlines():
3656 tokens = b.split()
3657 if len(tokens) == 2:
3658 branch_name, tracked = tokens
3659 tracked_to_dependents[tracked].append(branch_name)
3660
vapiera7fbd5a2016-06-16 09:17:49 -07003661 print()
3662 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003663 dependents = []
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003664
rmistry@google.com2dd99862015-06-22 12:22:18 +00003665 def traverse_dependents_preorder(branch, padding=''):
3666 dependents_to_process = tracked_to_dependents.get(branch, [])
3667 padding += ' '
3668 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003670 dependents.append(dependent)
3671 traverse_dependents_preorder(dependent, padding)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00003672
rmistry@google.com2dd99862015-06-22 12:22:18 +00003673 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003674 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003675
3676 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003677 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003678 return 0
3679
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003680 confirm_or_exit('This command will checkout all dependent branches and run '
3681 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003682
rmistry@google.com2dd99862015-06-22 12:22:18 +00003683 # Record all dependents that failed to upload.
3684 failures = {}
3685 # Go through all dependents, checkout the branch and upload.
3686 try:
3687 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003688 print()
3689 print('--------------------------------------')
3690 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003691 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003692 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003693 try:
3694 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003695 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003696 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003697 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003698 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003699 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003700 finally:
3701 # Swap back to the original root branch.
3702 RunGit(['checkout', '-q', root_branch])
3703
vapiera7fbd5a2016-06-16 09:17:49 -07003704 print()
3705 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003706 for dependent_branch in dependents:
3707 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003708 print(' %s : %s' % (dependent_branch, upload_status))
3709 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003710
3711 return 0
3712
3713
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003714@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07003715def CMDarchive(parser, args):
3716 """Archives and deletes branches associated with closed changelists."""
3717 parser.add_option(
3718 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003719 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003720 parser.add_option(
3721 '-f', '--force', action='store_true',
3722 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003723 parser.add_option(
3724 '-d', '--dry-run', action='store_true',
3725 help='Skip the branch tagging and removal steps.')
3726 parser.add_option(
3727 '-t', '--notags', action='store_true',
3728 help='Do not tag archived branches. '
3729 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003730
kmarshall3bff56b2016-06-06 18:31:47 -07003731 options, args = parser.parse_args(args)
3732 if args:
3733 parser.error('Unsupported args: %s' % ' '.join(args))
kmarshall3bff56b2016-06-06 18:31:47 -07003734
3735 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3736 if not branches:
3737 return 0
3738
vapiera7fbd5a2016-06-16 09:17:49 -07003739 print('Finding all branches associated with closed issues...')
Edward Lemur934836a2019-09-09 20:16:54 +00003740 changes = [Changelist(branchref=b)
3741 for b in branches.splitlines()]
kmarshall3bff56b2016-06-06 18:31:47 -07003742 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3743 statuses = get_cl_statuses(changes,
3744 fine_grained=True,
3745 max_processes=options.maxjobs)
3746 proposal = [(cl.GetBranch(),
3747 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3748 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00003749 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07003750 proposal.sort()
3751
3752 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003753 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003754 return 0
3755
3756 current_branch = GetCurrentBranch()
3757
vapiera7fbd5a2016-06-16 09:17:49 -07003758 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003759 if options.notags:
3760 for next_item in proposal:
3761 print(' ' + next_item[0])
3762 else:
3763 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3764 for next_item in proposal:
3765 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003766
kmarshall9249e012016-08-23 12:02:16 -07003767 # Quit now on precondition failure or if instructed by the user, either
3768 # via an interactive prompt or by command line flags.
3769 if options.dry_run:
3770 print('\nNo changes were made (dry run).\n')
3771 return 0
3772 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003773 print('You are currently on a branch \'%s\' which is associated with a '
3774 'closed codereview issue, so archive cannot proceed. Please '
3775 'checkout another branch and run this command again.' %
3776 current_branch)
3777 return 1
kmarshall9249e012016-08-23 12:02:16 -07003778 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003779 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3780 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003781 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003782 return 1
3783
3784 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003785 if not options.notags:
3786 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003787 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003788
vapiera7fbd5a2016-06-16 09:17:49 -07003789 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003790
3791 return 0
3792
3793
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003794@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003795def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003796 """Show status of changelists.
3797
3798 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003799 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07003800 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003801 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07003802 - Red 'not LGTM'ed
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00003803 - Magenta in the CQ
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003804 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07003805 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003806
3807 Also see 'git cl comments'.
3808 """
Alan Cuttera3be9a52019-03-04 18:50:33 +00003809 parser.add_option(
3810 '--no-branch-color',
3811 action='store_true',
3812 help='Disable colorized branch names')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003813 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003814 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003815 parser.add_option('-f', '--fast', action='store_true',
3816 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003817 parser.add_option(
3818 '-j', '--maxjobs', action='store', type=int,
3819 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003820
iannuccie53c9352016-08-17 14:40:40 -07003821 _add_codereview_issue_select_options(
3822 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003823 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003824 if args:
3825 parser.error('Unsupported args: %s' % args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003826
iannuccie53c9352016-08-17 14:40:40 -07003827 if options.issue is not None and not options.field:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00003828 parser.error('--field must be specified with --issue.')
iannucci3c972b92016-08-17 13:24:10 -07003829
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003830 if options.field:
Edward Lemur934836a2019-09-09 20:16:54 +00003831 cl = Changelist(issue=options.issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003832 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003833 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003834 elif options.field == 'id':
3835 issueid = cl.GetIssue()
3836 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003837 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003838 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08003839 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003840 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003841 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003842 elif options.field == 'status':
3843 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003844 elif options.field == 'url':
3845 url = cl.GetIssueURL()
3846 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003847 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003848 return 0
3849
3850 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3851 if not branches:
3852 print('No local branch found.')
3853 return 0
3854
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003855 changes = [
Edward Lemur934836a2019-09-09 20:16:54 +00003856 Changelist(branchref=b)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003857 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003858 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003859 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003860 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003861 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003862
Daniel McArdlea23bf592019-02-12 00:25:12 +00003863 current_branch = GetCurrentBranch()
3864
3865 def FormatBranchName(branch, colorize=False):
3866 """Simulates 'git branch' behavior. Colorizes and prefixes branch name with
3867 an asterisk when it is the current branch."""
3868
3869 asterisk = ""
3870 color = Fore.RESET
3871 if branch == current_branch:
3872 asterisk = "* "
3873 color = Fore.GREEN
3874 branch_name = ShortBranchName(branch)
3875
3876 if colorize:
3877 return asterisk + color + branch_name + Fore.RESET
Daniel McArdle452a49f2019-02-14 17:28:31 +00003878 return asterisk + branch_name
3879
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003880 branch_statuses = {}
Daniel McArdlea23bf592019-02-12 00:25:12 +00003881
3882 alignment = max(5, max(len(FormatBranchName(c.GetBranch())) for c in changes))
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003883 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3884 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003885 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003886 c, status = output.next()
3887 branch_statuses[c.GetBranch()] = status
3888 status = branch_statuses.pop(branch)
3889 url = cl.GetIssueURL()
3890 if url and (not status or status == 'error'):
3891 # The issue probably doesn't exist anymore.
3892 url += ' (broken)'
3893
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003894 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003895 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003896 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003897 color = ''
3898 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003899 status_str = '(%s)' % status if status else ''
Daniel McArdle452a49f2019-02-14 17:28:31 +00003900
Alan Cuttera3be9a52019-03-04 18:50:33 +00003901 branch_display = FormatBranchName(branch)
3902 padding = ' ' * (alignment - len(branch_display))
3903 if not options.no_branch_color:
3904 branch_display = FormatBranchName(branch, colorize=True)
Daniel McArdle452a49f2019-02-14 17:28:31 +00003905
Alan Cuttera3be9a52019-03-04 18:50:33 +00003906 print(' %s : %s%s %s%s' % (padding + branch_display, color, url,
3907 status_str, reset))
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003908
vapiera7fbd5a2016-06-16 09:17:49 -07003909 print()
Daniel McArdlea23bf592019-02-12 00:25:12 +00003910 print('Current branch: %s' % current_branch)
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003911 for cl in changes:
Daniel McArdlea23bf592019-02-12 00:25:12 +00003912 if cl.GetBranch() == current_branch:
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01003913 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003914 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003915 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003916 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003917 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003918 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003919 print('Issue description:')
3920 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003921 return 0
3922
3923
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003924def colorize_CMDstatus_doc():
3925 """To be called once in main() to add colors to git cl status help."""
3926 colors = [i for i in dir(Fore) if i[0].isupper()]
3927
3928 def colorize_line(line):
3929 for color in colors:
3930 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003931 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003932 indent = len(line) - len(line.lstrip(' ')) + 1
3933 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3934 return line
3935
3936 lines = CMDstatus.__doc__.splitlines()
3937 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3938
3939
phajdan.jre328cf92016-08-22 04:12:17 -07003940def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07003941 if path == '-':
3942 json.dump(contents, sys.stdout)
3943 else:
3944 with open(path, 'w') as f:
3945 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07003946
3947
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003948@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003949@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003950def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003951 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003952
3953 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003954 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003955 parser.add_option('-r', '--reverse', action='store_true',
3956 help='Lookup the branch(es) for the specified issues. If '
3957 'no issues are specified, all branches with mapped '
3958 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07003959 parser.add_option('--json',
3960 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003961 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003962 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003963
dnj@chromium.org406c4402015-03-03 17:22:28 +00003964 if options.reverse:
3965 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08003966 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00003967 # Reverse issue lookup.
3968 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003969
3970 git_config = {}
3971 for config in RunGit(['config', '--get-regexp',
3972 r'branch\..*issue']).splitlines():
3973 name, _space, val = config.partition(' ')
3974 git_config[name] = val
3975
dnj@chromium.org406c4402015-03-03 17:22:28 +00003976 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00003977 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
3978 config_key = _git_branch_config_key(ShortBranchName(branch),
3979 cls.IssueConfigKey())
3980 issue = git_config.get(config_key)
3981 if issue:
3982 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003983 if not args:
3984 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003985 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003986 for issue in args:
Lei Zhang5a368d42019-03-25 23:18:19 +00003987 try:
3988 issue_num = int(issue)
3989 except ValueError:
3990 print('ERROR cannot parse issue number: %s' % issue, file=sys.stderr)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003991 continue
Lei Zhang5a368d42019-03-25 23:18:19 +00003992 result[issue_num] = issue_branch_map.get(issue_num)
vapiera7fbd5a2016-06-16 09:17:49 -07003993 print('Branch for issue number %s: %s' % (
Lei Zhang5a368d42019-03-25 23:18:19 +00003994 issue, ', '.join(issue_branch_map.get(issue_num) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003995 if options.json:
3996 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07003997 return 0
3998
3999 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004000 issue = ParseIssueNumberArgument(args[0])
Aaron Gable78753da2017-06-15 10:35:49 -07004001 if not issue.valid:
4002 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4003 'or no argument to list it.\n'
4004 'Maybe you want to run git cl status?')
Edward Lemurf38bc172019-09-03 21:02:13 +00004005 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004006 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004007 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004008 cl = Changelist()
Aaron Gable78753da2017-06-15 10:35:49 -07004009 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4010 if options.json:
4011 write_json(options.json, {
4012 'issue': cl.GetIssue(),
4013 'issue_url': cl.GetIssueURL(),
4014 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004015 return 0
4016
4017
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004018@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004019def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004020 """Shows or posts review comments for any changelist."""
4021 parser.add_option('-a', '--add-comment', dest='comment',
4022 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004023 parser.add_option('-p', '--publish', action='store_true',
4024 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004025 parser.add_option('-i', '--issue', dest='issue',
Edward Lemurf38bc172019-09-03 21:02:13 +00004026 help='review issue id (defaults to current issue).')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004027 parser.add_option('-m', '--machine-readable', dest='readable',
4028 action='store_false', default=True,
4029 help='output comments in a format compatible with '
4030 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004031 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004032 help='File to write JSON summary to, or "-" for stdout')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004033 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004034 options, args = parser.parse_args(args)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004035
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004036 issue = None
4037 if options.issue:
4038 try:
4039 issue = int(options.issue)
4040 except ValueError:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004041 DieWithError('A review issue ID is expected to be a number.')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004042
Edward Lemur934836a2019-09-09 20:16:54 +00004043 cl = Changelist(issue=issue)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004044
4045 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004046 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004047 return 0
4048
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004049 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4050 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004051 for comment in summary:
4052 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004053 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004054 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004055 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004056 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004057 color = Fore.MAGENTA
Quinten Yearsley0e617c02019-02-20 00:37:03 +00004058 elif comment.autogenerated:
4059 color = Fore.CYAN
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004060 else:
4061 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004062 print('\n%s%s %s%s\n%s' % (
4063 color,
4064 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4065 comment.sender,
4066 Fore.RESET,
4067 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4068
smut@google.comc85ac942015-09-15 16:34:43 +00004069 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004070 def pre_serialize(c):
4071 dct = c.__dict__.copy()
4072 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4073 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004074 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004075 return 0
4076
4077
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004078@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004079@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004080def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004081 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004082 parser.add_option('-d', '--display', action='store_true',
4083 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004084 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004085 help='New description to set for this issue (- for stdin, '
4086 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004087 parser.add_option('-f', '--force', action='store_true',
4088 help='Delete any unpublished Gerrit edits for this issue '
4089 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004090
4091 _add_codereview_select_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004092 options, args = parser.parse_args(args)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004093
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004094 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004095 if len(args) > 0:
Edward Lemurf38bc172019-09-03 21:02:13 +00004096 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004097 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004098 parser.error('Invalid issue ID or URL.')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004099
Edward Lemur934836a2019-09-09 20:16:54 +00004100 kwargs = {}
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004101 if target_issue_arg:
4102 kwargs['issue'] = target_issue_arg.issue
4103 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004104
4105 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004106 if not cl.GetIssue():
4107 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004108
Edward Lemur678a6842019-10-03 22:25:05 +00004109 if args and not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004110 logging.info('canonical issue/change URL: %s\n', cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004111
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004112 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004113
smut@google.com34fb6b12015-07-13 20:03:26 +00004114 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004115 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004116 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004117
4118 if options.new_description:
4119 text = options.new_description
4120 if text == '-':
4121 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004122 elif text == '+':
4123 base_branch = cl.GetCommonAncestorWithUpstream()
4124 change = cl.GetChange(base_branch, None, local_description=True)
4125 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004126
4127 description.set_description(text)
4128 else:
Edward Lemurf38bc172019-09-03 21:02:13 +00004129 description.prompt()
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004130 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004131 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004132 return 0
4133
4134
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004135@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004136def CMDlint(parser, args):
4137 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004138 parser.add_option('--filter', action='append', metavar='-x,+y',
4139 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004140 options, args = parser.parse_args(args)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004141
4142 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004143 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004144 try:
4145 import cpplint
4146 import cpplint_chromium
4147 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004148 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004149 return 1
4150
4151 # Change the current working directory before calling lint so that it
4152 # shows the correct base.
4153 previous_cwd = os.getcwd()
4154 os.chdir(settings.GetRoot())
4155 try:
Edward Lemur934836a2019-09-09 20:16:54 +00004156 cl = Changelist()
thestig@chromium.org44202a22014-03-11 19:22:18 +00004157 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4158 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004159 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004160 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004161 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004162
4163 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004164 command = args + files
4165 if options.filter:
4166 command = ['--filter=' + ','.join(options.filter)] + command
4167 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004168
4169 white_regex = re.compile(settings.GetLintRegex())
4170 black_regex = re.compile(settings.GetLintIgnoreRegex())
4171 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4172 for filename in filenames:
4173 if white_regex.match(filename):
4174 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004175 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004176 else:
4177 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4178 extra_check_functions)
4179 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004180 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004181 finally:
4182 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004183 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004184 if cpplint._cpplint_state.error_count != 0:
4185 return 1
4186 return 0
4187
4188
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004189@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004190def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004191 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004192 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004193 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004194 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004195 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004196 parser.add_option('--all', action='store_true',
4197 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004198 parser.add_option('--parallel', action='store_true',
4199 help='Run all tests specified by input_api.RunTests in all '
4200 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004201 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004202
sbc@chromium.org71437c02015-04-09 19:29:40 +00004203 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004204 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004205 return 1
4206
Edward Lemur934836a2019-09-09 20:16:54 +00004207 cl = Changelist()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004208 if args:
4209 base_branch = args[0]
4210 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004211 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004212 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004213
Aaron Gable8076c282017-11-29 14:39:41 -08004214 if options.all:
4215 base_change = cl.GetChange(base_branch, None)
4216 files = [('M', f) for f in base_change.AllFiles()]
4217 change = presubmit_support.GitChange(
4218 base_change.Name(),
4219 base_change.FullDescriptionText(),
4220 base_change.RepositoryRoot(),
4221 files,
4222 base_change.issue,
4223 base_change.patchset,
4224 base_change.author_email,
4225 base_change._upstream)
4226 else:
4227 change = cl.GetChange(base_branch, None)
4228
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004229 cl.RunHook(
4230 committing=not options.upload,
4231 may_prompt=False,
4232 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004233 change=change,
4234 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004235 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004236
4237
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004238def GenerateGerritChangeId(message):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004239 """Returns the Change ID footer value (Ixxxxxx...xxx).
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004240
4241 Works the same way as
4242 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4243 but can be called on demand on all platforms.
4244
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004245 The basic idea is to generate git hash of a state of the tree, original
4246 commit message, author/committer info and timestamps.
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004247 """
4248 lines = []
4249 tree_hash = RunGitSilent(['write-tree'])
4250 lines.append('tree %s' % tree_hash.strip())
4251 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4252 if code == 0:
4253 lines.append('parent %s' % parent.strip())
4254 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4255 lines.append('author %s' % author.strip())
4256 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4257 lines.append('committer %s' % committer.strip())
4258 lines.append('')
4259 # Note: Gerrit's commit-hook actually cleans message of some lines and
4260 # whitespace. This code is not doing this, but it clearly won't decrease
4261 # entropy.
4262 lines.append(message)
4263 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
Raul Tambreb946b232019-03-26 14:48:46 +00004264 stdin=('\n'.join(lines)).encode())
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004265 return 'I%s' % change_hash.strip()
4266
4267
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004268def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004269 """Computes the remote branch ref to use for the CL.
4270
4271 Args:
4272 remote (str): The git remote for the CL.
4273 remote_branch (str): The git remote branch for the CL.
4274 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004275 """
4276 if not (remote and remote_branch):
4277 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004278
wittman@chromium.org455dc922015-01-26 20:15:50 +00004279 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004280 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004281 # refs, which are then translated into the remote full symbolic refs
4282 # below.
4283 if '/' not in target_branch:
4284 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4285 else:
4286 prefix_replacements = (
4287 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4288 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4289 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4290 )
4291 match = None
4292 for regex, replacement in prefix_replacements:
4293 match = re.search(regex, target_branch)
4294 if match:
4295 remote_branch = target_branch.replace(match.group(0), replacement)
4296 break
4297 if not match:
4298 # This is a branch path but not one we recognize; use as-is.
4299 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004300 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4301 # Handle the refs that need to land in different refs.
4302 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004303
wittman@chromium.org455dc922015-01-26 20:15:50 +00004304 # Create the true path to the remote branch.
4305 # Does the following translation:
4306 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4307 # * refs/remotes/origin/master -> refs/heads/master
4308 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4309 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4310 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4311 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4312 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4313 'refs/heads/')
4314 elif remote_branch.startswith('refs/remotes/branch-heads'):
4315 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004316
wittman@chromium.org455dc922015-01-26 20:15:50 +00004317 return remote_branch
4318
4319
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004320def cleanup_list(l):
4321 """Fixes a list so that comma separated items are put as individual items.
4322
4323 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4324 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4325 """
4326 items = sum((i.split(',') for i in l), [])
4327 stripped_items = (i.strip() for i in items)
4328 return sorted(filter(None, stripped_items))
4329
4330
Aaron Gable4db38df2017-11-03 14:59:07 -07004331@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004332@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004333def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004334 """Uploads the current changelist to codereview.
4335
4336 Can skip dependency patchset uploads for a branch by running:
4337 git config branch.branch_name.skip-deps-uploads True
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004338 To unset, run:
rmistry@google.com78948ed2015-07-08 23:09:57 +00004339 git config --unset branch.branch_name.skip-deps-uploads
4340 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004341
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004342 If the name of the checked out branch starts with "bug-" or "fix-" followed
4343 by a bug number, this bug number is automatically populated in the CL
Dominic Battre7d1c4842017-10-27 09:17:28 +02004344 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004345
4346 If subject contains text in square brackets or has "<text>: " prefix, such
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004347 text(s) is treated as Gerrit hashtags. For example, CLs with subjects:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004348 [git-cl] add support for hashtags
4349 Foo bar: implement foo
4350 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004351 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004352 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4353 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004354 parser.add_option('--bypass-watchlists', action='store_true',
4355 dest='bypass_watchlists',
4356 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004357 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004358 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004359 parser.add_option('--message', '-m', dest='message',
4360 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004361 parser.add_option('-b', '--bug',
4362 help='pre-populate the bug number(s) for this issue. '
4363 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004364 parser.add_option('--message-file', dest='message_file',
4365 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004366 parser.add_option('--title', '-t', dest='title',
4367 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004368 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004369 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004370 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004371 parser.add_option('--tbrs',
4372 action='append', default=[],
4373 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004374 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004375 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004376 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004377 parser.add_option('--hashtag', dest='hashtags',
4378 action='append', default=[],
4379 help=('Gerrit hashtag for new CL; '
4380 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004381 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004382 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004383 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004384 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004385 metavar='TARGET',
4386 help='Apply CL to remote ref TARGET. ' +
4387 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004388 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004389 help='Squash multiple commits into one')
Mike Frysingera989d552019-08-14 20:51:23 +00004390 parser.add_option('--no-squash', action='store_false', dest='squash',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004391 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004392 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004393 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004394 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4395 const='TBR', help='add a set of OWNERS to TBR')
4396 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4397 const='R', help='add a set of OWNERS to R')
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004398 parser.add_option('-c', '--use-commit-queue', action='store_true',
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004399 default=False,
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004400 help='tell the CQ to commit this patchset; '
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004401 'implies --send-mail')
4402 parser.add_option('-d', '--cq-dry-run',
4403 action='store_true', default=False,
rmistry@google.comef966222015-04-07 11:15:01 +00004404 help='Send the patchset to do a CQ dry run right after '
4405 'upload.')
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +00004406 parser.add_option('--preserve-tryjobs', action='store_true',
4407 help='instruct the CQ to let tryjobs running even after '
4408 'new patchsets are uploaded instead of canceling '
4409 'prior patchset\' tryjobs')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004410 parser.add_option('--dependencies', action='store_true',
4411 help='Uploads CLs of all the local branches that depend on '
4412 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004413 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4414 help='Sends your change to the CQ after an approval. Only '
4415 'works on repos that have the Auto-Submit label '
4416 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004417 parser.add_option('--parallel', action='store_true',
4418 help='Run all tests specified by input_api.RunTests in all '
4419 'PRESUBMIT files in parallel.')
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004420 parser.add_option('--no-autocc', action='store_true',
4421 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004422 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004423 help='Set the review private. This implies --no-autocc.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004424 parser.add_option('-R', '--retry-failed', action='store_true',
4425 help='Retry failed tryjobs from old patchset immediately '
4426 'after uploading new patchset. Cannot be used with '
4427 '--use-commit-queue or --cq-dry-run.')
4428 parser.add_option('--buildbucket-host', default='cr-buildbucket.appspot.com',
4429 help='Host of buildbucket. The default host is %default.')
Dan Beamd8b04ca2019-10-10 21:23:26 +00004430 parser.add_option('--fixed', '-x',
4431 help='List of bugs that will be commented on and marked '
4432 'fixed (pre-populates "Fixed:" tag). Same format as '
4433 '-b option / "Bug:" tag. If fixing several issues, '
4434 'separate with commas.')
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004435 auth.add_auth_options(parser)
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004436
rmistry@google.com2dd99862015-06-22 12:22:18 +00004437 orig_args = args
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004438 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004439 (options, args) = parser.parse_args(args)
4440
sbc@chromium.org71437c02015-04-09 19:29:40 +00004441 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004442 return 1
4443
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004444 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004445 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004446 options.cc = cleanup_list(options.cc)
4447
tandriib80458a2016-06-23 12:20:07 -07004448 if options.message_file:
4449 if options.message:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004450 parser.error('Only one of --message and --message-file allowed.')
tandriib80458a2016-06-23 12:20:07 -07004451 options.message = gclient_utils.FileRead(options.message_file)
4452 options.message_file = None
4453
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004454 if ([options.cq_dry_run,
4455 options.use_commit_queue,
4456 options.retry_failed].count(True) > 1):
4457 parser.error('Only one of --use-commit-queue, --cq-dry-run, or '
4458 '--retry-failed is allowed.')
tandrii4d0545a2016-07-06 03:56:49 -07004459
Aaron Gableedbc4132017-09-11 13:22:28 -07004460 if options.use_commit_queue:
4461 options.send_mail = True
4462
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004463 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4464 settings.GetIsGerrit()
4465
Edward Lemur934836a2019-09-09 20:16:54 +00004466 cl = Changelist()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004467 if options.retry_failed and not cl.GetIssue():
4468 print('No previous patchsets, so --retry-failed has no effect.')
4469 options.retry_failed = False
4470 # cl.GetMostRecentPatchset uses cached information, and can return the last
4471 # patchset before upload. Calling it here makes it clear that it's the
4472 # last patchset before upload. Note that GetMostRecentPatchset will fail
4473 # if no CL has been uploaded yet.
4474 if options.retry_failed:
4475 patchset = cl.GetMostRecentPatchset()
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004476
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004477 ret = cl.CMDUpload(options, args, orig_args)
4478
4479 if options.retry_failed:
4480 if ret != 0:
4481 print('Upload failed, so --retry-failed has no effect.')
4482 return ret
4483 auth_config = auth.extract_auth_config_from_options(options)
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00004484 builds, _ = _fetch_latest_builds(
4485 auth_config, cl, options.buildbucket_host,
4486 latest_patchset=patchset)
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00004487 buckets = _filter_failed_for_retry(builds)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00004488 if len(buckets) == 0:
4489 print('No failed tryjobs, so --retry-failed has no effect.')
4490 return ret
4491 _trigger_try_jobs(auth_config, cl, buckets, options, patchset + 1)
4492
4493 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00004494
4495
Francois Dorayd42c6812017-05-30 15:10:20 -04004496@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004497@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004498def CMDsplit(parser, args):
4499 """Splits a branch into smaller branches and uploads CLs.
4500
4501 Creates a branch and uploads a CL for each group of files modified in the
4502 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004503 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004504 the shared OWNERS file.
4505 """
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004506 parser.add_option('-d', '--description', dest='description_file',
4507 help='A text file containing a CL description in which '
4508 '$directory will be replaced by each CL\'s directory.')
4509 parser.add_option('-c', '--comment', dest='comment_file',
4510 help='A text file containing a CL comment.')
4511 parser.add_option('-n', '--dry-run', dest='dry_run', action='store_true',
Chris Watkinsba28e462017-12-13 11:22:17 +11004512 default=False,
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004513 help='List the files and reviewers for each CL that would '
4514 'be created, but don\'t create branches or CLs.')
4515 parser.add_option('--cq-dry-run', action='store_true',
4516 help='If set, will do a cq dry run for each uploaded CL. '
4517 'Please be careful when doing this; more than ~10 CLs '
4518 'has the potential to overload our build '
4519 'infrastructure. Try to upload these not during high '
4520 'load times (usually 11-3 Mountain View time). Email '
4521 'infra-dev@chromium.org with any questions.')
Takuto Ikuta51eca592019-02-14 19:40:52 +00004522 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4523 default=True,
4524 help='Sends your change to the CQ after an approval. Only '
4525 'works on repos that have the Auto-Submit label '
4526 'enabled')
Francois Dorayd42c6812017-05-30 15:10:20 -04004527 options, _ = parser.parse_args(args)
4528
4529 if not options.description_file:
4530 parser.error('No --description flag specified.')
4531
4532 def WrappedCMDupload(args):
4533 return CMDupload(OptionParser(), args)
4534
4535 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00004536 Changelist, WrappedCMDupload, options.dry_run,
Takuto Ikuta51eca592019-02-14 19:40:52 +00004537 options.cq_dry_run, options.enable_auto_submit)
Francois Dorayd42c6812017-05-30 15:10:20 -04004538
4539
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004540@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004541@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004542def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004543 """DEPRECATED: Used to commit the current changelist via git-svn."""
4544 message = ('git-cl no longer supports committing to SVN repositories via '
4545 'git-svn. You probably want to use `git cl land` instead.')
4546 print(message)
4547 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004548
4549
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004550@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004551@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004552def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004553 """Commits the current changelist via git.
4554
4555 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4556 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004557 """
4558 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4559 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004560 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004561 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04004562 parser.add_option('--parallel', action='store_true',
4563 help='Run all tests specified by input_api.RunTests in all '
4564 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004565 (options, args) = parser.parse_args(args)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004566
Edward Lemur934836a2019-09-09 20:16:54 +00004567 cl = Changelist()
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004568
Robert Iannucci2e73d432018-03-14 01:10:47 -07004569 if not cl.GetIssue():
4570 DieWithError('You must upload the change first to Gerrit.\n'
4571 ' If you would rather have `git cl land` upload '
4572 'automatically for you, see http://crbug.com/642759')
Edward Lemur125d60a2019-09-13 18:25:41 +00004573 return cl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02004574 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004575
4576
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004577@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004578@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004580 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004581 parser.add_option('-b', dest='newbranch',
4582 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004583 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07004584 help='overwrite state on the current or chosen branch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004585 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
Edward Lemurf38bc172019-09-03 21:02:13 +00004586 help='don\'t commit after patch applies.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004587
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004588 group = optparse.OptionGroup(
4589 parser,
4590 'Options for continuing work on the current issue uploaded from a '
4591 'different clone (e.g. different machine). Must be used independently '
4592 'from the other options. No issue number should be specified, and the '
4593 'branch must have an issue number associated with it')
4594 group.add_option('--reapply', action='store_true', dest='reapply',
4595 help='Reset the branch and reapply the issue.\n'
4596 'CAUTION: This will undo any local changes in this '
4597 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004598
4599 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004600 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004601 parser.add_option_group(group)
4602
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004603 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004604 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004605
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004606 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004607 if options.newbranch:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004608 parser.error('--reapply works on the current branch only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004609 if len(args) > 0:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004610 parser.error('--reapply implies no additional arguments.')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004611
Edward Lemur934836a2019-09-09 20:16:54 +00004612 cl = Changelist()
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004613 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004614 parser.error('Current branch must have an associated issue.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004615
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004616 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01004617 if upstream is None:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004618 parser.error('No upstream branch specified. Cannot reset branch.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004619
4620 RunGit(['reset', '--hard', upstream])
4621 if options.pull:
4622 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004623
Edward Lemur678a6842019-10-03 22:25:05 +00004624 target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
4625 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004626
4627 if len(args) != 1 or not args[0]:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004628 parser.error('Must specify issue number or URL.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004629
Edward Lemurf38bc172019-09-03 21:02:13 +00004630 target_issue_arg = ParseIssueNumberArgument(args[0])
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004631 if not target_issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004632 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004633
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004634 # We don't want uncommitted changes mixed up with the patch.
4635 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004636 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004637
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004638 if options.newbranch:
4639 if options.force:
4640 RunGit(['branch', '-D', options.newbranch],
4641 stderr=subprocess2.PIPE, error_ok=True)
4642 RunGit(['new-branch', options.newbranch])
4643
Edward Lemur678a6842019-10-03 22:25:05 +00004644 cl = Changelist(
4645 codereview_host=target_issue_arg.hostname, issue=target_issue_arg.issue)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004646
Edward Lemur678a6842019-10-03 22:25:05 +00004647 if not args[0].isdigit():
Edward Lemurf38bc172019-09-03 21:02:13 +00004648 print('canonical issue/change URL: %s\n' % cl.GetIssueURL())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004649
Edward Lemurf38bc172019-09-03 21:02:13 +00004650 return cl.CMDPatchWithParsedIssue(
4651 target_issue_arg, options.nocommit, options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004652
4653
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004654def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004655 """Fetches the tree status and returns either 'open', 'closed',
4656 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004657 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004658 if url:
4659 status = urllib2.urlopen(url).read().lower()
4660 if status.find('closed') != -1 or status == '0':
4661 return 'closed'
4662 elif status.find('open') != -1 or status == '1':
4663 return 'open'
4664 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004665 return 'unset'
4666
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004667
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004668def GetTreeStatusReason():
4669 """Fetches the tree status from a json url and returns the message
4670 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004671 url = settings.GetTreeStatusUrl()
4672 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004673 connection = urllib2.urlopen(json_url)
4674 status = json.loads(connection.read())
4675 connection.close()
4676 return status['message']
4677
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004678
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004679@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004680def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004681 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004682 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683 status = GetTreeStatus()
4684 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004685 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004686 return 2
4687
vapiera7fbd5a2016-06-16 09:17:49 -07004688 print('The tree is %s' % status)
4689 print()
4690 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004691 if status != 'open':
4692 return 1
4693 return 0
4694
4695
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004696@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00004697def CMDtry(parser, args):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004698 """Triggers tryjobs using either Buildbucket or CQ dry run."""
4699 group = optparse.OptionGroup(parser, 'Tryjob options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004700 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004701 '-b', '--bot', action='append',
4702 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4703 'times to specify multiple builders. ex: '
4704 '"-b win_rel -b win_layout". See '
4705 'the try server waterfall for the builders name and the tests '
4706 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004707 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004708 '-B', '--bucket', default='',
4709 help=('Buildbucket bucket to send the try requests.'))
4710 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004711 '-r', '--revision',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004712 help='Revision to use for the tryjob; default: the revision will '
tandriif7b29d42016-10-07 08:45:41 -07004713 'be determined by the try recipe that builder runs, which usually '
4714 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004715 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004716 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004717 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004718 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004719 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08004720 '--category', default='git_cl_try', help='Specify custom build category.')
4721 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004722 '--project',
4723 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004724 'in recipe to determine to which repository or directory to '
4725 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004726 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004727 '-p', '--property', dest='properties', action='append', default=[],
4728 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004729 'key2=value2 etc. The value will be treated as '
4730 'json if decodable, or as string otherwise. '
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004731 'NOTE: using this may make your tryjob not usable for CQ, '
4732 'which will then schedule another tryjob with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004733 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004734 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4735 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004736 parser.add_option_group(group)
Quinten Yearsley983111f2019-09-26 17:18:48 +00004737 parser.add_option(
4738 '-R', '--retry-failed', action='store_true', default=False,
4739 help='Retry failed jobs from the latest set of tryjobs. '
4740 'Not allowed with --bucket and --bot options.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004741 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09004742 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004743 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004744 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004745
machenbach@chromium.org45453142015-09-15 08:45:22 +00004746 # Make sure that all properties are prop=value pairs.
4747 bad_params = [x for x in options.properties if '=' not in x]
4748 if bad_params:
4749 parser.error('Got properties with missing "=": %s' % bad_params)
4750
maruel@chromium.org15192402012-09-06 12:38:29 +00004751 if args:
4752 parser.error('Unknown arguments: %s' % args)
4753
Edward Lemur934836a2019-09-09 20:16:54 +00004754 cl = Changelist(issue=options.issue)
maruel@chromium.org15192402012-09-06 12:38:29 +00004755 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004756 parser.error('Need to upload first.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004757
Edward Lemurf38bc172019-09-03 21:02:13 +00004758 # HACK: warm up Gerrit change detail cache to save on RPCs.
Edward Lemur125d60a2019-09-13 18:25:41 +00004759 cl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01004760
tandriie113dfd2016-10-11 10:20:12 -07004761 error_message = cl.CannotTriggerTryJobReason()
4762 if error_message:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004763 parser.error('Can\'t trigger tryjobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004764
Quinten Yearsley983111f2019-09-26 17:18:48 +00004765 if options.retry_failed:
4766 if options.bot or options.bucket:
4767 print('ERROR: The option --retry-failed is not compatible with '
4768 '-B, -b, --bucket, or --bot.', file=sys.stderr)
4769 return 1
4770 print('Searching for failed tryjobs...')
4771 builds, patchset = _fetch_latest_builds(
4772 auth_config, cl, options.buildbucket_host)
4773 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:
4808 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
4809 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)
4833 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07004834 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004835 options, args = parser.parse_args(args)
4836 if args:
4837 parser.error('Unrecognized args: %s' % ' '.join(args))
4838
4839 auth_config = auth.extract_auth_config_from_options(options)
Edward Lemur934836a2019-09-09 20:16:54 +00004840 cl = Changelist(issue=options.issue)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004841 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004842 parser.error('Need to upload first.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004843
tandrii221ab252016-10-06 08:12:04 -07004844 patchset = options.patchset
4845 if not patchset:
4846 patchset = cl.GetMostRecentPatchset()
4847 if not patchset:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004848 parser.error('Code review host doesn\'t know about issue %s. '
tandrii221ab252016-10-06 08:12:04 -07004849 'No access to issue or wrong issue number?\n'
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004850 'Either upload first, or pass --patchset explicitly.' %
tandrii221ab252016-10-06 08:12:04 -07004851 cl.GetIssue())
4852
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004853 try:
tandrii221ab252016-10-06 08:12:04 -07004854 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004855 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004856 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004857 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004858 if options.json:
Edward Lemurbaaf6be2019-10-09 18:00:44 +00004859 write_json(options.json, jobs)
qyearsley53f48a12016-09-01 10:45:13 -07004860 else:
4861 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004862 return 0
4863
4864
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004865@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004866@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004867def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004868 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004869 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004870 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004871 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004872
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004873 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004874 if args:
4875 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004876 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004877 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004878 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004879 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004880
4881 # Clear configured merge-base, if there is one.
4882 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004883 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004884 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004885 return 0
4886
4887
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004888@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00004889def CMDweb(parser, args):
4890 """Opens the current CL in the web browser."""
4891 _, args = parser.parse_args(args)
4892 if args:
4893 parser.error('Unrecognized args: %s' % ' '.join(args))
4894
4895 issue_url = Changelist().GetIssueURL()
4896 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004897 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004898 return 1
4899
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004900 # Redirect I/O before invoking browser to hide its output. For example, this
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00004901 # allows us to hide the "Created new window in existing browser session."
4902 # message from Chrome. Based on https://stackoverflow.com/a/2323563.
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004903 saved_stdout = os.dup(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004904 saved_stderr = os.dup(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004905 os.close(1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004906 os.close(2)
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00004907 os.open(os.devnull, os.O_RDWR)
4908 try:
4909 webbrowser.open(issue_url)
4910 finally:
4911 os.dup2(saved_stdout, 1)
Sergiy Belozorov06684032019-03-06 16:53:08 +00004912 os.dup2(saved_stderr, 2)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004913 return 0
4914
4915
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004916@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004917def CMDset_commit(parser, args):
Andrii Shyshkalov0e889b72019-07-15 22:28:48 +00004918 """Sets the commit bit to trigger the CQ."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004919 parser.add_option('-d', '--dry-run', action='store_true',
4920 help='trigger in dry run mode')
4921 parser.add_option('-c', '--clear', action='store_true',
4922 help='stop CQ run, if any')
iannuccie53c9352016-08-17 14:40:40 -07004923 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004924 options, args = parser.parse_args(args)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004925 if args:
4926 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004927 if options.dry_run and options.clear:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004928 parser.error('Only one of --dry-run and --clear are allowed.')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004929
Edward Lemur934836a2019-09-09 20:16:54 +00004930 cl = Changelist(issue=options.issue)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004931 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004932 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004933 elif options.dry_run:
4934 state = _CQState.DRY_RUN
4935 else:
4936 state = _CQState.COMMIT
4937 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004938 parser.error('Must upload the issue first.')
tandrii9de9ec62016-07-13 03:01:59 -07004939 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004940 return 0
4941
4942
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004943@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00004944def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004945 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004946 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004947 options, args = parser.parse_args(args)
groby@chromium.org411034a2013-02-26 15:12:01 +00004948 if args:
4949 parser.error('Unrecognized args: %s' % ' '.join(args))
Edward Lemur934836a2019-09-09 20:16:54 +00004950 cl = Changelist(issue=options.issue)
groby@chromium.org411034a2013-02-26 15:12:01 +00004951 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07004952 if not cl.GetIssue():
Quinten Yearsleyc4202212019-07-22 23:34:40 +00004953 DieWithError('ERROR: No issue to close.')
groby@chromium.org411034a2013-02-26 15:12:01 +00004954 cl.CloseIssue()
4955 return 0
4956
4957
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004958@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004959def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004960 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004961 parser.add_option(
4962 '--stat',
4963 action='store_true',
4964 dest='stat',
4965 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004966 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004967 if args:
4968 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004969
Edward Lemur934836a2019-09-09 20:16:54 +00004970 cl = Changelist()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004971 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004972 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004973 if not issue:
4974 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004975
Aaron Gablea718c3e2017-08-28 17:47:28 -07004976 base = cl._GitGetBranchConfigValue('last-upload-hash')
4977 if not base:
4978 base = cl._GitGetBranchConfigValue('gerritsquashhash')
4979 if not base:
4980 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
4981 revision_info = detail['revisions'][detail['current_revision']]
4982 fetch_info = revision_info['fetch']['http']
4983 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
4984 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004985
Aaron Gablea718c3e2017-08-28 17:47:28 -07004986 cmd = ['git', 'diff']
4987 if options.stat:
4988 cmd.append('--stat')
4989 cmd.append(base)
4990 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004991
4992 return 0
4993
4994
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004995@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004996def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07004997 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004998 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00004999 '--ignore-current',
5000 action='store_true',
5001 help='Ignore the CL\'s current reviewers and start from scratch.')
5002 parser.add_option(
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005003 '--ignore-self',
5004 action='store_true',
5005 help='Do not consider CL\'s author as an owners.')
5006 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005007 '--no-color',
5008 action='store_true',
5009 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005010 parser.add_option(
5011 '--batch',
5012 action='store_true',
5013 help='Do not run interactively, just suggest some')
Yang Guo6e269a02019-06-26 11:17:02 +00005014 # TODO: Consider moving this to another command, since other
5015 # git-cl owners commands deal with owners for a given CL.
5016 parser.add_option(
5017 '--show-all',
5018 action='store_true',
5019 help='Show all owners for a particular file')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005020 options, args = parser.parse_args(args)
5021
5022 author = RunGit(['config', 'user.email']).strip() or None
5023
Edward Lemur934836a2019-09-09 20:16:54 +00005024 cl = Changelist()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005025
Yang Guo6e269a02019-06-26 11:17:02 +00005026 if options.show_all:
5027 for arg in args:
5028 base_branch = cl.GetCommonAncestorWithUpstream()
5029 change = cl.GetChange(base_branch, None)
5030 database = owners.Database(change.RepositoryRoot(), file, os.path)
5031 database.load_data_needed_for([arg])
5032 print('Owners for %s:' % arg)
5033 for owner in sorted(database.all_possible_owners([arg], None)):
5034 print(' - %s' % owner)
5035 return 0
5036
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005037 if args:
5038 if len(args) > 1:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005039 parser.error('Unknown args.')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005040 base_branch = args[0]
5041 else:
5042 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005043 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005044
5045 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005046 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5047
5048 if options.batch:
5049 db = owners.Database(change.RepositoryRoot(), file, os.path)
5050 print('\n'.join(db.reviewers_for(affected_files, author)))
5051 return 0
5052
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005053 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005054 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005055 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005056 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005057 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005058 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005059 disable_color=options.no_color,
Sylvain Defresneb1f865d2019-02-12 12:38:22 +00005060 override_files=change.OriginalOwnersFiles(),
5061 ignore_author=options.ignore_self).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005062
5063
Aiden Bennerc08566e2018-10-03 17:52:42 +00005064def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005065 """Generates a diff command."""
5066 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005067 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5068
Aiden Benner6c18a1a2018-11-23 20:18:23 +00005069 if allow_prefix:
5070 # explicitly setting --src-prefix and --dst-prefix is necessary in the
5071 # case that diff.noprefix is set in the user's git config.
5072 diff_cmd += ['--src-prefix=a/', '--dst-prefix=b/']
5073 else:
Aiden Bennerc08566e2018-10-03 17:52:42 +00005074 diff_cmd += ['--no-prefix']
5075
5076 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005077
5078 if args:
5079 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005080 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005081 diff_cmd.append(arg)
5082 else:
5083 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005084
5085 return diff_cmd
5086
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005087
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005088def MatchingFileType(file_name, extensions):
Quinten Yearsleyd242ed72019-07-25 17:17:55 +00005089 """Returns True if the file name ends with one of the given extensions."""
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005090 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005091
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005092
enne@chromium.org555cfe42014-01-29 18:21:39 +00005093@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005094@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005095def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005096 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005097 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005098 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005099 parser.add_option('--full', action='store_true',
5100 help='Reformat the full content of all touched files')
5101 parser.add_option('--dry-run', action='store_true',
5102 help='Don\'t modify any file on disk.')
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005103 parser.add_option(
5104 '--python',
5105 action='store_true',
5106 default=None,
5107 help='Enables python formatting on all python files.')
5108 parser.add_option(
5109 '--no-python',
5110 action='store_true',
5111 dest='python',
5112 help='Disables python formatting on all python files. '
5113 'Takes precedence over --python. '
5114 'If neither --python or --no-python are set, python '
5115 'files that have a .style.yapf file in an ancestor '
5116 'directory will be formatted.')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005117 parser.add_option('--js', action='store_true',
5118 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005119 parser.add_option('--diff', action='store_true',
5120 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005121 parser.add_option('--presubmit', action='store_true',
5122 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005123 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005124
Daniel Chengc55eecf2016-12-30 03:11:02 -08005125 # Normalize any remaining args against the current path, so paths relative to
5126 # the current directory are still resolved as expected.
5127 args = [os.path.join(os.getcwd(), arg) for arg in args]
5128
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005129 # git diff generates paths against the root of the repository. Change
5130 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005131 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005132 if rel_base_path:
5133 os.chdir(rel_base_path)
5134
digit@chromium.org29e47272013-05-17 17:01:46 +00005135 # Grab the merge-base commit, i.e. the upstream commit of the current
5136 # branch when it was created or the last time it was rebased. This is
5137 # to cover the case where the user may have called "git fetch origin",
5138 # moving the origin branch to a newer commit, but hasn't rebased yet.
5139 upstream_commit = None
5140 cl = Changelist()
5141 upstream_branch = cl.GetUpstreamBranch()
5142 if upstream_branch:
5143 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5144 upstream_commit = upstream_commit.strip()
5145
5146 if not upstream_commit:
5147 DieWithError('Could not find base commit for this branch. '
5148 'Are you in detached state?')
5149
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005150 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5151 diff_output = RunGit(changed_files_cmd)
5152 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005153 # Filter out files deleted by this CL
5154 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005155
Christopher Lamc5ba6922017-01-24 11:19:14 +11005156 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005157 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005158
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005159 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5160 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5161 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005162 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005163
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005164 top_dir = os.path.normpath(
5165 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5166
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005167 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5168 # formatted. This is used to block during the presubmit.
5169 return_value = 0
5170
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005171 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005172 # Locate the clang-format binary in the checkout
5173 try:
5174 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005175 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005176 DieWithError(e)
5177
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005178 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005179 cmd = [clang_format_tool]
5180 if not opts.dry_run and not opts.diff:
5181 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005182 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005183 if opts.diff:
5184 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005185 else:
5186 env = os.environ.copy()
5187 env['PATH'] = str(os.path.dirname(clang_format_tool))
5188 try:
5189 script = clang_format.FindClangFormatScriptInChromiumTree(
5190 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005191 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005192 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005193
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005194 cmd = [sys.executable, script, '-p0']
5195 if not opts.dry_run and not opts.diff:
5196 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005197
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005198 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5199 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005200
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005201 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5202 if opts.diff:
5203 sys.stdout.write(stdout)
5204 if opts.dry_run and len(stdout) > 0:
5205 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005206
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005207 # Similar code to above, but using yapf on .py files rather than clang-format
5208 # on C/C++ files
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005209 py_explicitly_disabled = opts.python is not None and not opts.python
5210 if python_diff_files and not py_explicitly_disabled:
Aiden Bennere47ac152018-11-20 16:44:03 +00005211 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5212 yapf_tool = os.path.join(depot_tools_path, 'yapf')
5213 if sys.platform.startswith('win'):
5214 yapf_tool += '.bat'
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005215
Aiden Bennerc08566e2018-10-03 17:52:42 +00005216 # If we couldn't find a yapf file we'll default to the chromium style
5217 # specified in depot_tools.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005218 chromium_default_yapf_style = os.path.join(depot_tools_path,
5219 YAPF_CONFIG_FILENAME)
Aiden Bennerc08566e2018-10-03 17:52:42 +00005220 # Used for caching.
5221 yapf_configs = {}
5222 for f in python_diff_files:
5223 # Find the yapf style config for the current file, defaults to depot
5224 # tools default.
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005225 _FindYapfConfigFile(f, yapf_configs, top_dir)
5226
5227 # Turn on python formatting by default if a yapf config is specified.
5228 # This breaks in the case of this repo though since the specified
5229 # style file is also the global default.
5230 if opts.python is None:
5231 filtered_py_files = []
5232 for f in python_diff_files:
5233 if _FindYapfConfigFile(f, yapf_configs, top_dir) is not None:
5234 filtered_py_files.append(f)
5235 else:
5236 filtered_py_files = python_diff_files
5237
5238 # Note: yapf still seems to fix indentation of the entire file
5239 # even if line ranges are specified.
5240 # See https://github.com/google/yapf/issues/499
5241 if not opts.full and filtered_py_files:
5242 py_line_diffs = _ComputeDiffLineRanges(filtered_py_files, upstream_commit)
5243
Brian Sheedy59b06a82019-10-14 17:03:29 +00005244 ignored_yapf_files = _GetYapfIgnoreFilepaths(top_dir)
5245
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005246 for f in filtered_py_files:
Brian Sheedy59b06a82019-10-14 17:03:29 +00005247 if f in ignored_yapf_files:
5248 continue
Aiden Benner99b0ccb2018-11-20 19:53:31 +00005249 yapf_config = _FindYapfConfigFile(f, yapf_configs, top_dir)
5250 if yapf_config is None:
5251 yapf_config = chromium_default_yapf_style
Aiden Bennerc08566e2018-10-03 17:52:42 +00005252
5253 cmd = [yapf_tool, '--style', yapf_config, f]
5254
5255 has_formattable_lines = False
5256 if not opts.full:
5257 # Only run yapf over changed line ranges.
5258 for diff_start, diff_len in py_line_diffs[f]:
5259 diff_end = diff_start + diff_len - 1
5260 # Yapf errors out if diff_end < diff_start but this
5261 # is a valid line range diff for a removal.
5262 if diff_end >= diff_start:
5263 has_formattable_lines = True
5264 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5265 # If all line diffs were removals we have nothing to format.
5266 if not has_formattable_lines:
5267 continue
5268
5269 if opts.diff or opts.dry_run:
5270 cmd += ['--diff']
5271 # Will return non-zero exit code if non-empty diff.
5272 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5273 if opts.diff:
5274 sys.stdout.write(stdout)
5275 elif len(stdout) > 0:
5276 return_value = 2
5277 else:
5278 cmd += ['-i']
5279 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005280
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005281 # Dart's formatter does not have the nice property of only operating on
5282 # modified chunks, so hard code full.
5283 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005284 try:
5285 command = [dart_format.FindDartFmtToolInChromiumTree()]
5286 if not opts.dry_run and not opts.diff:
5287 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005288 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005289
ppi@chromium.org6593d932016-03-03 15:41:15 +00005290 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005291 if opts.dry_run and stdout:
5292 return_value = 2
5293 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005294 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5295 'found in this checkout. Files in other languages are still '
5296 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005297
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005298 # Format GN build files. Always run on full build files for canonical form.
5299 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005300 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005301 if opts.dry_run or opts.diff:
5302 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005303 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005304 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5305 shell=sys.platform == 'win32',
5306 cwd=top_dir)
5307 if opts.dry_run and gn_ret == 2:
5308 return_value = 2 # Not formatted.
5309 elif opts.diff and gn_ret == 2:
5310 # TODO this should compute and print the actual diff.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005311 print('This change has GN build file diff for ' + gn_diff_file)
brettw4b8ed592016-08-05 16:19:12 -07005312 elif gn_ret != 0:
5313 # For non-dry run cases (and non-2 return values for dry-run), a
5314 # nonzero error code indicates a failure, probably because the file
5315 # doesn't parse.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005316 DieWithError('gn format failed on ' + gn_diff_file +
5317 '\nTry running `gn format` on this file manually.')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005318
Ilya Shermane081cbe2017-08-15 17:51:04 -07005319 # Skip the metrics formatting from the global presubmit hook. These files have
5320 # a separate presubmit hook that issues an error if the files need formatting,
5321 # whereas the top-level presubmit script merely issues a warning. Formatting
5322 # these files is somewhat slow, so it's important not to duplicate the work.
5323 if not opts.presubmit:
5324 for xml_dir in GetDirtyMetricsDirs(diff_files):
5325 tool_dir = os.path.join(top_dir, xml_dir)
5326 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5327 if opts.dry_run or opts.diff:
5328 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005329 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005330 if opts.diff:
5331 sys.stdout.write(stdout)
5332 if opts.dry_run and stdout:
5333 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005334
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005335 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005336
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005337
Steven Holte2e664bf2017-04-21 13:10:47 -07005338def GetDirtyMetricsDirs(diff_files):
5339 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5340 metrics_xml_dirs = [
5341 os.path.join('tools', 'metrics', 'actions'),
5342 os.path.join('tools', 'metrics', 'histograms'),
5343 os.path.join('tools', 'metrics', 'rappor'),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005344 os.path.join('tools', 'metrics', 'ukm'),
5345 ]
Steven Holte2e664bf2017-04-21 13:10:47 -07005346 for xml_dir in metrics_xml_dirs:
5347 if any(file.startswith(xml_dir) for file in xml_diff_files):
5348 yield xml_dir
5349
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005350
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005351@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005352@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005353def CMDcheckout(parser, args):
Edward Lemurf38bc172019-09-03 21:02:13 +00005354 """Checks out a branch associated with a given Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005355 _, args = parser.parse_args(args)
5356
5357 if len(args) != 1:
5358 parser.print_help()
5359 return 1
5360
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005361 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005362 if not issue_arg.valid:
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005363 parser.error('Invalid issue ID or URL.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005364
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005365 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005366
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005367 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005368 output = RunGit(['config', '--local', '--get-regexp',
5369 r'branch\..*\.%s' % issueprefix],
5370 error_ok=True)
5371 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005372 if issue == target_issue:
5373 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005374
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005375 branches = []
5376 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005377 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005378 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005379 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005380 return 1
5381 if len(branches) == 1:
5382 RunGit(['checkout', branches[0]])
5383 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005384 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005385 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005386 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005387 which = raw_input('Choose by index: ')
5388 try:
5389 RunGit(['checkout', branches[int(which)]])
5390 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005391 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005392 return 1
5393
5394 return 0
5395
5396
maruel@chromium.org29404b52014-09-08 22:58:00 +00005397def CMDlol(parser, args):
5398 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005399 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005400 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5401 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5402 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005403 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005404 return 0
5405
5406
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005407class OptionParser(optparse.OptionParser):
5408 """Creates the option parse and add --verbose support."""
5409 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005410 optparse.OptionParser.__init__(
5411 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005412 self.add_option(
5413 '-v', '--verbose', action='count', default=0,
5414 help='Use 2 times for more debugging info')
5415
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005416 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005417 try:
5418 return self._parse_args(args)
5419 finally:
5420 # Regardless of success or failure of args parsing, we want to report
5421 # metrics, but only after logging has been initialized (if parsing
5422 # succeeded).
5423 global settings
5424 settings = Settings()
5425
5426 if not metrics.DISABLE_METRICS_COLLECTION:
5427 # GetViewVCUrl ultimately calls logging method.
5428 project_url = settings.GetViewVCUrl().strip('/+')
5429 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5430 metrics.collector.add('project_urls', [project_url])
5431
5432 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005433 # Create an optparse.Values object that will store only the actual passed
5434 # options, without the defaults.
5435 actual_options = optparse.Values()
5436 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5437 # Create an optparse.Values object with the default options.
5438 options = optparse.Values(self.get_default_values().__dict__)
5439 # Update it with the options passed by the user.
5440 options._update_careful(actual_options.__dict__)
5441 # Store the options passed by the user in an _actual_options attribute.
5442 # We store only the keys, and not the values, since the values can contain
5443 # arbitrary information, which might be PII.
5444 metrics.collector.add('arguments', actual_options.__dict__.keys())
5445
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005446 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005447 logging.basicConfig(
5448 level=levels[min(options.verbose, len(levels) - 1)],
5449 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5450 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005451
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005452 return options, args
5453
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005454
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005455def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005456 if sys.hexversion < 0x02060000:
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005457 print('\nYour Python version %s is unsupported, please upgrade.\n' %
vapiera7fbd5a2016-06-16 09:17:49 -07005458 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005459 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005460
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005461 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005462 dispatcher = subcommand.CommandDispatcher(__name__)
5463 try:
5464 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005465 except auth.AuthenticationError as e:
5466 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005467 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005468 if e.code != 500:
5469 raise
5470 DieWithError(
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005471 ('App Engine is misbehaving and returned HTTP %d, again. Keep faith '
Quinten Yearsleyc4202212019-07-22 23:34:40 +00005472 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005473 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005474
5475
5476if __name__ == '__main__':
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00005477 # These affect sys.stdout, so do it outside of main() to simplify mocks in
5478 # the unit tests.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005479 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005480 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005481 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005482 sys.exit(main(sys.argv[1:]))