blob: 8e7cb42adfb6d818cab010ee9fa4a9d8e5904ee6 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
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 Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
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
39try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080040 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000041except ImportError:
42 pass
43
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000044from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000045from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000046from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000047import auth
skobes6468b902016-10-24 08:45:10 -070048import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000049import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000050import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000051import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000052import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000053import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000054import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000055import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000056import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000057import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000058import metrics
piman@chromium.org336f9122014-09-04 02:16:55 +000059import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000060import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000062import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040064import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000065import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000066import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067import watchlists
68
tandrii7400cf02016-06-21 08:48:07 -070069__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000070
tandrii9d2c7a32016-06-22 03:42:45 -070071COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070072DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080073POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000075REFS_THAT_ALIAS_TO_OTHER_REFS = {
76 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
77 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
78}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000079
thestig@chromium.org44202a22014-03-11 19:22:18 +000080# Valid extensions for files we want to lint.
81DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
82DEFAULT_LINT_IGNORE_REGEX = r"$^"
83
Aiden Bennerc08566e2018-10-03 17:52:42 +000084# File name for yapf style config files.
85YAPF_CONFIG_FILENAME = '.style.yapf'
86
borenet6c0efe62016-10-19 08:13:29 -070087# Buildbucket master name prefix.
88MASTER_PREFIX = 'master.'
89
Edward Lemur83bd7f42018-10-10 00:14:21 +000090# TODO(crbug.com/881860): Remove
91# Log gerrit failures to a gerrit_util.GERRIT_ERR_LOG_FILE.
92GERRIT_ERR_LOGGER = logging.getLogger('GerritErrorLogs')
93
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000094# Shortcut since it quickly becomes redundant.
95Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000096
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097# Initialized in main()
98settings = None
99
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100100# Used by tests/git_cl_test.py to add extra logging.
101# Inside the weirdly failing test, add this:
102# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700103# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100104_IS_BEING_TESTED = False
105
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000106
Christopher Lamf732cd52017-01-24 12:40:11 +1100107def DieWithError(message, change_desc=None):
108 if change_desc:
109 SaveDescriptionBackup(change_desc)
110
vapiera7fbd5a2016-06-16 09:17:49 -0700111 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112 sys.exit(1)
113
114
Christopher Lamf732cd52017-01-24 12:40:11 +1100115def SaveDescriptionBackup(change_desc):
116 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000117 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100118 backup_file = open(backup_path, 'w')
119 backup_file.write(change_desc.description)
120 backup_file.close()
121
122
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000123def GetNoGitPagerEnv():
124 env = os.environ.copy()
125 # 'cat' is a magical git string that disables pagers on all platforms.
126 env['GIT_PAGER'] = 'cat'
127 return env
128
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000129
bsep@chromium.org627d9002016-04-29 00:00:52 +0000130def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000132 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000133 except subprocess2.CalledProcessError as e:
134 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000135 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000137 'Command "%s" failed.\n%s' % (
138 ' '.join(args), error_message or e.stdout or ''))
139 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000140
141
142def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000143 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000144 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000145
146
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000147def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000148 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700149 if suppress_stderr:
150 stderr = subprocess2.VOID
151 else:
152 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000153 try:
tandrii5d48c322016-08-18 16:19:37 -0700154 (out, _), code = subprocess2.communicate(['git'] + args,
155 env=GetNoGitPagerEnv(),
156 stdout=subprocess2.PIPE,
157 stderr=stderr)
158 return code, out
159 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900160 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700161 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162
163
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000164def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000165 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000166 return RunGitWithCode(args, suppress_stderr=True)[1]
167
168
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000169def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000170 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000171 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000172 return (version.startswith(prefix) and
173 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000174
175
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000176def BranchExists(branch):
177 """Return True if specified branch exists."""
178 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
179 suppress_stderr=True)
180 return not code
181
182
tandrii2a16b952016-10-19 07:09:44 -0700183def time_sleep(seconds):
184 # Use this so that it can be mocked in tests without interfering with python
185 # system machinery.
186 import time # Local import to discourage others from importing time globally.
187 return time.sleep(seconds)
188
189
maruel@chromium.org90541732011-04-01 17:54:18 +0000190def ask_for_data(prompt):
191 try:
192 return raw_input(prompt)
193 except KeyboardInterrupt:
194 # Hide the exception.
195 sys.exit(1)
196
197
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100198def confirm_or_exit(prefix='', action='confirm'):
199 """Asks user to press enter to continue or press Ctrl+C to abort."""
200 if not prefix or prefix.endswith('\n'):
201 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100202 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100203 mid = ' Press'
204 elif prefix.endswith(' '):
205 mid = 'press'
206 else:
207 mid = ' press'
208 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
209
210
211def ask_for_explicit_yes(prompt):
212 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
213 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
214 while True:
215 if 'yes'.startswith(result):
216 return True
217 if 'no'.startswith(result):
218 return False
219 result = ask_for_data('Please, type yes or no: ').lower()
220
221
tandrii5d48c322016-08-18 16:19:37 -0700222def _git_branch_config_key(branch, key):
223 """Helper method to return Git config key for a branch."""
224 assert branch, 'branch name is required to set git config for it'
225 return 'branch.%s.%s' % (branch, key)
226
227
228def _git_get_branch_config_value(key, default=None, value_type=str,
229 branch=False):
230 """Returns git config value of given or current branch if any.
231
232 Returns default in all other cases.
233 """
234 assert value_type in (int, str, bool)
235 if branch is False: # Distinguishing default arg value from None.
236 branch = GetCurrentBranch()
237
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000238 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700239 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000240
tandrii5d48c322016-08-18 16:19:37 -0700241 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700242 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700243 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700244 # git config also has --int, but apparently git config suffers from integer
245 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700246 args.append(_git_branch_config_key(branch, key))
247 code, out = RunGitWithCode(args)
248 if code == 0:
249 value = out.strip()
250 if value_type == int:
251 return int(value)
252 if value_type == bool:
253 return bool(value.lower() == 'true')
254 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000255 return default
256
257
tandrii5d48c322016-08-18 16:19:37 -0700258def _git_set_branch_config_value(key, value, branch=None, **kwargs):
259 """Sets the value or unsets if it's None of a git branch config.
260
261 Valid, though not necessarily existing, branch must be provided,
262 otherwise currently checked out branch is used.
263 """
264 if not branch:
265 branch = GetCurrentBranch()
266 assert branch, 'a branch name OR currently checked out branch is required'
267 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700268 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700269 if value is None:
270 args.append('--unset')
271 elif isinstance(value, bool):
272 args.append('--bool')
273 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700274 else:
tandrii33a46ff2016-08-23 05:53:40 -0700275 # git config also has --int, but apparently git config suffers from integer
276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 value = str(value)
278 args.append(_git_branch_config_key(branch, key))
279 if value is not None:
280 args.append(value)
281 RunGit(args, **kwargs)
282
283
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100284def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700285 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100286
287 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
288 """
289 # Git also stores timezone offset, but it only affects visual display,
290 # actual point in time is defined by this timestamp only.
291 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
292
293
294def _git_amend_head(message, committer_timestamp):
295 """Amends commit with new message and desired committer_timestamp.
296
297 Sets committer timezone to UTC.
298 """
299 env = os.environ.copy()
300 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
301 return RunGit(['commit', '--amend', '-m', message], env=env)
302
303
machenbach@chromium.org45453142015-09-15 08:45:22 +0000304def _get_properties_from_options(options):
305 properties = dict(x.split('=', 1) for x in options.properties)
306 for key, val in properties.iteritems():
307 try:
308 properties[key] = json.loads(val)
309 except ValueError:
310 pass # If a value couldn't be evaluated, treat it as a string.
311 return properties
312
313
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000314def _prefix_master(master):
315 """Convert user-specified master name to full master name.
316
317 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
318 name, while the developers always use shortened master name
319 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
320 function does the conversion for buildbucket migration.
321 """
borenet6c0efe62016-10-19 08:13:29 -0700322 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000323 return master
borenet6c0efe62016-10-19 08:13:29 -0700324 return '%s%s' % (MASTER_PREFIX, master)
325
326
327def _unprefix_master(bucket):
328 """Convert bucket name to shortened master name.
329
330 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
331 name, while the developers always use shortened master name
332 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
333 function does the conversion for buildbucket migration.
334 """
335 if bucket.startswith(MASTER_PREFIX):
336 return bucket[len(MASTER_PREFIX):]
337 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000338
339
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000340def _buildbucket_retry(operation_name, http, *args, **kwargs):
341 """Retries requests to buildbucket service and returns parsed json content."""
342 try_count = 0
343 while True:
344 response, content = http.request(*args, **kwargs)
345 try:
346 content_json = json.loads(content)
347 except ValueError:
348 content_json = None
349
350 # Buildbucket could return an error even if status==200.
351 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000352 error = content_json.get('error')
353 if error.get('code') == 403:
354 raise BuildbucketResponseException(
355 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000357 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000358 raise BuildbucketResponseException(msg)
359
360 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700361 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 raise BuildbucketResponseException(
363 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700364 'Please file bugs at http://crbug.com, '
365 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000366 content)
367 return content_json
368 if response.status < 500 or try_count >= 2:
369 raise httplib2.HttpLib2Error(content)
370
371 # status >= 500 means transient failures.
372 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700373 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000374 try_count += 1
375 assert False, 'unreachable'
376
377
qyearsley1fdfcb62016-10-24 13:22:03 -0700378def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700379 """Returns a dict mapping bucket names to builders and tests,
380 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700381 """
qyearsleydd49f942016-10-28 11:57:22 -0700382 # If no bots are listed, we try to get a set of builders and tests based
383 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700384 if not options.bot:
385 change = changelist.GetChange(
386 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700387 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700388 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700389 change=change,
390 changed_files=change.LocalPaths(),
391 repository_root=settings.GetRoot(),
392 default_presubmit=None,
393 project=None,
394 verbose=options.verbose,
395 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700396 if masters is None:
397 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100398 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700399
qyearsley1fdfcb62016-10-24 13:22:03 -0700400 if options.bucket:
401 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700402 if options.master:
403 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700404
qyearsleydd49f942016-10-28 11:57:22 -0700405 # If bots are listed but no master or bucket, then we need to find out
406 # the corresponding master for each bot.
407 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
408 if error_message:
409 option_parser.error(
410 'Tryserver master cannot be found because: %s\n'
411 'Please manually specify the tryserver master, e.g. '
412 '"-m tryserver.chromium.linux".' % error_message)
413 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700414
415
qyearsley123a4682016-10-26 09:12:17 -0700416def _get_bucket_map_for_builders(builders):
417 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 map_url = 'https://builders-map.appspot.com/'
419 try:
qyearsley123a4682016-10-26 09:12:17 -0700420 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700421 except urllib2.URLError as e:
422 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
423 (map_url, e))
424 except ValueError as e:
425 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700426 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700427 return None, 'Failed to build master map.'
428
qyearsley123a4682016-10-26 09:12:17 -0700429 bucket_map = {}
430 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800431 bucket = builders_map.get(builder, {}).get('bucket')
432 if bucket:
433 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700434 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700435
436
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800437def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700438 """Sends a request to Buildbucket to trigger try jobs for a changelist.
439
440 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700441 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700442 changelist: Changelist that the try jobs are associated with.
443 buckets: A nested dict mapping bucket names to builders to tests.
444 options: Command-line options.
445 """
tandriide281ae2016-10-12 06:02:30 -0700446 assert changelist.GetIssue(), 'CL must be uploaded first'
447 codereview_url = changelist.GetCodereviewServer()
448 assert codereview_url, 'CL must be uploaded first'
449 patchset = patchset or changelist.GetMostRecentPatchset()
450 assert patchset, 'CL must be uploaded first'
451
452 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700453 # Cache the buildbucket credentials under the codereview host key, so that
454 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700455 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000456 http = authenticator.authorize(httplib2.Http())
457 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700458
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000459 buildbucket_put_url = (
460 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000461 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000462 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700463 hostname=codereview_host,
464 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000465 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700466
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700467 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800468 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700469 if options.clobber:
470 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700471 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700472 if extra_properties:
473 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000474
475 batch_req_body = {'builds': []}
476 print_text = []
477 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700478 for bucket, builders_and_tests in sorted(buckets.iteritems()):
479 print_text.append('Bucket: %s' % bucket)
480 master = None
481 if bucket.startswith(MASTER_PREFIX):
482 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000483 for builder, tests in sorted(builders_and_tests.iteritems()):
484 print_text.append(' %s: %s' % (builder, tests))
485 parameters = {
486 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000487 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100488 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000489 'revision': options.revision,
490 }],
tandrii8c5a3532016-11-04 07:52:02 -0700491 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000492 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000493 if 'presubmit' in builder.lower():
494 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000495 if tests:
496 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700497
498 tags = [
499 'builder:%s' % builder,
500 'buildset:%s' % buildset,
501 'user_agent:git_cl_try',
502 ]
503 if master:
504 parameters['properties']['master'] = master
505 tags.append('master:%s' % master)
506
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000507 batch_req_body['builds'].append(
508 {
509 'bucket': bucket,
510 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000511 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700512 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000513 }
514 )
515
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700517 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 http,
519 buildbucket_put_url,
520 'PUT',
521 body=json.dumps(batch_req_body),
522 headers={'Content-Type': 'application/json'}
523 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000524 print_text.append('To see results here, run: git cl try-results')
525 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700526 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000527
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528
tandrii221ab252016-10-06 08:12:04 -0700529def fetch_try_jobs(auth_config, changelist, buildbucket_host,
530 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700531 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000532
qyearsley53f48a12016-09-01 10:45:13 -0700533 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534 """
tandrii221ab252016-10-06 08:12:04 -0700535 assert buildbucket_host
536 assert changelist.GetIssue(), 'CL must be uploaded first'
537 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
538 patchset = patchset or changelist.GetMostRecentPatchset()
539 assert patchset, 'CL must be uploaded first'
540
541 codereview_url = changelist.GetCodereviewServer()
542 codereview_host = urlparse.urlparse(codereview_url).hostname
543 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 if authenticator.has_cached_credentials():
545 http = authenticator.authorize(httplib2.Http())
546 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700547 print('Warning: Some results might be missing because %s' %
548 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700549 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 http = httplib2.Http()
551
552 http.force_exception_to_status_code = True
553
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000554 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700555 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700557 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 params = {'tag': 'buildset:%s' % buildset}
559
560 builds = {}
561 while True:
562 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700563 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700565 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 for build in content.get('builds', []):
567 builds[build['id']] = build
568 if 'next_cursor' in content:
569 params['start_cursor'] = content['next_cursor']
570 else:
571 break
572 return builds
573
574
qyearsleyeab3c042016-08-24 09:18:28 -0700575def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000576 """Prints nicely result of fetch_try_jobs."""
577 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700578 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 return
580
581 # Make a copy, because we'll be modifying builds dictionary.
582 builds = builds.copy()
583 builder_names_cache = {}
584
585 def get_builder(b):
586 try:
587 return builder_names_cache[b['id']]
588 except KeyError:
589 try:
590 parameters = json.loads(b['parameters_json'])
591 name = parameters['builder_name']
592 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700593 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700594 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595 name = None
596 builder_names_cache[b['id']] = name
597 return name
598
599 def get_bucket(b):
600 bucket = b['bucket']
601 if bucket.startswith('master.'):
602 return bucket[len('master.'):]
603 return bucket
604
605 if options.print_master:
606 name_fmt = '%%-%ds %%-%ds' % (
607 max(len(str(get_bucket(b))) for b in builds.itervalues()),
608 max(len(str(get_builder(b))) for b in builds.itervalues()))
609 def get_name(b):
610 return name_fmt % (get_bucket(b), get_builder(b))
611 else:
612 name_fmt = '%%-%ds' % (
613 max(len(str(get_builder(b))) for b in builds.itervalues()))
614 def get_name(b):
615 return name_fmt % get_builder(b)
616
617 def sort_key(b):
618 return b['status'], b.get('result'), get_name(b), b.get('url')
619
620 def pop(title, f, color=None, **kwargs):
621 """Pop matching builds from `builds` dict and print them."""
622
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000623 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000624 colorize = str
625 else:
626 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
627
628 result = []
629 for b in builds.values():
630 if all(b.get(k) == v for k, v in kwargs.iteritems()):
631 builds.pop(b['id'])
632 result.append(b)
633 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700634 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000635 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700636 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637
638 total = len(builds)
639 pop(status='COMPLETED', result='SUCCESS',
640 title='Successes:', color=Fore.GREEN,
641 f=lambda b: (get_name(b), b.get('url')))
642 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
643 title='Infra Failures:', color=Fore.MAGENTA,
644 f=lambda b: (get_name(b), b.get('url')))
645 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
646 title='Failures:', color=Fore.RED,
647 f=lambda b: (get_name(b), b.get('url')))
648 pop(status='COMPLETED', result='CANCELED',
649 title='Canceled:', color=Fore.MAGENTA,
650 f=lambda b: (get_name(b),))
651 pop(status='COMPLETED', result='FAILURE',
652 failure_reason='INVALID_BUILD_DEFINITION',
653 title='Wrong master/builder name:', color=Fore.MAGENTA,
654 f=lambda b: (get_name(b),))
655 pop(status='COMPLETED', result='FAILURE',
656 title='Other failures:',
657 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
658 pop(status='COMPLETED',
659 title='Other finished:',
660 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
661 pop(status='STARTED',
662 title='Started:', color=Fore.YELLOW,
663 f=lambda b: (get_name(b), b.get('url')))
664 pop(status='SCHEDULED',
665 title='Scheduled:',
666 f=lambda b: (get_name(b), 'id=%s' % b['id']))
667 # The last section is just in case buildbucket API changes OR there is a bug.
668 pop(title='Other:',
669 f=lambda b: (get_name(b), 'id=%s' % b['id']))
670 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700671 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000672
673
Aiden Bennerc08566e2018-10-03 17:52:42 +0000674def _ComputeDiffLineRanges(files, upstream_commit):
675 """Gets the changed line ranges for each file since upstream_commit.
676
677 Parses a git diff on provided files and returns a dict that maps a file name
678 to an ordered list of range tuples in the form (start_line, count).
679 Ranges are in the same format as a git diff.
680 """
681 # If files is empty then diff_output will be a full diff.
682 if len(files) == 0:
683 return {}
684
685 # Take diff and find the line ranges where there are changes.
686 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
687 diff_output = RunGit(diff_cmd)
688
689 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
690 # 2 capture groups
691 # 0 == fname of diff file
692 # 1 == 'diff_start,diff_count' or 'diff_start'
693 # will match each of
694 # diff --git a/foo.foo b/foo.py
695 # @@ -12,2 +14,3 @@
696 # @@ -12,2 +17 @@
697 # running re.findall on the above string with pattern will give
698 # [('foo.py', ''), ('', '14,3'), ('', '17')]
699
700 curr_file = None
701 line_diffs = {}
702 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
703 if match[0] != '':
704 # Will match the second filename in diff --git a/a.py b/b.py.
705 curr_file = match[0]
706 line_diffs[curr_file] = []
707 else:
708 # Matches +14,3
709 if ',' in match[1]:
710 diff_start, diff_count = match[1].split(',')
711 else:
712 # Single line changes are of the form +12 instead of +12,1.
713 diff_start = match[1]
714 diff_count = 1
715
716 diff_start = int(diff_start)
717 diff_count = int(diff_count)
718
719 # If diff_count == 0 this is a removal we can ignore.
720 line_diffs[curr_file].append((diff_start, diff_count))
721
722 return line_diffs
723
724
725def _FindYapfConfigFile(fpath,
726 yapf_config_cache,
727 top_dir=None,
728 default_style=None):
729 """Checks if a yapf file is in any parent directory of fpath until top_dir.
730
731 Recursively checks parent directories to find yapf file
732 and if no yapf file is found returns default_style.
733 Uses yapf_config_cache as a cache for previously found files.
734 """
735 # Return result if we've already computed it.
736 if fpath in yapf_config_cache:
737 return yapf_config_cache[fpath]
738
739 # Check if there is a style file in the current directory.
740 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
741 dirname = os.path.dirname(fpath)
742 if os.path.isfile(yapf_file):
743 ret = yapf_file
744 elif fpath == top_dir or dirname == fpath:
745 # If we're at the top level directory, or if we're at root
746 # use the chromium default yapf style.
747 ret = default_style
748 else:
749 # Otherwise recurse on the current directory.
750 ret = _FindYapfConfigFile(dirname, yapf_config_cache, top_dir,
751 default_style)
752 yapf_config_cache[fpath] = ret
753 return ret
754
755
qyearsley53f48a12016-09-01 10:45:13 -0700756def write_try_results_json(output_file, builds):
757 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
758
759 The input |builds| dict is assumed to be generated by Buildbucket.
760 Buildbucket documentation: http://goo.gl/G0s101
761 """
762
763 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800764 """Extracts some of the information from one build dict."""
765 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700766 return {
767 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700768 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800769 'builder_name': parameters.get('builder_name'),
770 'created_ts': build.get('created_ts'),
771 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700772 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800773 'result': build.get('result'),
774 'status': build.get('status'),
775 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700776 'url': build.get('url'),
777 }
778
779 converted = []
780 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000781 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700782 write_json(output_file, converted)
783
784
Aaron Gable13101a62018-02-09 13:20:41 -0800785def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000786 """Prints statistics about the change to the user."""
787 # --no-ext-diff is broken in some versions of Git, so try to work around
788 # this by overriding the environment (but there is still a problem if the
789 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000790 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000791 if 'GIT_EXTERNAL_DIFF' in env:
792 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000793
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000794 try:
795 stdout = sys.stdout.fileno()
796 except AttributeError:
797 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000798 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800799 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000800 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000801
802
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000803class BuildbucketResponseException(Exception):
804 pass
805
806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807class Settings(object):
808 def __init__(self):
809 self.default_server = None
810 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 self.tree_status_url = None
813 self.viewvc_url = None
814 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000815 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000816 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000817 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000818 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000819 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000820 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000821
822 def LazyUpdateIfNeeded(self):
823 """Updates the settings from a codereview.settings file, if available."""
824 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000825 # The only value that actually changes the behavior is
826 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000827 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000828 error_ok=True
829 ).strip().lower()
830
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000831 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000832 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 LoadCodereviewSettingsFromFile(cr_settings_file)
834 self.updated = True
835
836 def GetDefaultServerUrl(self, error_ok=False):
837 if not self.default_server:
838 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000839 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000840 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000841 if error_ok:
842 return self.default_server
843 if not self.default_server:
844 error_message = ('Could not find settings file. You must configure '
845 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000846 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000847 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000848 return self.default_server
849
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000850 @staticmethod
851 def GetRelativeRoot():
852 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000853
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000855 if self.root is None:
856 self.root = os.path.abspath(self.GetRelativeRoot())
857 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000858
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000859 def GetGitMirror(self, remote='origin'):
860 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000861 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000862 if not os.path.isdir(local_url):
863 return None
864 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
865 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100866 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100867 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000868 if mirror.exists():
869 return mirror
870 return None
871
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000872 def GetTreeStatusUrl(self, error_ok=False):
873 if not self.tree_status_url:
874 error_message = ('You must configure your tree status URL by running '
875 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000876 self.tree_status_url = self._GetRietveldConfig(
877 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000878 return self.tree_status_url
879
880 def GetViewVCUrl(self):
881 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000882 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 return self.viewvc_url
884
rmistry@google.com90752582014-01-14 21:04:50 +0000885 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000886 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000887
rmistry@google.com78948ed2015-07-08 23:09:57 +0000888 def GetIsSkipDependencyUpload(self, branch_name):
889 """Returns true if specified branch should skip dep uploads."""
890 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
891 error_ok=True)
892
rmistry@google.com5626a922015-02-26 14:03:30 +0000893 def GetRunPostUploadHook(self):
894 run_post_upload_hook = self._GetRietveldConfig(
895 'run-post-upload-hook', error_ok=True)
896 return run_post_upload_hook == "True"
897
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000898 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000899 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000900
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000901 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000902 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000903
ukai@chromium.orge8077812012-02-03 03:41:46 +0000904 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700905 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700907 self.is_gerrit = (
908 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000909 return self.is_gerrit
910
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000911 def GetSquashGerritUploads(self):
912 """Return true if uploads to Gerrit should be squashed by default."""
913 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700914 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
915 if self.squash_gerrit_uploads is None:
916 # Default is squash now (http://crbug.com/611892#c23).
917 self.squash_gerrit_uploads = not (
918 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
919 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000920 return self.squash_gerrit_uploads
921
tandriia60502f2016-06-20 02:01:53 -0700922 def GetSquashGerritUploadsOverride(self):
923 """Return True or False if codereview.settings should be overridden.
924
925 Returns None if no override has been defined.
926 """
927 # See also http://crbug.com/611892#c23
928 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
929 error_ok=True).strip()
930 if result == 'true':
931 return True
932 if result == 'false':
933 return False
934 return None
935
tandrii@chromium.org28253532016-04-14 13:46:56 +0000936 def GetGerritSkipEnsureAuthenticated(self):
937 """Return True if EnsureAuthenticated should not be done for Gerrit
938 uploads."""
939 if self.gerrit_skip_ensure_authenticated is None:
940 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000941 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000942 error_ok=True).strip() == 'true')
943 return self.gerrit_skip_ensure_authenticated
944
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000945 def GetGitEditor(self):
946 """Return the editor specified in the git config, or None if none is."""
947 if self.git_editor is None:
948 self.git_editor = self._GetConfig('core.editor', error_ok=True)
949 return self.git_editor or None
950
thestig@chromium.org44202a22014-03-11 19:22:18 +0000951 def GetLintRegex(self):
952 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
953 DEFAULT_LINT_REGEX)
954
955 def GetLintIgnoreRegex(self):
956 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
957 DEFAULT_LINT_IGNORE_REGEX)
958
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000959 def GetProject(self):
960 if not self.project:
961 self.project = self._GetRietveldConfig('project', error_ok=True)
962 return self.project
963
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000964 def _GetRietveldConfig(self, param, **kwargs):
965 return self._GetConfig('rietveld.' + param, **kwargs)
966
rmistry@google.com78948ed2015-07-08 23:09:57 +0000967 def _GetBranchConfig(self, branch_name, param, **kwargs):
968 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
969
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000970 def _GetConfig(self, param, **kwargs):
971 self.LazyUpdateIfNeeded()
972 return RunGit(['config', param], **kwargs).strip()
973
974
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100975@contextlib.contextmanager
976def _get_gerrit_project_config_file(remote_url):
977 """Context manager to fetch and store Gerrit's project.config from
978 refs/meta/config branch and store it in temp file.
979
980 Provides a temporary filename or None if there was error.
981 """
982 error, _ = RunGitWithCode([
983 'fetch', remote_url,
984 '+refs/meta/config:refs/git_cl/meta/config'])
985 if error:
986 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700987 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100988 (remote_url, error))
989 yield None
990 return
991
992 error, project_config_data = RunGitWithCode(
993 ['show', 'refs/git_cl/meta/config:project.config'])
994 if error:
995 print('WARNING: project.config file not found')
996 yield None
997 return
998
999 with gclient_utils.temporary_directory() as tempdir:
1000 project_config_file = os.path.join(tempdir, 'project.config')
1001 gclient_utils.FileWrite(project_config_file, project_config_data)
1002 yield project_config_file
1003
1004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005def ShortBranchName(branch):
1006 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007 return branch.replace('refs/heads/', '', 1)
1008
1009
1010def GetCurrentBranchRef():
1011 """Returns branch ref (e.g., refs/heads/master) or None."""
1012 return RunGit(['symbolic-ref', 'HEAD'],
1013 stderr=subprocess2.VOID, error_ok=True).strip() or None
1014
1015
1016def GetCurrentBranch():
1017 """Returns current branch or None.
1018
1019 For refs/heads/* branches, returns just last part. For others, full ref.
1020 """
1021 branchref = GetCurrentBranchRef()
1022 if branchref:
1023 return ShortBranchName(branchref)
1024 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025
1026
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001027class _CQState(object):
1028 """Enum for states of CL with respect to Commit Queue."""
1029 NONE = 'none'
1030 DRY_RUN = 'dry_run'
1031 COMMIT = 'commit'
1032
1033 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1034
1035
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001036class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001037 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001038 self.issue = issue
1039 self.patchset = patchset
1040 self.hostname = hostname
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001041 assert codereview in (None, 'gerrit', 'rietveld')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001042 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001043
1044 @property
1045 def valid(self):
1046 return self.issue is not None
1047
1048
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001049def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001050 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1051 fail_result = _ParsedIssueNumberArgument()
1052
1053 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001054 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055 if not arg.startswith('http'):
1056 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001057
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001058 url = gclient_utils.UpgradeToHttps(arg)
1059 try:
1060 parsed_url = urlparse.urlparse(url)
1061 except ValueError:
1062 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001063
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001064 if codereview is not None:
1065 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1066 return parsed or fail_result
1067
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001068 results = {}
1069 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1070 parsed = cls.ParseIssueURL(parsed_url)
1071 if parsed is not None:
1072 results[name] = parsed
1073
1074 if not results:
1075 return fail_result
1076 if len(results) == 1:
1077 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001078
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001079 return results['gerrit']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001080
1081
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001082def _create_description_from_log(args):
1083 """Pulls out the commit log to use as a base for the CL description."""
1084 log_args = []
1085 if len(args) == 1 and not args[0].endswith('.'):
1086 log_args = [args[0] + '..']
1087 elif len(args) == 1 and args[0].endswith('...'):
1088 log_args = [args[0][:-1]]
1089 elif len(args) == 2:
1090 log_args = [args[0] + '..' + args[1]]
1091 else:
1092 log_args = args[:] # Hope for the best!
1093 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1094
1095
Aaron Gablea45ee112016-11-22 15:14:38 -08001096class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001097 def __init__(self, issue, url):
1098 self.issue = issue
1099 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001100 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001101
1102 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001103 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001104 self.issue, self.url)
1105
1106
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001107_CommentSummary = collections.namedtuple(
1108 '_CommentSummary', ['date', 'message', 'sender',
1109 # TODO(tandrii): these two aren't known in Gerrit.
1110 'approval', 'disapproval'])
1111
1112
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001113class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001114 """Changelist works with one changelist in local branch.
1115
1116 Supports two codereview backends: Rietveld or Gerrit, selected at object
1117 creation.
1118
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001119 Notes:
1120 * Not safe for concurrent multi-{thread,process} use.
1121 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001122 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001123 """
1124
1125 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1126 """Create a new ChangeList instance.
1127
1128 If issue is given, the codereview must be given too.
1129
1130 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1131 Otherwise, it's decided based on current configuration of the local branch,
1132 with default being 'rietveld' for backwards compatibility.
1133 See _load_codereview_impl for more details.
1134
1135 **kwargs will be passed directly to codereview implementation.
1136 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001138 global settings
1139 if not settings:
1140 # Happens when git_cl.py is used as a utility library.
1141 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001142
1143 if issue:
1144 assert codereview, 'codereview must be known, if issue is known'
1145
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001146 self.branchref = branchref
1147 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001148 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 self.branch = ShortBranchName(self.branchref)
1150 else:
1151 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001152 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001153 self.lookedup_issue = False
1154 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001155 self.has_description = False
1156 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001157 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001159 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001160 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001161 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001162 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001163
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001164 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001165 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001166 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001167 assert self._codereview_impl
1168 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001169
1170 def _load_codereview_impl(self, codereview=None, **kwargs):
1171 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001172 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1173 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1174 self._codereview = codereview
1175 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001176 return
1177
1178 # Automatic selection based on issue number set for a current branch.
1179 # Rietveld takes precedence over Gerrit.
1180 assert not self.issue
1181 # Whether we find issue or not, we are doing the lookup.
1182 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001183 if self.GetBranch():
1184 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1185 issue = _git_get_branch_config_value(
1186 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1187 if issue:
1188 self._codereview = codereview
1189 self._codereview_impl = cls(self, **kwargs)
1190 self.issue = int(issue)
1191 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001192
1193 # No issue is set for this branch, so decide based on repo-wide settings.
1194 return self._load_codereview_impl(
1195 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1196 **kwargs)
1197
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001198 def IsGerrit(self):
1199 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200
1201 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001202 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001203
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001204 The return value is a string suitable for passing to git cl with the --cc
1205 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001206 """
1207 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001208 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001209 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001210 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1211 return self.cc
1212
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001213 def GetCCListWithoutDefault(self):
1214 """Return the users cc'd on this CL excluding default ones."""
1215 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001216 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001217 return self.cc
1218
Daniel Cheng7227d212017-11-17 08:12:37 -08001219 def ExtendCC(self, more_cc):
1220 """Extends the list of users to cc on this CL based on the changed files."""
1221 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222
1223 def GetBranch(self):
1224 """Returns the short branch name, e.g. 'master'."""
1225 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001226 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001227 if not branchref:
1228 return None
1229 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001230 self.branch = ShortBranchName(self.branchref)
1231 return self.branch
1232
1233 def GetBranchRef(self):
1234 """Returns the full branch name, e.g. 'refs/heads/master'."""
1235 self.GetBranch() # Poke the lazy loader.
1236 return self.branchref
1237
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001238 def ClearBranch(self):
1239 """Clears cached branch data of this object."""
1240 self.branch = self.branchref = None
1241
tandrii5d48c322016-08-18 16:19:37 -07001242 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1243 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1244 kwargs['branch'] = self.GetBranch()
1245 return _git_get_branch_config_value(key, default, **kwargs)
1246
1247 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1248 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1249 assert self.GetBranch(), (
1250 'this CL must have an associated branch to %sset %s%s' %
1251 ('un' if value is None else '',
1252 key,
1253 '' if value is None else ' to %r' % value))
1254 kwargs['branch'] = self.GetBranch()
1255 return _git_set_branch_config_value(key, value, **kwargs)
1256
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001257 @staticmethod
1258 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001259 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 e.g. 'origin', 'refs/heads/master'
1261 """
1262 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001263 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1264
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001266 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001268 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1269 error_ok=True).strip()
1270 if upstream_branch:
1271 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001272 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001273 # Else, try to guess the origin remote.
1274 remote_branches = RunGit(['branch', '-r']).split()
1275 if 'origin/master' in remote_branches:
1276 # Fall back on origin/master if it exits.
1277 remote = 'origin'
1278 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001279 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001280 DieWithError(
1281 'Unable to determine default branch to diff against.\n'
1282 'Either pass complete "git diff"-style arguments, like\n'
1283 ' git cl upload origin/master\n'
1284 'or verify this branch is set up to track another \n'
1285 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001286
1287 return remote, upstream_branch
1288
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001289 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001290 upstream_branch = self.GetUpstreamBranch()
1291 if not BranchExists(upstream_branch):
1292 DieWithError('The upstream for the current branch (%s) does not exist '
1293 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001294 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001295 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001296
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 def GetUpstreamBranch(self):
1298 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001299 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001301 upstream_branch = upstream_branch.replace('refs/heads/',
1302 'refs/remotes/%s/' % remote)
1303 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1304 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001305 self.upstream_branch = upstream_branch
1306 return self.upstream_branch
1307
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001308 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001309 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001310 remote, branch = None, self.GetBranch()
1311 seen_branches = set()
1312 while branch not in seen_branches:
1313 seen_branches.add(branch)
1314 remote, branch = self.FetchUpstreamTuple(branch)
1315 branch = ShortBranchName(branch)
1316 if remote != '.' or branch.startswith('refs/remotes'):
1317 break
1318 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001319 remotes = RunGit(['remote'], error_ok=True).split()
1320 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001321 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001323 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001324 logging.warn('Could not determine which remote this change is '
1325 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001326 else:
1327 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001328 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001329 branch = 'HEAD'
1330 if branch.startswith('refs/remotes'):
1331 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001332 elif branch.startswith('refs/branch-heads/'):
1333 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001334 else:
1335 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001336 return self._remote
1337
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001338 def GitSanityChecks(self, upstream_git_obj):
1339 """Checks git repo status and ensures diff is from local commits."""
1340
sbc@chromium.org79706062015-01-14 21:18:12 +00001341 if upstream_git_obj is None:
1342 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001343 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001344 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001345 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001346 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001347 return False
1348
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001349 # Verify the commit we're diffing against is in our current branch.
1350 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1351 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1352 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001353 print('ERROR: %s is not in the current branch. You may need to rebase '
1354 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001355 return False
1356
1357 # List the commits inside the diff, and verify they are all local.
1358 commits_in_diff = RunGit(
1359 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1360 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1361 remote_branch = remote_branch.strip()
1362 if code != 0:
1363 _, remote_branch = self.GetRemoteBranch()
1364
1365 commits_in_remote = RunGit(
1366 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1367
1368 common_commits = set(commits_in_diff) & set(commits_in_remote)
1369 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001370 print('ERROR: Your diff contains %d commits already in %s.\n'
1371 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1372 'the diff. If you are using a custom git flow, you can override'
1373 ' the reference used for this check with "git config '
1374 'gitcl.remotebranch <git-ref>".' % (
1375 len(common_commits), remote_branch, upstream_git_obj),
1376 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001377 return False
1378 return True
1379
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001380 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001381 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001382
1383 Returns None if it is not set.
1384 """
tandrii5d48c322016-08-18 16:19:37 -07001385 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001386
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001387 def GetRemoteUrl(self):
1388 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1389
1390 Returns None if there is no remote.
1391 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001392 is_cached, value = self._cached_remote_url
1393 if is_cached:
1394 return value
1395
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001396 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001397 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1398
1399 # If URL is pointing to a local directory, it is probably a git cache.
1400 if os.path.isdir(url):
1401 url = RunGit(['config', 'remote.%s.url' % remote],
1402 error_ok=True,
1403 cwd=url).strip()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001404 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001405 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001407 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001408 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001409 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001410 self.issue = self._GitGetBranchConfigValue(
1411 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001412 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413 return self.issue
1414
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 def GetIssueURL(self):
1416 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001417 issue = self.GetIssue()
1418 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001419 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001420 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001422 def GetDescription(self, pretty=False, force=False):
1423 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001424 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001425 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001426 self.has_description = True
1427 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001428 # Set width to 72 columns + 2 space indent.
1429 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001430 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001431 lines = self.description.splitlines()
1432 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001433 return self.description
1434
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001435 def GetDescriptionFooters(self):
1436 """Returns (non_footer_lines, footers) for the commit message.
1437
1438 Returns:
1439 non_footer_lines (list(str)) - Simple list of description lines without
1440 any footer. The lines do not contain newlines, nor does the list contain
1441 the empty line between the message and the footers.
1442 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1443 [("Change-Id", "Ideadbeef...."), ...]
1444 """
1445 raw_description = self.GetDescription()
1446 msg_lines, _, footers = git_footers.split_footers(raw_description)
1447 if footers:
1448 msg_lines = msg_lines[:len(msg_lines)-1]
1449 return msg_lines, footers
1450
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001451 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001452 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001453 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001454 self.patchset = self._GitGetBranchConfigValue(
1455 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001456 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001457 return self.patchset
1458
1459 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001460 """Set this branch's patchset. If patchset=0, clears the patchset."""
1461 assert self.GetBranch()
1462 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001463 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001464 else:
1465 self.patchset = int(patchset)
1466 self._GitSetBranchConfigValue(
1467 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001468
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001469 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001470 """Set this branch's issue. If issue isn't given, clears the issue."""
1471 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001472 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001473 issue = int(issue)
1474 self._GitSetBranchConfigValue(
1475 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001476 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001477 codereview_server = self._codereview_impl.GetCodereviewServer()
1478 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001479 self._GitSetBranchConfigValue(
1480 self._codereview_impl.CodereviewServerConfigKey(),
1481 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001482 else:
tandrii5d48c322016-08-18 16:19:37 -07001483 # Reset all of these just to be clean.
1484 reset_suffixes = [
1485 'last-upload-hash',
1486 self._codereview_impl.IssueConfigKey(),
1487 self._codereview_impl.PatchsetConfigKey(),
1488 self._codereview_impl.CodereviewServerConfigKey(),
1489 ] + self._PostUnsetIssueProperties()
1490 for prop in reset_suffixes:
1491 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001492 msg = RunGit(['log', '-1', '--format=%B']).strip()
1493 if msg and git_footers.get_footer_change_id(msg):
1494 print('WARNING: The change patched into this branch has a Change-Id. '
1495 'Removing it.')
1496 RunGit(['commit', '--amend', '-m',
1497 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001498 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001499 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001500
dnjba1b0f32016-09-02 12:37:42 -07001501 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001502 if not self.GitSanityChecks(upstream_branch):
1503 DieWithError('\nGit sanity check failure')
1504
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001505 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001506 if not root:
1507 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001508 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001509
1510 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001511 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001512 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001513 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001514 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001515 except subprocess2.CalledProcessError:
1516 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001517 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001518 'This branch probably doesn\'t exist anymore. To reset the\n'
1519 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001520 ' git branch --set-upstream-to origin/master %s\n'
1521 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001522 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001523
maruel@chromium.org52424302012-08-29 15:14:30 +00001524 issue = self.GetIssue()
1525 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001526 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001527 description = self.GetDescription()
1528 else:
1529 # If the change was never uploaded, use the log messages of all commits
1530 # up to the branch point, as git cl upload will prefill the description
1531 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001532 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1533 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001534
1535 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001536 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001537 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001538 name,
1539 description,
1540 absroot,
1541 files,
1542 issue,
1543 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001544 author,
1545 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001546
dsansomee2d6fd92016-09-08 00:10:47 -07001547 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001548 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001549 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001550 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001551
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001552 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1553 """Sets the description for this CL remotely.
1554
1555 You can get description_lines and footers with GetDescriptionFooters.
1556
1557 Args:
1558 description_lines (list(str)) - List of CL description lines without
1559 newline characters.
1560 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1561 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1562 `List-Of-Tokens`). It will be case-normalized so that each token is
1563 title-cased.
1564 """
1565 new_description = '\n'.join(description_lines)
1566 if footers:
1567 new_description += '\n'
1568 for k, v in footers:
1569 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1570 if not git_footers.FOOTER_PATTERN.match(foot):
1571 raise ValueError('Invalid footer %r' % foot)
1572 new_description += foot + '\n'
1573 self.UpdateDescription(new_description, force)
1574
Edward Lesmes8e282792018-04-03 18:50:29 -04001575 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001576 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1577 try:
1578 return presubmit_support.DoPresubmitChecks(change, committing,
1579 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1580 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001581 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1582 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001583 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001584 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001585
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001586 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1587 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001588 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1589 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001590 else:
1591 # Assume url.
1592 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1593 urlparse.urlparse(issue_arg))
1594 if not parsed_issue_arg or not parsed_issue_arg.valid:
1595 DieWithError('Failed to parse issue argument "%s". '
1596 'Must be an issue number or a valid URL.' % issue_arg)
1597 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001598 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001599
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001600 def CMDUpload(self, options, git_diff_args, orig_args):
1601 """Uploads a change to codereview."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001602 assert self.IsGerrit()
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001603 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001604 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001605 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001606 else:
1607 if self.GetBranch() is None:
1608 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1609
1610 # Default to diffing against common ancestor of upstream branch
1611 base_branch = self.GetCommonAncestorWithUpstream()
1612 git_diff_args = [base_branch, 'HEAD']
1613
Aaron Gablec4c40d12017-05-22 11:49:53 -07001614
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001615 # Fast best-effort checks to abort before running potentially
1616 # expensive hooks if uploading is likely to fail anyway. Passing these
1617 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001618 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001619 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001620
1621 # Apply watchlists on upload.
1622 change = self.GetChange(base_branch, None)
1623 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1624 files = [f.LocalPath() for f in change.AffectedFiles()]
1625 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001626 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001627
1628 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001629 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001630 # Set the reviewer list now so that presubmit checks can access it.
1631 change_description = ChangeDescription(change.FullDescriptionText())
1632 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001633 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001634 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001635 change)
1636 change.SetDescriptionText(change_description.description)
1637 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001638 may_prompt=not options.force,
1639 verbose=options.verbose,
1640 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001641 if not hook_results.should_continue():
1642 return 1
1643 if not options.reviewers and hook_results.reviewers:
1644 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001645 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001646
Aaron Gable13101a62018-02-09 13:20:41 -08001647 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001648 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001649 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001650 _git_set_branch_config_value('last-upload-hash',
1651 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001652 # Run post upload hooks, if specified.
1653 if settings.GetRunPostUploadHook():
1654 presubmit_support.DoPostUploadExecuter(
1655 change,
1656 self,
1657 settings.GetRoot(),
1658 options.verbose,
1659 sys.stdout)
1660
1661 # Upload all dependencies if specified.
1662 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001663 print()
1664 print('--dependencies has been specified.')
1665 print('All dependent local branches will be re-uploaded.')
1666 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001667 # Remove the dependencies flag from args so that we do not end up in a
1668 # loop.
1669 orig_args.remove('--dependencies')
1670 ret = upload_branch_deps(self, orig_args)
1671 return ret
1672
Ravi Mistry31e7d562018-04-02 12:53:57 -04001673 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1674 """Sets labels on the change based on the provided flags.
1675
1676 Sets labels if issue is already uploaded and known, else returns without
1677 doing anything.
1678
1679 Args:
1680 enable_auto_submit: Sets Auto-Submit+1 on the change.
1681 use_commit_queue: Sets Commit-Queue+2 on the change.
1682 cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
1683 both use_commit_queue and cq_dry_run are true.
1684 """
1685 if not self.GetIssue():
1686 return
1687 try:
1688 self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
1689 cq_dry_run)
1690 return 0
1691 except KeyboardInterrupt:
1692 raise
1693 except:
1694 labels = []
1695 if enable_auto_submit:
1696 labels.append('Auto-Submit')
1697 if use_commit_queue or cq_dry_run:
1698 labels.append('Commit-Queue')
1699 print('WARNING: Failed to set label(s) on your change: %s\n'
1700 'Either:\n'
1701 ' * Your project does not have the above label(s),\n'
1702 ' * You don\'t have permission to set the above label(s),\n'
1703 ' * There\'s a bug in this code (see stack trace below).\n' %
1704 (', '.join(labels)))
1705 # Still raise exception so that stack trace is printed.
1706 raise
1707
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001708 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001709 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001710
1711 Issue must have been already uploaded and known.
1712 """
1713 assert new_state in _CQState.ALL_STATES
1714 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001715 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001716 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001717 return 0
1718 except KeyboardInterrupt:
1719 raise
1720 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001721 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001722 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001723 ' * Your project has no CQ,\n'
1724 ' * You don\'t have permission to change the CQ state,\n'
1725 ' * There\'s a bug in this code (see stack trace below).\n'
1726 'Consider specifying which bots to trigger manually or asking your '
1727 'project owners for permissions or contacting Chrome Infra at:\n'
1728 'https://www.chromium.org/infra\n\n' %
1729 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001730 # Still raise exception so that stack trace is printed.
1731 raise
1732
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733 # Forward methods to codereview specific implementation.
1734
Aaron Gable636b13f2017-07-14 10:42:48 -07001735 def AddComment(self, message, publish=None):
1736 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001737
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001738 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001739 """Returns list of _CommentSummary for each comment.
1740
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001741 args:
1742 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001743 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001744 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001745
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001746 def CloseIssue(self):
1747 return self._codereview_impl.CloseIssue()
1748
1749 def GetStatus(self):
1750 return self._codereview_impl.GetStatus()
1751
1752 def GetCodereviewServer(self):
1753 return self._codereview_impl.GetCodereviewServer()
1754
tandriide281ae2016-10-12 06:02:30 -07001755 def GetIssueOwner(self):
1756 """Get owner from codereview, which may differ from this checkout."""
1757 return self._codereview_impl.GetIssueOwner()
1758
Edward Lemur707d70b2018-02-07 00:50:14 +01001759 def GetReviewers(self):
1760 return self._codereview_impl.GetReviewers()
1761
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001762 def GetMostRecentPatchset(self):
1763 return self._codereview_impl.GetMostRecentPatchset()
1764
tandriide281ae2016-10-12 06:02:30 -07001765 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001766 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001767 return self._codereview_impl.CannotTriggerTryJobReason()
1768
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001769 def GetTryJobProperties(self, patchset=None):
1770 """Returns dictionary of properties to launch try job."""
1771 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001772
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001773 def __getattr__(self, attr):
1774 # This is because lots of untested code accesses Rietveld-specific stuff
1775 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001776 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001777 # Note that child method defines __getattr__ as well, and forwards it here,
1778 # because _RietveldChangelistImpl is not cleaned up yet, and given
1779 # deprecation of Rietveld, it should probably be just removed.
1780 # Until that time, avoid infinite recursion by bypassing __getattr__
1781 # of implementation class.
1782 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001783
1784
1785class _ChangelistCodereviewBase(object):
1786 """Abstract base class encapsulating codereview specifics of a changelist."""
1787 def __init__(self, changelist):
1788 self._changelist = changelist # instance of Changelist
1789
1790 def __getattr__(self, attr):
1791 # Forward methods to changelist.
1792 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1793 # _RietveldChangelistImpl to avoid this hack?
1794 return getattr(self._changelist, attr)
1795
1796 def GetStatus(self):
1797 """Apply a rough heuristic to give a simple summary of an issue's review
1798 or CQ status, assuming adherence to a common workflow.
1799
1800 Returns None if no issue for this branch, or specific string keywords.
1801 """
1802 raise NotImplementedError()
1803
1804 def GetCodereviewServer(self):
1805 """Returns server URL without end slash, like "https://codereview.com"."""
1806 raise NotImplementedError()
1807
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001808 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001809 """Fetches and returns description from the codereview server."""
1810 raise NotImplementedError()
1811
tandrii5d48c322016-08-18 16:19:37 -07001812 @classmethod
1813 def IssueConfigKey(cls):
1814 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001815 raise NotImplementedError()
1816
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001817 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001818 def PatchsetConfigKey(cls):
1819 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001820 raise NotImplementedError()
1821
tandrii5d48c322016-08-18 16:19:37 -07001822 @classmethod
1823 def CodereviewServerConfigKey(cls):
1824 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825 raise NotImplementedError()
1826
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001827 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001828 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001829 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001830
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001831 def GetGerritObjForPresubmit(self):
1832 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1833 return None
1834
dsansomee2d6fd92016-09-08 00:10:47 -07001835 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 """Update the description on codereview site."""
1837 raise NotImplementedError()
1838
Aaron Gable636b13f2017-07-14 10:42:48 -07001839 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001840 """Posts a comment to the codereview site."""
1841 raise NotImplementedError()
1842
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001843 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001844 raise NotImplementedError()
1845
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001846 def CloseIssue(self):
1847 """Closes the issue."""
1848 raise NotImplementedError()
1849
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001850 def GetMostRecentPatchset(self):
1851 """Returns the most recent patchset number from the codereview site."""
1852 raise NotImplementedError()
1853
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001854 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001855 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001856 """Fetches and applies the issue.
1857
1858 Arguments:
1859 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1860 reject: if True, reject the failed patch instead of switching to 3-way
1861 merge. Rietveld only.
1862 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1863 only.
1864 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001865 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001866 """
1867 raise NotImplementedError()
1868
1869 @staticmethod
1870 def ParseIssueURL(parsed_url):
1871 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1872 failed."""
1873 raise NotImplementedError()
1874
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001875 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001876 """Best effort check that user is authenticated with codereview server.
1877
1878 Arguments:
1879 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001880 refresh: whether to attempt to refresh credentials. Ignored if not
1881 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001882 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001883 raise NotImplementedError()
1884
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001885 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001886 """Best effort check that uploading isn't supposed to fail for predictable
1887 reasons.
1888
1889 This method should raise informative exception if uploading shouldn't
1890 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001891
1892 Arguments:
1893 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001894 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001895 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001896
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001897 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001898 """Uploads a change to codereview."""
1899 raise NotImplementedError()
1900
Ravi Mistry31e7d562018-04-02 12:53:57 -04001901 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1902 """Sets labels on the change based on the provided flags.
1903
1904 Issue must have been already uploaded and known.
1905 """
1906 raise NotImplementedError()
1907
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001908 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001909 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001910
1911 Issue must have been already uploaded and known.
1912 """
1913 raise NotImplementedError()
1914
tandriie113dfd2016-10-11 10:20:12 -07001915 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001916 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001917 raise NotImplementedError()
1918
tandriide281ae2016-10-12 06:02:30 -07001919 def GetIssueOwner(self):
1920 raise NotImplementedError()
1921
Edward Lemur707d70b2018-02-07 00:50:14 +01001922 def GetReviewers(self):
1923 raise NotImplementedError()
1924
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001925 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001926 raise NotImplementedError()
1927
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001928
1929class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001930
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001931 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932 super(_RietveldChangelistImpl, self).__init__(changelist)
1933 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001934 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001935 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001937 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001938 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001939 self._props = None
1940 self._rpc_server = None
1941
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001942 def GetCodereviewServer(self):
1943 if not self._rietveld_server:
1944 # If we're on a branch then get the server potentially associated
1945 # with that branch.
1946 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001947 self._rietveld_server = gclient_utils.UpgradeToHttps(
1948 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001949 if not self._rietveld_server:
1950 self._rietveld_server = settings.GetDefaultServerUrl()
1951 return self._rietveld_server
1952
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001953 def EnsureAuthenticated(self, force, refresh=False):
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001954 raise NotImplementedError
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001955
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001956 def EnsureCanUploadPatchset(self, force):
1957 # No checks for Rietveld because we are deprecating Rietveld.
1958 pass
1959
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001960 def FetchDescription(self, force=False):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001961 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001962
1963 def GetMostRecentPatchset(self):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001964 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001965
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966 def GetIssueProperties(self):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001967 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968
tandriie113dfd2016-10-11 10:20:12 -07001969 def CannotTriggerTryJobReason(self):
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00001970 raise NotImplementedError()
tandriie113dfd2016-10-11 10:20:12 -07001971
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001972 def GetTryJobProperties(self, patchset=None):
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00001973 raise NotImplementedError()
tandrii8c5a3532016-11-04 07:52:02 -07001974
tandriide281ae2016-10-12 06:02:30 -07001975 def GetIssueOwner(self):
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001976 raise NotImplementedError()
tandriide281ae2016-10-12 06:02:30 -07001977
Edward Lemur707d70b2018-02-07 00:50:14 +01001978 def GetReviewers(self):
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001979 raise NotImplementedError()
Edward Lemur707d70b2018-02-07 00:50:14 +01001980
Aaron Gable636b13f2017-07-14 10:42:48 -07001981 def AddComment(self, message, publish=None):
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001982 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001983
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001984 def GetCommentsSummary(self, readable=True):
1985 raise NotImplementedError()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001986
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001987 def GetStatus(self):
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001988 raise NotImplementedError()
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001989
dsansomee2d6fd92016-09-08 00:10:47 -07001990 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001991 raise NotImplementedError()
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001992
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001993 def CloseIssue(self):
Andrii Shyshkalov38d36a62018-10-16 06:22:31 +00001994 raise NotImplementedError()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001995
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001996 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07001997 return self.SetFlags({flag: value})
1998
1999 def SetFlags(self, flags):
2000 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002001 """
phajdan.jr68598232016-08-10 03:28:28 -07002002 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002003 try:
tandrii4b233bd2016-07-06 03:50:29 -07002004 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002005 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002006 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002007 if e.code == 404:
2008 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2009 if e.code == 403:
2010 DieWithError(
2011 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002012 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002013 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002014
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002015 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002016 """Returns an upload.RpcServer() to access this review's rietveld instance.
2017 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002018 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002019 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002020 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002021 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002022 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002023
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002024 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002025 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002026 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002027
tandrii5d48c322016-08-18 16:19:37 -07002028 @classmethod
2029 def PatchsetConfigKey(cls):
2030 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002031
tandrii5d48c322016-08-18 16:19:37 -07002032 @classmethod
2033 def CodereviewServerConfigKey(cls):
2034 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002035
Ravi Mistry31e7d562018-04-02 12:53:57 -04002036 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
2037 raise NotImplementedError()
2038
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002039 def SetCQState(self, new_state):
2040 props = self.GetIssueProperties()
2041 if props.get('private'):
2042 DieWithError('Cannot set-commit on private issue')
2043
2044 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002045 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002046 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002047 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002048 else:
tandrii4b233bd2016-07-06 03:50:29 -07002049 assert new_state == _CQState.DRY_RUN
2050 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002051
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002052 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002053 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002054 # PatchIssue should never be called with a dirty tree. It is up to the
2055 # caller to check this, but just in case we assert here since the
2056 # consequences of the caller not checking this could be dire.
2057 assert(not git_common.is_dirty_git_tree('apply'))
2058 assert(parsed_issue_arg.valid)
2059 self._changelist.issue = parsed_issue_arg.issue
2060 if parsed_issue_arg.hostname:
2061 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2062
skobes6468b902016-10-24 08:45:10 -07002063 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2064 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2065 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002066 try:
skobes6468b902016-10-24 08:45:10 -07002067 scm_obj.apply_patch(patchset_object)
2068 except Exception as e:
2069 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002070 return 1
2071
2072 # If we had an issue, commit the current state and register the issue.
2073 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002074 self.SetIssue(self.GetIssue())
2075 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002076 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2077 'patch from issue %(i)s at patchset '
2078 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2079 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002080 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002081 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002082 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002083 return 0
2084
2085 @staticmethod
2086 def ParseIssueURL(parsed_url):
2087 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2088 return None
wychen3c1c1722016-08-04 11:46:36 -07002089 # Rietveld patch: https://domain/<number>/#ps<patchset>
2090 match = re.match(r'/(\d+)/$', parsed_url.path)
2091 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2092 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002093 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002094 issue=int(match.group(1)),
2095 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002096 hostname=parsed_url.netloc,
2097 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002098 # Typical url: https://domain/<issue_number>[/[other]]
2099 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2100 if match:
skobes6468b902016-10-24 08:45:10 -07002101 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002102 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002103 hostname=parsed_url.netloc,
2104 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002105 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2106 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2107 if match:
skobes6468b902016-10-24 08:45:10 -07002108 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002109 issue=int(match.group(1)),
2110 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002111 hostname=parsed_url.netloc,
2112 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002113 return None
2114
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002115 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002116 """Upload the patch to Rietveld."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00002117 raise NotImplementedError
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002118
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002119
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002120class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002121 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002122 # auth_config is Rietveld thing, kept here to preserve interface only.
2123 super(_GerritChangelistImpl, self).__init__(changelist)
2124 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002125 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002126 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002127 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002128 # Map from change number (issue) to its detail cache.
2129 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002130
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002131 if codereview_host is not None:
2132 assert not codereview_host.startswith('https://'), codereview_host
2133 self._gerrit_host = codereview_host
2134 self._gerrit_server = 'https://%s' % codereview_host
2135
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002136 def _GetGerritHost(self):
2137 # Lazy load of configs.
2138 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002139 if self._gerrit_host and '.' not in self._gerrit_host:
2140 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2141 # This happens for internal stuff http://crbug.com/614312.
2142 parsed = urlparse.urlparse(self.GetRemoteUrl())
2143 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002144 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002145 ' Your current remote is: %s' % self.GetRemoteUrl())
2146 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2147 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002148 return self._gerrit_host
2149
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002150 def _GetGitHost(self):
2151 """Returns git host to be used when uploading change to Gerrit."""
2152 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2153
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002154 def GetCodereviewServer(self):
2155 if not self._gerrit_server:
2156 # If we're on a branch then get the server potentially associated
2157 # with that branch.
2158 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002159 self._gerrit_server = self._GitGetBranchConfigValue(
2160 self.CodereviewServerConfigKey())
2161 if self._gerrit_server:
2162 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002163 if not self._gerrit_server:
2164 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2165 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002166 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002167 parts[0] = parts[0] + '-review'
2168 self._gerrit_host = '.'.join(parts)
2169 self._gerrit_server = 'https://%s' % self._gerrit_host
2170 return self._gerrit_server
2171
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002172 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002173 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002174 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002175 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002176 logging.warn('can\'t detect Gerrit project.')
2177 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002178 project = urlparse.urlparse(remote_url).path.strip('/')
2179 if project.endswith('.git'):
2180 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002181 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2182 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2183 # gitiles/git-over-https protocol. E.g.,
2184 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2185 # as
2186 # https://chromium.googlesource.com/v8/v8
2187 if project.startswith('a/'):
2188 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002189 return project
2190
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002191 def _GerritChangeIdentifier(self):
2192 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2193
2194 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002195 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002196 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002197 project = self._GetGerritProject()
2198 if project:
2199 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2200 # Fall back on still unique, but less efficient change number.
2201 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002202
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002203 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002204 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002205 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002206
tandrii5d48c322016-08-18 16:19:37 -07002207 @classmethod
2208 def PatchsetConfigKey(cls):
2209 return 'gerritpatchset'
2210
2211 @classmethod
2212 def CodereviewServerConfigKey(cls):
2213 return 'gerritserver'
2214
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002215 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002216 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002217 if settings.GetGerritSkipEnsureAuthenticated():
2218 # For projects with unusual authentication schemes.
2219 # See http://crbug.com/603378.
2220 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002221
2222 # Check presence of cookies only if using cookies-based auth method.
2223 cookie_auth = gerrit_util.Authenticator.get()
2224 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002225 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002226
2227 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002228 self.GetCodereviewServer()
2229 git_host = self._GetGitHost()
2230 assert self._gerrit_server and self._gerrit_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002231
2232 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2233 git_auth = cookie_auth.get_auth_header(git_host)
2234 if gerrit_auth and git_auth:
2235 if gerrit_auth == git_auth:
2236 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002237 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002238 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002239 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002240 ' %s\n'
2241 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002242 ' Consider running the following command:\n'
2243 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002244 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002245 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002246 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002247 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002248 cookie_auth.get_new_password_message(git_host)))
2249 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002250 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002251 return
2252 else:
2253 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002254 ([] if gerrit_auth else [self._gerrit_host]) +
2255 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002256 DieWithError('Credentials for the following hosts are required:\n'
2257 ' %s\n'
2258 'These are read from %s (or legacy %s)\n'
2259 '%s' % (
2260 '\n '.join(missing),
2261 cookie_auth.get_gitcookies_path(),
2262 cookie_auth.get_netrc_path(),
2263 cookie_auth.get_new_password_message(git_host)))
2264
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002265 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002266 if not self.GetIssue():
2267 return
2268
2269 # Warm change details cache now to avoid RPCs later, reducing latency for
2270 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002271 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002272 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002273
2274 status = self._GetChangeDetail()['status']
2275 if status in ('MERGED', 'ABANDONED'):
2276 DieWithError('Change %s has been %s, new uploads are not allowed' %
2277 (self.GetIssueURL(),
2278 'submitted' if status == 'MERGED' else 'abandoned'))
2279
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002280 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2281 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2282 # Apparently this check is not very important? Otherwise get_auth_email
2283 # could have been added to other implementations of Authenticator.
2284 cookies_auth = gerrit_util.Authenticator.get()
2285 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002286 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002287
2288 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002289 if self.GetIssueOwner() == cookies_user:
2290 return
2291 logging.debug('change %s owner is %s, cookies user is %s',
2292 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002293 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002294 # so ask what Gerrit thinks of this user.
2295 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2296 if details['email'] == self.GetIssueOwner():
2297 return
2298 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002299 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002300 'as %s.\n'
2301 'Uploading may fail due to lack of permissions.' %
2302 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2303 confirm_or_exit(action='upload')
2304
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002305 def _PostUnsetIssueProperties(self):
2306 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002307 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002308
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002309 def GetGerritObjForPresubmit(self):
2310 return presubmit_support.GerritAccessor(self._GetGerritHost())
2311
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002312 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002313 """Apply a rough heuristic to give a simple summary of an issue's review
2314 or CQ status, assuming adherence to a common workflow.
2315
2316 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002317 * 'error' - error from review tool (including deleted issues)
2318 * 'unsent' - no reviewers added
2319 * 'waiting' - waiting for review
2320 * 'reply' - waiting for uploader to reply to review
2321 * 'lgtm' - Code-Review label has been set
2322 * 'commit' - in the commit queue
2323 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002324 """
2325 if not self.GetIssue():
2326 return None
2327
2328 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002329 data = self._GetChangeDetail([
2330 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002331 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002332 return 'error'
2333
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002334 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002335 return 'closed'
2336
Aaron Gable9ab38c62017-04-06 14:36:33 -07002337 if data['labels'].get('Commit-Queue', {}).get('approved'):
2338 # The section will have an "approved" subsection if anyone has voted
2339 # the maximum value on the label.
2340 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002341
Aaron Gable9ab38c62017-04-06 14:36:33 -07002342 if data['labels'].get('Code-Review', {}).get('approved'):
2343 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002344
2345 if not data.get('reviewers', {}).get('REVIEWER', []):
2346 return 'unsent'
2347
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002348 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002349 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2350 last_message_author = messages.pop().get('author', {})
2351 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002352 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2353 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002354 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002355 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002356 if last_message_author.get('_account_id') == owner:
2357 # Most recent message was by owner.
2358 return 'waiting'
2359 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002360 # Some reply from non-owner.
2361 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002362
2363 # Somehow there are no messages even though there are reviewers.
2364 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002365
2366 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002367 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002368 patchset = data['revisions'][data['current_revision']]['_number']
2369 self.SetPatchset(patchset)
2370 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002371
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002372 def FetchDescription(self, force=False):
2373 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2374 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002375 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002376 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002377
dsansomee2d6fd92016-09-08 00:10:47 -07002378 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002379 if gerrit_util.HasPendingChangeEdit(
2380 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002381 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002382 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002383 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002384 'unpublished edit. Either publish the edit in the Gerrit web UI '
2385 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002386
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002387 gerrit_util.DeletePendingChangeEdit(
2388 self._GetGerritHost(), self._GerritChangeIdentifier())
2389 gerrit_util.SetCommitMessage(
2390 self._GetGerritHost(), self._GerritChangeIdentifier(),
2391 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002392
Aaron Gable636b13f2017-07-14 10:42:48 -07002393 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002394 gerrit_util.SetReview(
2395 self._GetGerritHost(), self._GerritChangeIdentifier(),
2396 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002397
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002398 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002399 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002400 messages = self._GetChangeDetail(
2401 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2402 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002403 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002404
2405 # Build dictionary of file comments for easy access and sorting later.
2406 # {author+date: {path: {patchset: {line: url+message}}}}
2407 comments = collections.defaultdict(
2408 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2409 for path, line_comments in file_comments.iteritems():
2410 for comment in line_comments:
2411 if comment.get('tag', '').startswith('autogenerated'):
2412 continue
2413 key = (comment['author']['email'], comment['updated'])
2414 if comment.get('side', 'REVISION') == 'PARENT':
2415 patchset = 'Base'
2416 else:
2417 patchset = 'PS%d' % comment['patch_set']
2418 line = comment.get('line', 0)
2419 url = ('https://%s/c/%s/%s/%s#%s%s' %
2420 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2421 'b' if comment.get('side') == 'PARENT' else '',
2422 str(line) if line else ''))
2423 comments[key][path][patchset][line] = (url, comment['message'])
2424
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002425 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002426 for msg in messages:
2427 # Don't bother showing autogenerated messages.
2428 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2429 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002430 # Gerrit spits out nanoseconds.
2431 assert len(msg['date'].split('.')[-1]) == 9
2432 date = datetime.datetime.strptime(msg['date'][:-3],
2433 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002434 message = msg['message']
2435 key = (msg['author']['email'], msg['date'])
2436 if key in comments:
2437 message += '\n'
2438 for path, patchsets in sorted(comments.get(key, {}).items()):
2439 if readable:
2440 message += '\n%s' % path
2441 for patchset, lines in sorted(patchsets.items()):
2442 for line, (url, content) in sorted(lines.items()):
2443 if line:
2444 line_str = 'Line %d' % line
2445 path_str = '%s:%d:' % (path, line)
2446 else:
2447 line_str = 'File comment'
2448 path_str = '%s:0:' % path
2449 if readable:
2450 message += '\n %s, %s: %s' % (patchset, line_str, url)
2451 message += '\n %s\n' % content
2452 else:
2453 message += '\n%s ' % path_str
2454 message += '\n%s\n' % content
2455
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002456 summary.append(_CommentSummary(
2457 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002458 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002459 sender=msg['author']['email'],
2460 # These could be inferred from the text messages and correlated with
2461 # Code-Review label maximum, however this is not reliable.
2462 # Leaving as is until the need arises.
2463 approval=False,
2464 disapproval=False,
2465 ))
2466 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002467
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002468 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002469 gerrit_util.AbandonChange(
2470 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002471
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002472 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002473 gerrit_util.SubmitChange(
2474 self._GetGerritHost(), self._GerritChangeIdentifier(),
2475 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002476
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002477 def _GetChangeDetail(self, options=None, no_cache=False):
2478 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002479
2480 If fresh data is needed, set no_cache=True which will clear cache and
2481 thus new data will be fetched from Gerrit.
2482 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002483 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002484 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002485
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002486 # Optimization to avoid multiple RPCs:
2487 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2488 'CURRENT_COMMIT' not in options):
2489 options.append('CURRENT_COMMIT')
2490
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002491 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002492 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002493 options = [o.upper() for o in options]
2494
2495 # Check in cache first unless no_cache is True.
2496 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002497 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002498 else:
2499 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002500 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002501 # Assumption: data fetched before with extra options is suitable
2502 # for return for a smaller set of options.
2503 # For example, if we cached data for
2504 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2505 # and request is for options=[CURRENT_REVISION],
2506 # THEN we can return prior cached data.
2507 if options_set.issubset(cached_options_set):
2508 return data
2509
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002510 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002511 data = gerrit_util.GetChangeDetail(
2512 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002513 except gerrit_util.GerritError as e:
2514 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002515 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002516 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002517
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002518 self._detail_cache.setdefault(cache_key, []).append(
2519 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002520 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002521
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002522 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002523 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002524 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002525 data = gerrit_util.GetChangeCommit(
2526 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002527 except gerrit_util.GerritError as e:
2528 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002529 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002530 raise
agable32978d92016-11-01 12:55:02 -07002531 return data
2532
Olivier Robin75ee7252018-04-13 10:02:56 +02002533 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002534 if git_common.is_dirty_git_tree('land'):
2535 return 1
tandriid60367b2016-06-22 05:25:12 -07002536 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2537 if u'Commit-Queue' in detail.get('labels', {}):
2538 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002539 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2540 'which can test and land changes for you. '
2541 'Are you sure you wish to bypass it?\n',
2542 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002543
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002544 differs = True
tandriic4344b52016-08-29 06:04:54 -07002545 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002546 # Note: git diff outputs nothing if there is no diff.
2547 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002548 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002549 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002550 if detail['current_revision'] == last_upload:
2551 differs = False
2552 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002553 print('WARNING: Local branch contents differ from latest uploaded '
2554 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002555 if differs:
2556 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002557 confirm_or_exit(
2558 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2559 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002560 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002561 elif not bypass_hooks:
2562 hook_results = self.RunHook(
2563 committing=True,
2564 may_prompt=not force,
2565 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002566 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2567 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002568 if not hook_results.should_continue():
2569 return 1
2570
2571 self.SubmitIssue(wait_for_merge=True)
2572 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002573 links = self._GetChangeCommit().get('web_links', [])
2574 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002575 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002576 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002577 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002578 return 0
2579
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002580 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002581 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002582 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002583 assert not directory
2584 assert parsed_issue_arg.valid
2585
2586 self._changelist.issue = parsed_issue_arg.issue
2587
2588 if parsed_issue_arg.hostname:
2589 self._gerrit_host = parsed_issue_arg.hostname
2590 self._gerrit_server = 'https://%s' % self._gerrit_host
2591
tandriic2405f52016-10-10 08:13:15 -07002592 try:
2593 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002594 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002595 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002596
2597 if not parsed_issue_arg.patchset:
2598 # Use current revision by default.
2599 revision_info = detail['revisions'][detail['current_revision']]
2600 patchset = int(revision_info['_number'])
2601 else:
2602 patchset = parsed_issue_arg.patchset
2603 for revision_info in detail['revisions'].itervalues():
2604 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2605 break
2606 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002607 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002608 (parsed_issue_arg.patchset, self.GetIssue()))
2609
Aaron Gable697a91b2018-01-19 15:20:15 -08002610 remote_url = self._changelist.GetRemoteUrl()
2611 if remote_url.endswith('.git'):
2612 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002613 remote_url = remote_url.rstrip('/')
2614
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002615 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002616 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002617
2618 if remote_url != fetch_info['url']:
2619 DieWithError('Trying to patch a change from %s but this repo appears '
2620 'to be %s.' % (fetch_info['url'], remote_url))
2621
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002622 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002623
Aaron Gable62619a32017-06-16 08:22:09 -07002624 if force:
2625 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2626 print('Checked out commit for change %i patchset %i locally' %
2627 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002628 elif nocommit:
2629 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2630 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002631 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002632 RunGit(['cherry-pick', 'FETCH_HEAD'])
2633 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002634 (parsed_issue_arg.issue, patchset))
2635 print('Note: this created a local commit which does not have '
2636 'the same hash as the one uploaded for review. This will make '
2637 'uploading changes based on top of this branch difficult.\n'
2638 'If you want to do that, use "git cl patch --force" instead.')
2639
Stefan Zagerd08043c2017-10-12 12:07:02 -07002640 if self.GetBranch():
2641 self.SetIssue(parsed_issue_arg.issue)
2642 self.SetPatchset(patchset)
2643 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2644 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2645 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2646 else:
2647 print('WARNING: You are in detached HEAD state.\n'
2648 'The patch has been applied to your checkout, but you will not be '
2649 'able to upload a new patch set to the gerrit issue.\n'
2650 'Try using the \'-b\' option if you would like to work on a '
2651 'branch and/or upload a new patch set.')
2652
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002653 return 0
2654
2655 @staticmethod
2656 def ParseIssueURL(parsed_url):
2657 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2658 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002659 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2660 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002661 # Short urls like https://domain/<issue_number> can be used, but don't allow
2662 # specifying the patchset (you'd 404), but we allow that here.
2663 if parsed_url.path == '/':
2664 part = parsed_url.fragment
2665 else:
2666 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002667 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002668 if match:
2669 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002670 issue=int(match.group(3)),
2671 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002672 hostname=parsed_url.netloc,
2673 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002674 return None
2675
tandrii16e0b4e2016-06-07 10:34:28 -07002676 def _GerritCommitMsgHookCheck(self, offer_removal):
2677 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2678 if not os.path.exists(hook):
2679 return
2680 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2681 # custom developer made one.
2682 data = gclient_utils.FileRead(hook)
2683 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2684 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002685 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002686 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002687 'and may interfere with it in subtle ways.\n'
2688 'We recommend you remove the commit-msg hook.')
2689 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002690 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002691 gclient_utils.rm_file_or_tree(hook)
2692 print('Gerrit commit-msg hook removed.')
2693 else:
2694 print('OK, will keep Gerrit commit-msg hook in place.')
2695
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002696 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002697 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002698 if options.squash and options.no_squash:
2699 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002700
2701 if not options.squash and not options.no_squash:
2702 # Load default for user, repo, squash=true, in this order.
2703 options.squash = settings.GetSquashGerritUploads()
2704 elif options.no_squash:
2705 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002706
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002707 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002708 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002709
Aaron Gableb56ad332017-01-06 15:24:31 -08002710 # This may be None; default fallback value is determined in logic below.
2711 title = options.title
2712
Dominic Battre7d1c4842017-10-27 09:17:28 +02002713 # Extract bug number from branch name.
2714 bug = options.bug
2715 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2716 if not bug and match:
2717 bug = match.group(1)
2718
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002719 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002720 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002721 if self.GetIssue():
2722 # Try to get the message from a previous upload.
2723 message = self.GetDescription()
2724 if not message:
2725 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002726 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002727 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002728 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002729 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002730 # When uploading a subsequent patchset, -m|--message is taken
2731 # as the patchset title if --title was not provided.
2732 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002733 else:
2734 default_title = RunGit(
2735 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002736 if options.force:
2737 title = default_title
2738 else:
2739 title = ask_for_data(
2740 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002741 change_id = self._GetChangeDetail()['change_id']
2742 while True:
2743 footer_change_ids = git_footers.get_footer_change_id(message)
2744 if footer_change_ids == [change_id]:
2745 break
2746 if not footer_change_ids:
2747 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002748 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002749 continue
2750 # There is already a valid footer but with different or several ids.
2751 # Doing this automatically is non-trivial as we don't want to lose
2752 # existing other footers, yet we want to append just 1 desired
2753 # Change-Id. Thus, just create a new footer, but let user verify the
2754 # new description.
2755 message = '%s\n\nChange-Id: %s' % (message, change_id)
2756 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002757 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002758 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002759 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002760 'Please, check the proposed correction to the description, '
2761 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2762 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2763 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002764 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002765 if not options.force:
2766 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002767 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768 message = change_desc.description
2769 if not message:
2770 DieWithError("Description is empty. Aborting...")
2771 # Continue the while loop.
2772 # Sanity check of this code - we should end up with proper message
2773 # footer.
2774 assert [change_id] == git_footers.get_footer_change_id(message)
2775 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002776 else: # if not self.GetIssue()
2777 if options.message:
2778 message = options.message
2779 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002780 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002781 if options.title:
2782 message = options.title + '\n\n' + message
2783 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002784
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002785 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002786 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002787 # On first upload, patchset title is always this string, while
2788 # --title flag gets converted to first line of message.
2789 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002790 if not change_desc.description:
2791 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002792 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002793 if len(change_ids) > 1:
2794 DieWithError('too many Change-Id footers, at most 1 allowed.')
2795 if not change_ids:
2796 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002797 change_desc.set_description(git_footers.add_footer_change_id(
2798 change_desc.description,
2799 GenerateGerritChangeId(change_desc.description)))
2800 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002801 assert len(change_ids) == 1
2802 change_id = change_ids[0]
2803
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002804 if options.reviewers or options.tbrs or options.add_owners_to:
2805 change_desc.update_reviewers(options.reviewers, options.tbrs,
2806 options.add_owners_to, change)
2807
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002808 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002809 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2810 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002811 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002812 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2813 desc_tempfile.write(change_desc.description)
2814 desc_tempfile.close()
2815 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2816 '-F', desc_tempfile.name]).strip()
2817 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002818 else:
2819 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002820 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002821 if not change_desc.description:
2822 DieWithError("Description is empty. Aborting...")
2823
2824 if not git_footers.get_footer_change_id(change_desc.description):
2825 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002826 change_desc.set_description(
2827 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002828 if options.reviewers or options.tbrs or options.add_owners_to:
2829 change_desc.update_reviewers(options.reviewers, options.tbrs,
2830 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002831 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002832 # For no-squash mode, we assume the remote called "origin" is the one we
2833 # want. It is not worthwhile to support different workflows for
2834 # no-squash mode.
2835 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002836 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2837
2838 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002839 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002840 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2841 ref_to_push)]).splitlines()
2842 if len(commits) > 1:
2843 print('WARNING: This will upload %d commits. Run the following command '
2844 'to see which commits will be uploaded: ' % len(commits))
2845 print('git log %s..%s' % (parent, ref_to_push))
2846 print('You can also use `git squash-branch` to squash these into a '
2847 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002848 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002849
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002850 if options.reviewers or options.tbrs or options.add_owners_to:
2851 change_desc.update_reviewers(options.reviewers, options.tbrs,
2852 options.add_owners_to, change)
2853
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002854 reviewers = sorted(change_desc.get_reviewers())
2855 # Add cc's from the CC_LIST and --cc flag (if any).
2856 if not options.private and not options.no_autocc:
2857 cc = self.GetCCList().split(',')
2858 else:
2859 cc = []
2860 if options.cc:
2861 cc.extend(options.cc)
2862 cc = filter(None, [email.strip() for email in cc])
2863 if change_desc.get_cced():
2864 cc.extend(change_desc.get_cced())
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00002865 valid_accounts = gerrit_util.ValidAccounts(
2866 self._GetGerritHost(), reviewers + cc)
2867 logging.debug('accounts %s are valid, %s invalid', sorted(valid_accounts),
2868 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002869
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002870 # Extra options that can be specified at push time. Doc:
2871 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002872 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002873
Aaron Gable844cf292017-06-28 11:32:59 -07002874 # By default, new changes are started in WIP mode, and subsequent patchsets
2875 # don't send email. At any time, passing --send-mail will mark the change
2876 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002877 if options.send_mail:
2878 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002879 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002880 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002881 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002882 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002883 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002884
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002885 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002886 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002887
Aaron Gable9b713dd2016-12-14 16:04:21 -08002888 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002889 # Punctuation and whitespace in |title| must be percent-encoded.
2890 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002891
agablec6787972016-09-09 16:13:34 -07002892 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002893 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002894
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002895 for r in sorted(reviewers):
2896 if r in valid_accounts:
2897 refspec_opts.append('r=%s' % r)
2898 reviewers.remove(r)
2899 else:
2900 # TODO(tandrii): this should probably be a hard failure.
2901 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2902 % r)
2903 for c in sorted(cc):
2904 # refspec option will be rejected if cc doesn't correspond to an
2905 # account, even though REST call to add such arbitrary cc may succeed.
2906 if c in valid_accounts:
2907 refspec_opts.append('cc=%s' % c)
2908 cc.remove(c)
2909
2910
rmistry9eadede2016-09-19 11:22:43 -07002911 if options.topic:
2912 # Documentation on Gerrit topics is here:
2913 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002914 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002915
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002916 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002917 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002918 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002919 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002920 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2921
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002922 refspec_suffix = ''
2923 if refspec_opts:
2924 refspec_suffix = '%' + ','.join(refspec_opts)
2925 assert ' ' not in refspec_suffix, (
2926 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2927 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2928
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002929 try:
Edward Lemur83bd7f42018-10-10 00:14:21 +00002930 # TODO(crbug.com/881860): Remove.
Edward Lemur47faa062018-10-11 19:46:02 +00002931 # Clear the log after each git-cl upload run by setting mode='w'.
2932 handler = logging.FileHandler(gerrit_util.GERRIT_ERR_LOG_FILE, mode='w')
2933 handler.setFormatter(logging.Formatter('%(asctime)s %(message)s'))
2934
2935 GERRIT_ERR_LOGGER.addHandler(handler)
2936 GERRIT_ERR_LOGGER.setLevel(logging.INFO)
2937 # Don't propagate to root logger, so that logs are not printed.
2938 GERRIT_ERR_LOGGER.propagate = 0
2939
Edward Lemur83bd7f42018-10-10 00:14:21 +00002940 # Get interesting headers from git push, to be displayed to the user if
2941 # subsequent Gerrit RPC calls fail.
2942 env = os.environ.copy()
2943 env['GIT_CURL_VERBOSE'] = '1'
2944 class FilterHeaders(object):
2945 """Filter git push headers and store them in a file.
2946
2947 Regular git push output is printed directly.
2948 """
2949
2950 def __init__(self):
2951 # The output from git push that we want to store in a file.
2952 self._output = ''
2953 # Keeps track of whether the current line is part of a request header.
2954 self._on_header = False
2955 # Keeps track of repeated empty lines, which mark the end of a request
2956 # header.
2957 self._last_line_empty = False
2958
2959 def __call__(self, line):
2960 """Handle a single line of git push output."""
2961 if not line:
2962 # Two consecutive empty lines mark the end of a header.
2963 if self._last_line_empty:
2964 self._on_header = False
2965 self._last_line_empty = True
2966 return
2967
2968 self._last_line_empty = False
2969 # A line starting with '>' marks the beggining of a request header.
2970 if line[0] == '>':
2971 self._on_header = True
2972 GERRIT_ERR_LOGGER.info(line)
2973 # Lines not starting with '*' or '<', and not part of a request header
2974 # should be displayed to the user.
2975 elif line[0] not in '*<' and not self._on_header:
2976 print(line)
2977 # Flush after every line: useful for seeing progress when running as
2978 # recipe.
2979 sys.stdout.flush()
2980 # Filter out the cookie and authorization headers.
2981 elif ('cookie: ' not in line.lower()
2982 and 'authorization: ' not in line.lower()):
2983 GERRIT_ERR_LOGGER.info(line)
2984
2985 filter_fn = FilterHeaders()
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002986 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002987 ['git', 'push', self.GetRemoteUrl(), refspec],
Edward Lemur83bd7f42018-10-10 00:14:21 +00002988 print_stdout=False,
2989 filter_fn=filter_fn,
2990 env=env)
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002991 except subprocess2.CalledProcessError:
2992 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02002993 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002994 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02002995 'credential problems:\n'
2996 ' git cl creds-check\n',
2997 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002998
2999 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003000 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003001 change_numbers = [m.group(1)
3002 for m in map(regex.match, push_stdout.splitlines())
3003 if m]
3004 if len(change_numbers) != 1:
3005 DieWithError(
3006 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003007 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003008 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003009 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003010
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003011 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003012 # GetIssue() is not set in case of non-squash uploads according to tests.
3013 # TODO(agable): non-squash uploads in git cl should be removed.
3014 gerrit_util.AddReviewers(
3015 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003016 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003017 reviewers, cc,
3018 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003019
Aaron Gablefd238082017-06-07 13:42:34 -07003020 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003021 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3022 score = 1
3023 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3024 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3025 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003026 gerrit_util.SetReview(
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003027 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003028 self._GerritChangeIdentifier(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003029 msg='Self-approving for TBR',
3030 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003031
Andrii Shyshkalovdd788442018-10-13 17:55:29 +00003032 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
3033 options.cq_dry_run)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003034 return 0
3035
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003036 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3037 change_desc):
3038 """Computes parent of the generated commit to be uploaded to Gerrit.
3039
3040 Returns revision or a ref name.
3041 """
3042 if custom_cl_base:
3043 # Try to avoid creating additional unintended CLs when uploading, unless
3044 # user wants to take this risk.
3045 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3046 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3047 local_ref_of_target_remote])
3048 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003049 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003050 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3051 'If you proceed with upload, more than 1 CL may be created by '
3052 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3053 'If you are certain that specified base `%s` has already been '
3054 'uploaded to Gerrit as another CL, you may proceed.\n' %
3055 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3056 if not force:
3057 confirm_or_exit(
3058 'Do you take responsibility for cleaning up potential mess '
3059 'resulting from proceeding with upload?',
3060 action='upload')
3061 return custom_cl_base
3062
Aaron Gablef97e33d2017-03-30 15:44:27 -07003063 if remote != '.':
3064 return self.GetCommonAncestorWithUpstream()
3065
3066 # If our upstream branch is local, we base our squashed commit on its
3067 # squashed version.
3068 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3069
Aaron Gablef97e33d2017-03-30 15:44:27 -07003070 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003071 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003072
3073 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003074 # TODO(tandrii): consider checking parent change in Gerrit and using its
3075 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3076 # the tree hash of the parent branch. The upside is less likely bogus
3077 # requests to reupload parent change just because it's uploadhash is
3078 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003079 parent = RunGit(['config',
3080 'branch.%s.gerritsquashhash' % upstream_branch_name],
3081 error_ok=True).strip()
3082 # Verify that the upstream branch has been uploaded too, otherwise
3083 # Gerrit will create additional CLs when uploading.
3084 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3085 RunGitSilent(['rev-parse', parent + ':'])):
3086 DieWithError(
3087 '\nUpload upstream branch %s first.\n'
3088 'It is likely that this branch has been rebased since its last '
3089 'upload, so you just need to upload it again.\n'
3090 '(If you uploaded it with --no-squash, then branch dependencies '
3091 'are not supported, and you should reupload with --squash.)'
3092 % upstream_branch_name,
3093 change_desc)
3094 return parent
3095
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003096 def _AddChangeIdToCommitMessage(self, options, args):
3097 """Re-commits using the current message, assumes the commit hook is in
3098 place.
3099 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003100 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003101 git_command = ['commit', '--amend', '-m', log_desc]
3102 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003103 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003104 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003105 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003106 return new_log_desc
3107 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003108 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003109
Ravi Mistry31e7d562018-04-02 12:53:57 -04003110 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3111 """Sets labels on the change based on the provided flags."""
3112 labels = {}
3113 notify = None;
3114 if enable_auto_submit:
3115 labels['Auto-Submit'] = 1
3116 if use_commit_queue:
3117 labels['Commit-Queue'] = 2
3118 elif cq_dry_run:
3119 labels['Commit-Queue'] = 1
3120 notify = False
3121 if labels:
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003122 gerrit_util.SetReview(
3123 self._GetGerritHost(),
3124 self._GerritChangeIdentifier(),
3125 labels=labels, notify=notify)
Ravi Mistry31e7d562018-04-02 12:53:57 -04003126
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003127 def SetCQState(self, new_state):
3128 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003129 vote_map = {
3130 _CQState.NONE: 0,
3131 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003132 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003133 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003134 labels = {'Commit-Queue': vote_map[new_state]}
3135 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003136 gerrit_util.SetReview(
3137 self._GetGerritHost(), self._GerritChangeIdentifier(),
3138 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003139
tandriie113dfd2016-10-11 10:20:12 -07003140 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003141 try:
3142 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003143 except GerritChangeNotExists:
3144 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003145
3146 if data['status'] in ('ABANDONED', 'MERGED'):
3147 return 'CL %s is closed' % self.GetIssue()
3148
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003149 def GetTryJobProperties(self, patchset=None):
3150 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003151 data = self._GetChangeDetail(['ALL_REVISIONS'])
3152 patchset = int(patchset or self.GetPatchset())
3153 assert patchset
3154 revision_data = None # Pylint wants it to be defined.
3155 for revision_data in data['revisions'].itervalues():
3156 if int(revision_data['_number']) == patchset:
3157 break
3158 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003159 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003160 (patchset, self.GetIssue()))
3161 return {
3162 'patch_issue': self.GetIssue(),
3163 'patch_set': patchset or self.GetPatchset(),
3164 'patch_project': data['project'],
3165 'patch_storage': 'gerrit',
3166 'patch_ref': revision_data['fetch']['http']['ref'],
3167 'patch_repository_url': revision_data['fetch']['http']['url'],
3168 'patch_gerrit_url': self.GetCodereviewServer(),
3169 }
tandriie113dfd2016-10-11 10:20:12 -07003170
tandriide281ae2016-10-12 06:02:30 -07003171 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003172 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003173
Edward Lemur707d70b2018-02-07 00:50:14 +01003174 def GetReviewers(self):
3175 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3176 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3177
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003178
3179_CODEREVIEW_IMPLEMENTATIONS = {
3180 'rietveld': _RietveldChangelistImpl,
3181 'gerrit': _GerritChangelistImpl,
3182}
3183
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003184
iannuccie53c9352016-08-17 14:40:40 -07003185def _add_codereview_issue_select_options(parser, extra=""):
3186 _add_codereview_select_options(parser)
3187
3188 text = ('Operate on this issue number instead of the current branch\'s '
3189 'implicit issue.')
3190 if extra:
3191 text += ' '+extra
3192 parser.add_option('-i', '--issue', type=int, help=text)
3193
3194
3195def _process_codereview_issue_select_options(parser, options):
3196 _process_codereview_select_options(parser, options)
3197 if options.issue is not None and not options.forced_codereview:
3198 parser.error('--issue must be specified with either --rietveld or --gerrit')
3199
3200
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003201def _add_codereview_select_options(parser):
3202 """Appends --gerrit and --rietveld options to force specific codereview."""
3203 parser.codereview_group = optparse.OptionGroup(
3204 parser, 'EXPERIMENTAL! Codereview override options')
3205 parser.add_option_group(parser.codereview_group)
3206 parser.codereview_group.add_option(
3207 '--gerrit', action='store_true',
3208 help='Force the use of Gerrit for codereview')
3209 parser.codereview_group.add_option(
3210 '--rietveld', action='store_true',
3211 help='Force the use of Rietveld for codereview')
3212
3213
3214def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003215 if options.rietveld:
3216 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003217 options.forced_codereview = None
3218 if options.gerrit:
3219 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003220
3221
tandriif9aefb72016-07-01 09:06:51 -07003222def _get_bug_line_values(default_project, bugs):
3223 """Given default_project and comma separated list of bugs, yields bug line
3224 values.
3225
3226 Each bug can be either:
3227 * a number, which is combined with default_project
3228 * string, which is left as is.
3229
3230 This function may produce more than one line, because bugdroid expects one
3231 project per line.
3232
3233 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3234 ['v8:123', 'chromium:789']
3235 """
3236 default_bugs = []
3237 others = []
3238 for bug in bugs.split(','):
3239 bug = bug.strip()
3240 if bug:
3241 try:
3242 default_bugs.append(int(bug))
3243 except ValueError:
3244 others.append(bug)
3245
3246 if default_bugs:
3247 default_bugs = ','.join(map(str, default_bugs))
3248 if default_project:
3249 yield '%s:%s' % (default_project, default_bugs)
3250 else:
3251 yield default_bugs
3252 for other in sorted(others):
3253 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3254 yield other
3255
3256
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003257class ChangeDescription(object):
3258 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003259 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003260 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003261 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003262 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003263 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3264 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3265 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3266 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003267
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003268 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003269 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003270
agable@chromium.org42c20792013-09-12 17:34:49 +00003271 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003272 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003273 return '\n'.join(self._description_lines)
3274
3275 def set_description(self, desc):
3276 if isinstance(desc, basestring):
3277 lines = desc.splitlines()
3278 else:
3279 lines = [line.rstrip() for line in desc]
3280 while lines and not lines[0]:
3281 lines.pop(0)
3282 while lines and not lines[-1]:
3283 lines.pop(-1)
3284 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003285
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003286 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3287 """Rewrites the R=/TBR= line(s) as a single line each.
3288
3289 Args:
3290 reviewers (list(str)) - list of additional emails to use for reviewers.
3291 tbrs (list(str)) - list of additional emails to use for TBRs.
3292 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3293 the change that are missing OWNER coverage. If this is not None, you
3294 must also pass a value for `change`.
3295 change (Change) - The Change that should be used for OWNERS lookups.
3296 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003297 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003298 assert isinstance(tbrs, list), tbrs
3299
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003300 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003301 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003302
3303 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003304 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003305
3306 reviewers = set(reviewers)
3307 tbrs = set(tbrs)
3308 LOOKUP = {
3309 'TBR': tbrs,
3310 'R': reviewers,
3311 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003312
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003313 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003314 regexp = re.compile(self.R_LINE)
3315 matches = [regexp.match(line) for line in self._description_lines]
3316 new_desc = [l for i, l in enumerate(self._description_lines)
3317 if not matches[i]]
3318 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003319
agable@chromium.org42c20792013-09-12 17:34:49 +00003320 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003321
3322 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003323 for match in matches:
3324 if not match:
3325 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003326 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3327
3328 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003329 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003330 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003331 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003332 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003333 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003334 LOOKUP[add_owners_to].update(
3335 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003336
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003337 # If any folks ended up in both groups, remove them from tbrs.
3338 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003339
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003340 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3341 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003342
3343 # Put the new lines in the description where the old first R= line was.
3344 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3345 if 0 <= line_loc < len(self._description_lines):
3346 if new_tbr_line:
3347 self._description_lines.insert(line_loc, new_tbr_line)
3348 if new_r_line:
3349 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003350 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003351 if new_r_line:
3352 self.append_footer(new_r_line)
3353 if new_tbr_line:
3354 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003355
Aaron Gable3a16ed12017-03-23 10:51:55 -07003356 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003357 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003358 self.set_description([
3359 '# Enter a description of the change.',
3360 '# This will be displayed on the codereview site.',
3361 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003362 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003363 '--------------------',
3364 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003365
agable@chromium.org42c20792013-09-12 17:34:49 +00003366 regexp = re.compile(self.BUG_LINE)
3367 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003368 prefix = settings.GetBugPrefix()
3369 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003370 if git_footer:
3371 self.append_footer('Bug: %s' % ', '.join(values))
3372 else:
3373 for value in values:
3374 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003375
agable@chromium.org42c20792013-09-12 17:34:49 +00003376 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003377 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003378 if not content:
3379 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003380 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003381
Bruce Dawson2377b012018-01-11 16:46:49 -08003382 # Strip off comments and default inserted "Bug:" line.
3383 clean_lines = [line.rstrip() for line in lines if not
3384 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003385 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003386 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003387 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003388
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003389 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003390 """Adds a footer line to the description.
3391
3392 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3393 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3394 that Gerrit footers are always at the end.
3395 """
3396 parsed_footer_line = git_footers.parse_footer(line)
3397 if parsed_footer_line:
3398 # Line is a gerrit footer in the form: Footer-Key: any value.
3399 # Thus, must be appended observing Gerrit footer rules.
3400 self.set_description(
3401 git_footers.add_footer(self.description,
3402 key=parsed_footer_line[0],
3403 value=parsed_footer_line[1]))
3404 return
3405
3406 if not self._description_lines:
3407 self._description_lines.append(line)
3408 return
3409
3410 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3411 if gerrit_footers:
3412 # git_footers.split_footers ensures that there is an empty line before
3413 # actual (gerrit) footers, if any. We have to keep it that way.
3414 assert top_lines and top_lines[-1] == ''
3415 top_lines, separator = top_lines[:-1], top_lines[-1:]
3416 else:
3417 separator = [] # No need for separator if there are no gerrit_footers.
3418
3419 prev_line = top_lines[-1] if top_lines else ''
3420 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3421 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3422 top_lines.append('')
3423 top_lines.append(line)
3424 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003425
tandrii99a72f22016-08-17 14:33:24 -07003426 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003427 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003428 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003429 reviewers = [match.group(2).strip()
3430 for match in matches
3431 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003432 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003433
bradnelsond975b302016-10-23 12:20:23 -07003434 def get_cced(self):
3435 """Retrieves the list of reviewers."""
3436 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3437 cced = [match.group(2).strip() for match in matches if match]
3438 return cleanup_list(cced)
3439
Nodir Turakulov23b82142017-11-16 11:04:25 -08003440 def get_hash_tags(self):
3441 """Extracts and sanitizes a list of Gerrit hashtags."""
3442 subject = (self._description_lines or ('',))[0]
3443 subject = re.sub(
3444 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3445
3446 tags = []
3447 start = 0
3448 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3449 while True:
3450 m = bracket_exp.match(subject, start)
3451 if not m:
3452 break
3453 tags.append(self.sanitize_hash_tag(m.group(1)))
3454 start = m.end()
3455
3456 if not tags:
3457 # Try "Tag: " prefix.
3458 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3459 if m:
3460 tags.append(self.sanitize_hash_tag(m.group(1)))
3461 return tags
3462
3463 @classmethod
3464 def sanitize_hash_tag(cls, tag):
3465 """Returns a sanitized Gerrit hash tag.
3466
3467 A sanitized hashtag can be used as a git push refspec parameter value.
3468 """
3469 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3470
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003471 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3472 """Updates this commit description given the parent.
3473
3474 This is essentially what Gnumbd used to do.
3475 Consult https://goo.gl/WMmpDe for more details.
3476 """
3477 assert parent_msg # No, orphan branch creation isn't supported.
3478 assert parent_hash
3479 assert dest_ref
3480 parent_footer_map = git_footers.parse_footers(parent_msg)
3481 # This will also happily parse svn-position, which GnumbD is no longer
3482 # supporting. While we'd generate correct footers, the verifier plugin
3483 # installed in Gerrit will block such commit (ie git push below will fail).
3484 parent_position = git_footers.get_position(parent_footer_map)
3485
3486 # Cherry-picks may have last line obscuring their prior footers,
3487 # from git_footers perspective. This is also what Gnumbd did.
3488 cp_line = None
3489 if (self._description_lines and
3490 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3491 cp_line = self._description_lines.pop()
3492
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003493 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003494
3495 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3496 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003497 for i, line in enumerate(footer_lines):
3498 k, v = git_footers.parse_footer(line) or (None, None)
3499 if k and k.startswith('Cr-'):
3500 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003501
3502 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003503 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003504 if parent_position[0] == dest_ref:
3505 # Same branch as parent.
3506 number = int(parent_position[1]) + 1
3507 else:
3508 number = 1 # New branch, and extra lineage.
3509 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3510 int(parent_position[1])))
3511
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003512 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3513 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003514
3515 self._description_lines = top_lines
3516 if cp_line:
3517 self._description_lines.append(cp_line)
3518 if self._description_lines[-1] != '':
3519 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003520 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003521
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003522
Aaron Gablea1bab272017-04-11 16:38:18 -07003523def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003524 """Retrieves the reviewers that approved a CL from the issue properties with
3525 messages.
3526
3527 Note that the list may contain reviewers that are not committer, thus are not
3528 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003529
3530 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003531 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003532 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003533 return sorted(
3534 set(
3535 message['sender']
3536 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003537 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003538 )
3539 )
3540
3541
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003542def FindCodereviewSettingsFile(filename='codereview.settings'):
3543 """Finds the given file starting in the cwd and going up.
3544
3545 Only looks up to the top of the repository unless an
3546 'inherit-review-settings-ok' file exists in the root of the repository.
3547 """
3548 inherit_ok_file = 'inherit-review-settings-ok'
3549 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003550 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003551 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3552 root = '/'
3553 while True:
3554 if filename in os.listdir(cwd):
3555 if os.path.isfile(os.path.join(cwd, filename)):
3556 return open(os.path.join(cwd, filename))
3557 if cwd == root:
3558 break
3559 cwd = os.path.dirname(cwd)
3560
3561
3562def LoadCodereviewSettingsFromFile(fileobj):
3563 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003564 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003565
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003566 def SetProperty(name, setting, unset_error_ok=False):
3567 fullname = 'rietveld.' + name
3568 if setting in keyvals:
3569 RunGit(['config', fullname, keyvals[setting]])
3570 else:
3571 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3572
tandrii48df5812016-10-17 03:55:37 -07003573 if not keyvals.get('GERRIT_HOST', False):
3574 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003575 # Only server setting is required. Other settings can be absent.
3576 # In that case, we ignore errors raised during option deletion attempt.
3577 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003578 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003579 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3580 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003581 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003582 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3583 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003584 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003585 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3586 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003587
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003588 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003589 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003590
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003591 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003592 RunGit(['config', 'gerrit.squash-uploads',
3593 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003594
tandrii@chromium.org28253532016-04-14 13:46:56 +00003595 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003596 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003597 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3598
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003599 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003600 # should be of the form
3601 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3602 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003603 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3604 keyvals['ORIGIN_URL_CONFIG']])
3605
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003606
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003607def urlretrieve(source, destination):
3608 """urllib is broken for SSL connections via a proxy therefore we
3609 can't use urllib.urlretrieve()."""
3610 with open(destination, 'w') as f:
3611 f.write(urllib2.urlopen(source).read())
3612
3613
ukai@chromium.org712d6102013-11-27 00:52:58 +00003614def hasSheBang(fname):
3615 """Checks fname is a #! script."""
3616 with open(fname) as f:
3617 return f.read(2).startswith('#!')
3618
3619
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003620# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3621def DownloadHooks(*args, **kwargs):
3622 pass
3623
3624
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003625def DownloadGerritHook(force):
3626 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003627
3628 Args:
3629 force: True to update hooks. False to install hooks if not present.
3630 """
3631 if not settings.GetIsGerrit():
3632 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003633 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003634 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3635 if not os.access(dst, os.X_OK):
3636 if os.path.exists(dst):
3637 if not force:
3638 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003639 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003640 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003641 if not hasSheBang(dst):
3642 DieWithError('Not a script: %s\n'
3643 'You need to download from\n%s\n'
3644 'into .git/hooks/commit-msg and '
3645 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003646 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3647 except Exception:
3648 if os.path.exists(dst):
3649 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003650 DieWithError('\nFailed to download hooks.\n'
3651 'You need to download from\n%s\n'
3652 'into .git/hooks/commit-msg and '
3653 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003654
3655
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003656def GetRietveldCodereviewSettingsInteractively():
3657 """Prompt the user for settings."""
3658 server = settings.GetDefaultServerUrl(error_ok=True)
3659 prompt = 'Rietveld server (host[:port])'
3660 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3661 newserver = ask_for_data(prompt + ':')
3662 if not server and not newserver:
3663 newserver = DEFAULT_SERVER
3664 if newserver:
3665 newserver = gclient_utils.UpgradeToHttps(newserver)
3666 if newserver != server:
3667 RunGit(['config', 'rietveld.server', newserver])
3668
3669 def SetProperty(initial, caption, name, is_url):
3670 prompt = caption
3671 if initial:
3672 prompt += ' ("x" to clear) [%s]' % initial
3673 new_val = ask_for_data(prompt + ':')
3674 if new_val == 'x':
3675 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3676 elif new_val:
3677 if is_url:
3678 new_val = gclient_utils.UpgradeToHttps(new_val)
3679 if new_val != initial:
3680 RunGit(['config', 'rietveld.' + name, new_val])
3681
3682 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3683 SetProperty(settings.GetDefaultPrivateFlag(),
3684 'Private flag (rietveld only)', 'private', False)
3685 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3686 'tree-status-url', False)
3687 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3688 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3689 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3690 'run-post-upload-hook', False)
3691
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003692
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003693class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003694 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003695
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003696 _GOOGLESOURCE = 'googlesource.com'
3697
3698 def __init__(self):
3699 # Cached list of [host, identity, source], where source is either
3700 # .gitcookies or .netrc.
3701 self._all_hosts = None
3702
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003703 def ensure_configured_gitcookies(self):
3704 """Runs checks and suggests fixes to make git use .gitcookies from default
3705 path."""
3706 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3707 configured_path = RunGitSilent(
3708 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003709 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003710 if configured_path:
3711 self._ensure_default_gitcookies_path(configured_path, default)
3712 else:
3713 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003714
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003715 @staticmethod
3716 def _ensure_default_gitcookies_path(configured_path, default_path):
3717 assert configured_path
3718 if configured_path == default_path:
3719 print('git is already configured to use your .gitcookies from %s' %
3720 configured_path)
3721 return
3722
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003723 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003724 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3725 (configured_path, default_path))
3726
3727 if not os.path.exists(configured_path):
3728 print('However, your configured .gitcookies file is missing.')
3729 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3730 action='reconfigure')
3731 RunGit(['config', '--global', 'http.cookiefile', default_path])
3732 return
3733
3734 if os.path.exists(default_path):
3735 print('WARNING: default .gitcookies file already exists %s' %
3736 default_path)
3737 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3738 default_path)
3739
3740 confirm_or_exit('Move existing .gitcookies to default location?',
3741 action='move')
3742 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003743 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003744 print('Moved and reconfigured git to use .gitcookies from %s' %
3745 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003746
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003747 @staticmethod
3748 def _configure_gitcookies_path(default_path):
3749 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3750 if os.path.exists(netrc_path):
3751 print('You seem to be using outdated .netrc for git credentials: %s' %
3752 netrc_path)
3753 print('This tool will guide you through setting up recommended '
3754 '.gitcookies store for git credentials.\n'
3755 '\n'
3756 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3757 ' git config --global --unset http.cookiefile\n'
3758 ' mv %s %s.backup\n\n' % (default_path, default_path))
3759 confirm_or_exit(action='setup .gitcookies')
3760 RunGit(['config', '--global', 'http.cookiefile', default_path])
3761 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003762
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003763 def get_hosts_with_creds(self, include_netrc=False):
3764 if self._all_hosts is None:
3765 a = gerrit_util.CookiesAuthenticator()
3766 self._all_hosts = [
3767 (h, u, s)
3768 for h, u, s in itertools.chain(
3769 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3770 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3771 )
3772 if h.endswith(self._GOOGLESOURCE)
3773 ]
3774
3775 if include_netrc:
3776 return self._all_hosts
3777 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3778
3779 def print_current_creds(self, include_netrc=False):
3780 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3781 if not hosts:
3782 print('No Git/Gerrit credentials found')
3783 return
3784 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3785 header = [('Host', 'User', 'Which file'),
3786 ['=' * l for l in lengths]]
3787 for row in (header + hosts):
3788 print('\t'.join((('%%+%ds' % l) % s)
3789 for l, s in zip(lengths, row)))
3790
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003791 @staticmethod
3792 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003793 """Parses identity "git-<username>.domain" into <username> and domain."""
3794 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003795 # distinguishable from sub-domains. But we do know typical domains:
3796 if identity.endswith('.chromium.org'):
3797 domain = 'chromium.org'
3798 username = identity[:-len('.chromium.org')]
3799 else:
3800 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003801 if username.startswith('git-'):
3802 username = username[len('git-'):]
3803 return username, domain
3804
3805 def _get_usernames_of_domain(self, domain):
3806 """Returns list of usernames referenced by .gitcookies in a given domain."""
3807 identities_by_domain = {}
3808 for _, identity, _ in self.get_hosts_with_creds():
3809 username, domain = self._parse_identity(identity)
3810 identities_by_domain.setdefault(domain, []).append(username)
3811 return identities_by_domain.get(domain)
3812
3813 def _canonical_git_googlesource_host(self, host):
3814 """Normalizes Gerrit hosts (with '-review') to Git host."""
3815 assert host.endswith(self._GOOGLESOURCE)
3816 # Prefix doesn't include '.' at the end.
3817 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3818 if prefix.endswith('-review'):
3819 prefix = prefix[:-len('-review')]
3820 return prefix + '.' + self._GOOGLESOURCE
3821
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003822 def _canonical_gerrit_googlesource_host(self, host):
3823 git_host = self._canonical_git_googlesource_host(host)
3824 prefix = git_host.split('.', 1)[0]
3825 return prefix + '-review.' + self._GOOGLESOURCE
3826
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003827 def _get_counterpart_host(self, host):
3828 assert host.endswith(self._GOOGLESOURCE)
3829 git = self._canonical_git_googlesource_host(host)
3830 gerrit = self._canonical_gerrit_googlesource_host(git)
3831 return git if gerrit == host else gerrit
3832
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003833 def has_generic_host(self):
3834 """Returns whether generic .googlesource.com has been configured.
3835
3836 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3837 """
3838 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3839 if host == '.' + self._GOOGLESOURCE:
3840 return True
3841 return False
3842
3843 def _get_git_gerrit_identity_pairs(self):
3844 """Returns map from canonic host to pair of identities (Git, Gerrit).
3845
3846 One of identities might be None, meaning not configured.
3847 """
3848 host_to_identity_pairs = {}
3849 for host, identity, _ in self.get_hosts_with_creds():
3850 canonical = self._canonical_git_googlesource_host(host)
3851 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3852 idx = 0 if canonical == host else 1
3853 pair[idx] = identity
3854 return host_to_identity_pairs
3855
3856 def get_partially_configured_hosts(self):
3857 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003858 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3859 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3860 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003861
3862 def get_conflicting_hosts(self):
3863 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003864 host
3865 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003866 if None not in (i1, i2) and i1 != i2)
3867
3868 def get_duplicated_hosts(self):
3869 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3870 return set(host for host, count in counters.iteritems() if count > 1)
3871
3872 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3873 'chromium.googlesource.com': 'chromium.org',
3874 'chrome-internal.googlesource.com': 'google.com',
3875 }
3876
3877 def get_hosts_with_wrong_identities(self):
3878 """Finds hosts which **likely** reference wrong identities.
3879
3880 Note: skips hosts which have conflicting identities for Git and Gerrit.
3881 """
3882 hosts = set()
3883 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3884 pair = self._get_git_gerrit_identity_pairs().get(host)
3885 if pair and pair[0] == pair[1]:
3886 _, domain = self._parse_identity(pair[0])
3887 if domain != expected:
3888 hosts.add(host)
3889 return hosts
3890
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003891 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003892 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003893 hosts = sorted(hosts)
3894 assert hosts
3895 if extra_column_func is None:
3896 extras = [''] * len(hosts)
3897 else:
3898 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003899 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3900 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003901 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003902 lines.append(tmpl % he)
3903 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003904
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003905 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003906 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003907 yield ('.googlesource.com wildcard record detected',
3908 ['Chrome Infrastructure team recommends to list full host names '
3909 'explicitly.'],
3910 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003911
3912 dups = self.get_duplicated_hosts()
3913 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003914 yield ('The following hosts were defined twice',
3915 self._format_hosts(dups),
3916 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003917
3918 partial = self.get_partially_configured_hosts()
3919 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003920 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3921 'These hosts are missing',
3922 self._format_hosts(partial, lambda host: 'but %s defined' %
3923 self._get_counterpart_host(host)),
3924 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003925
3926 conflicting = self.get_conflicting_hosts()
3927 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003928 yield ('The following Git hosts have differing credentials from their '
3929 'Gerrit counterparts',
3930 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3931 tuple(self._get_git_gerrit_identity_pairs()[host])),
3932 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003933
3934 wrong = self.get_hosts_with_wrong_identities()
3935 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003936 yield ('These hosts likely use wrong identity',
3937 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3938 (self._get_git_gerrit_identity_pairs()[host][0],
3939 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3940 wrong)
3941
3942 def find_and_report_problems(self):
3943 """Returns True if there was at least one problem, else False."""
3944 found = False
3945 bad_hosts = set()
3946 for title, sublines, hosts in self._find_problems():
3947 if not found:
3948 found = True
3949 print('\n\n.gitcookies problem report:\n')
3950 bad_hosts.update(hosts or [])
3951 print(' %s%s' % (title , (':' if sublines else '')))
3952 if sublines:
3953 print()
3954 print(' %s' % '\n '.join(sublines))
3955 print()
3956
3957 if bad_hosts:
3958 assert found
3959 print(' You can manually remove corresponding lines in your %s file and '
3960 'visit the following URLs with correct account to generate '
3961 'correct credential lines:\n' %
3962 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3963 print(' %s' % '\n '.join(sorted(set(
3964 gerrit_util.CookiesAuthenticator().get_new_password_url(
3965 self._canonical_git_googlesource_host(host))
3966 for host in bad_hosts
3967 ))))
3968 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003969
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003970
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003971@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003972def CMDcreds_check(parser, args):
3973 """Checks credentials and suggests changes."""
3974 _, _ = parser.parse_args(args)
3975
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003976 # Code below checks .gitcookies. Abort if using something else.
3977 authn = gerrit_util.Authenticator.get()
3978 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
3979 if isinstance(authn, gerrit_util.GceAuthenticator):
3980 DieWithError(
3981 'This command is not designed for GCE, are you on a bot?\n'
3982 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
3983 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07003984 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00003985 'This command is not designed for bot environment. It checks '
3986 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003987
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003988 checker = _GitCookiesChecker()
3989 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003990
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003991 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003992 checker.print_current_creds(include_netrc=True)
3993
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003994 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003995 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003996 return 0
3997 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003998
3999
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004000@subcommand.usage('[repo root containing codereview.settings]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004001@metrics.collector.collect_metrics('git cl config')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004003 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004004
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004005 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004006 # TODO(tandrii): remove this once we switch to Gerrit.
4007 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004008 parser.add_option('--activate-update', action='store_true',
4009 help='activate auto-updating [rietveld] section in '
4010 '.git/config')
4011 parser.add_option('--deactivate-update', action='store_true',
4012 help='deactivate auto-updating [rietveld] section in '
4013 '.git/config')
4014 options, args = parser.parse_args(args)
4015
4016 if options.deactivate_update:
4017 RunGit(['config', 'rietveld.autoupdate', 'false'])
4018 return
4019
4020 if options.activate_update:
4021 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4022 return
4023
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004024 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004025 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004026 return 0
4027
4028 url = args[0]
4029 if not url.endswith('codereview.settings'):
4030 url = os.path.join(url, 'codereview.settings')
4031
4032 # Load code review settings and download hooks (if available).
4033 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4034 return 0
4035
4036
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004037@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004038def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004039 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004040 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4041 branch = ShortBranchName(branchref)
4042 _, args = parser.parse_args(args)
4043 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004044 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004045 return RunGit(['config', 'branch.%s.base-url' % branch],
4046 error_ok=False).strip()
4047 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004048 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004049 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4050 error_ok=False).strip()
4051
4052
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004053def color_for_status(status):
4054 """Maps a Changelist status to color, for CMDstatus and other tools."""
4055 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004056 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004057 'waiting': Fore.BLUE,
4058 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004059 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004060 'lgtm': Fore.GREEN,
4061 'commit': Fore.MAGENTA,
4062 'closed': Fore.CYAN,
4063 'error': Fore.WHITE,
4064 }.get(status, Fore.WHITE)
4065
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004066
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004067def get_cl_statuses(changes, fine_grained, max_processes=None):
4068 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004069
4070 If fine_grained is true, this will fetch CL statuses from the server.
4071 Otherwise, simply indicate if there's a matching url for the given branches.
4072
4073 If max_processes is specified, it is used as the maximum number of processes
4074 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4075 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004076
4077 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004078 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004079 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004080 upload.verbosity = 0
4081
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004082 if not changes:
4083 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004084
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004085 if not fine_grained:
4086 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004087 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004088 for cl in changes:
4089 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004090 return
4091
4092 # First, sort out authentication issues.
4093 logging.debug('ensuring credentials exist')
4094 for cl in changes:
4095 cl.EnsureAuthenticated(force=False, refresh=True)
4096
4097 def fetch(cl):
4098 try:
4099 return (cl, cl.GetStatus())
4100 except:
4101 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07004102 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004103 raise
4104
4105 threads_count = len(changes)
4106 if max_processes:
4107 threads_count = max(1, min(threads_count, max_processes))
4108 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4109
4110 pool = ThreadPool(threads_count)
4111 fetched_cls = set()
4112 try:
4113 it = pool.imap_unordered(fetch, changes).__iter__()
4114 while True:
4115 try:
4116 cl, status = it.next(timeout=5)
4117 except multiprocessing.TimeoutError:
4118 break
4119 fetched_cls.add(cl)
4120 yield cl, status
4121 finally:
4122 pool.close()
4123
4124 # Add any branches that failed to fetch.
4125 for cl in set(changes) - fetched_cls:
4126 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004127
rmistry@google.com2dd99862015-06-22 12:22:18 +00004128
4129def upload_branch_deps(cl, args):
4130 """Uploads CLs of local branches that are dependents of the current branch.
4131
4132 If the local branch dependency tree looks like:
4133 test1 -> test2.1 -> test3.1
4134 -> test3.2
4135 -> test2.2 -> test3.3
4136
4137 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4138 run on the dependent branches in this order:
4139 test2.1, test3.1, test3.2, test2.2, test3.3
4140
4141 Note: This function does not rebase your local dependent branches. Use it when
4142 you make a change to the parent branch that will not conflict with its
4143 dependent branches, and you would like their dependencies updated in
4144 Rietveld.
4145 """
4146 if git_common.is_dirty_git_tree('upload-branch-deps'):
4147 return 1
4148
4149 root_branch = cl.GetBranch()
4150 if root_branch is None:
4151 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4152 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004153 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00004154 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4155 'patchset dependencies without an uploaded CL.')
4156
4157 branches = RunGit(['for-each-ref',
4158 '--format=%(refname:short) %(upstream:short)',
4159 'refs/heads'])
4160 if not branches:
4161 print('No local branches found.')
4162 return 0
4163
4164 # Create a dictionary of all local branches to the branches that are dependent
4165 # on it.
4166 tracked_to_dependents = collections.defaultdict(list)
4167 for b in branches.splitlines():
4168 tokens = b.split()
4169 if len(tokens) == 2:
4170 branch_name, tracked = tokens
4171 tracked_to_dependents[tracked].append(branch_name)
4172
vapiera7fbd5a2016-06-16 09:17:49 -07004173 print()
4174 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004175 dependents = []
4176 def traverse_dependents_preorder(branch, padding=''):
4177 dependents_to_process = tracked_to_dependents.get(branch, [])
4178 padding += ' '
4179 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004180 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004181 dependents.append(dependent)
4182 traverse_dependents_preorder(dependent, padding)
4183 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004185
4186 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004187 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004188 return 0
4189
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004190 confirm_or_exit('This command will checkout all dependent branches and run '
4191 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004192
rmistry@google.com2dd99862015-06-22 12:22:18 +00004193 # Record all dependents that failed to upload.
4194 failures = {}
4195 # Go through all dependents, checkout the branch and upload.
4196 try:
4197 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004198 print()
4199 print('--------------------------------------')
4200 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004201 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004202 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004203 try:
4204 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004205 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004206 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004207 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004208 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004209 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004210 finally:
4211 # Swap back to the original root branch.
4212 RunGit(['checkout', '-q', root_branch])
4213
vapiera7fbd5a2016-06-16 09:17:49 -07004214 print()
4215 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004216 for dependent_branch in dependents:
4217 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004218 print(' %s : %s' % (dependent_branch, upload_status))
4219 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004220
4221 return 0
4222
4223
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004224@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004225def CMDarchive(parser, args):
4226 """Archives and deletes branches associated with closed changelists."""
4227 parser.add_option(
4228 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004229 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004230 parser.add_option(
4231 '-f', '--force', action='store_true',
4232 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004233 parser.add_option(
4234 '-d', '--dry-run', action='store_true',
4235 help='Skip the branch tagging and removal steps.')
4236 parser.add_option(
4237 '-t', '--notags', action='store_true',
4238 help='Do not tag archived branches. '
4239 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004240
4241 auth.add_auth_options(parser)
4242 options, args = parser.parse_args(args)
4243 if args:
4244 parser.error('Unsupported args: %s' % ' '.join(args))
4245 auth_config = auth.extract_auth_config_from_options(options)
4246
4247 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4248 if not branches:
4249 return 0
4250
vapiera7fbd5a2016-06-16 09:17:49 -07004251 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004252 changes = [Changelist(branchref=b, auth_config=auth_config)
4253 for b in branches.splitlines()]
4254 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4255 statuses = get_cl_statuses(changes,
4256 fine_grained=True,
4257 max_processes=options.maxjobs)
4258 proposal = [(cl.GetBranch(),
4259 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4260 for cl, status in statuses
4261 if status == 'closed']
4262 proposal.sort()
4263
4264 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004265 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004266 return 0
4267
4268 current_branch = GetCurrentBranch()
4269
vapiera7fbd5a2016-06-16 09:17:49 -07004270 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004271 if options.notags:
4272 for next_item in proposal:
4273 print(' ' + next_item[0])
4274 else:
4275 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4276 for next_item in proposal:
4277 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004278
kmarshall9249e012016-08-23 12:02:16 -07004279 # Quit now on precondition failure or if instructed by the user, either
4280 # via an interactive prompt or by command line flags.
4281 if options.dry_run:
4282 print('\nNo changes were made (dry run).\n')
4283 return 0
4284 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004285 print('You are currently on a branch \'%s\' which is associated with a '
4286 'closed codereview issue, so archive cannot proceed. Please '
4287 'checkout another branch and run this command again.' %
4288 current_branch)
4289 return 1
kmarshall9249e012016-08-23 12:02:16 -07004290 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004291 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4292 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004293 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004294 return 1
4295
4296 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004297 if not options.notags:
4298 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004299 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004300
vapiera7fbd5a2016-06-16 09:17:49 -07004301 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004302
4303 return 0
4304
4305
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004306@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004307def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004308 """Show status of changelists.
4309
4310 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004311 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004312 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004313 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004314 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004315 - Magenta in the commit queue
4316 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004317 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004318
4319 Also see 'git cl comments'.
4320 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004321 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004322 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004323 parser.add_option('-f', '--fast', action='store_true',
4324 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004325 parser.add_option(
4326 '-j', '--maxjobs', action='store', type=int,
4327 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004328
4329 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004330 _add_codereview_issue_select_options(
4331 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004332 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004333 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004334 if args:
4335 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004336 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004337
iannuccie53c9352016-08-17 14:40:40 -07004338 if options.issue is not None and not options.field:
4339 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004340
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004341 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004342 cl = Changelist(auth_config=auth_config, issue=options.issue,
4343 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004344 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004345 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004346 elif options.field == 'id':
4347 issueid = cl.GetIssue()
4348 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004349 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004350 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004351 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004353 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004354 elif options.field == 'status':
4355 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004356 elif options.field == 'url':
4357 url = cl.GetIssueURL()
4358 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004359 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004360 return 0
4361
4362 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4363 if not branches:
4364 print('No local branch found.')
4365 return 0
4366
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004367 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004368 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004369 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004370 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004371 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004372 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004373 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004374
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004375 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004376 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4377 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4378 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004379 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004380 c, status = output.next()
4381 branch_statuses[c.GetBranch()] = status
4382 status = branch_statuses.pop(branch)
4383 url = cl.GetIssueURL()
4384 if url and (not status or status == 'error'):
4385 # The issue probably doesn't exist anymore.
4386 url += ' (broken)'
4387
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004388 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004389 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004390 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004391 color = ''
4392 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004393 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004394 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004395 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004396 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004397
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004398
4399 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004400 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004401 print('Current branch: %s' % branch)
4402 for cl in changes:
4403 if cl.GetBranch() == branch:
4404 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004405 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004406 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004407 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004408 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004409 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004410 print('Issue description:')
4411 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004412 return 0
4413
4414
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004415def colorize_CMDstatus_doc():
4416 """To be called once in main() to add colors to git cl status help."""
4417 colors = [i for i in dir(Fore) if i[0].isupper()]
4418
4419 def colorize_line(line):
4420 for color in colors:
4421 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004422 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004423 indent = len(line) - len(line.lstrip(' ')) + 1
4424 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4425 return line
4426
4427 lines = CMDstatus.__doc__.splitlines()
4428 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4429
4430
phajdan.jre328cf92016-08-22 04:12:17 -07004431def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004432 if path == '-':
4433 json.dump(contents, sys.stdout)
4434 else:
4435 with open(path, 'w') as f:
4436 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004437
4438
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004439@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004440@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004441def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004442 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004443
4444 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004445 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004446 parser.add_option('-r', '--reverse', action='store_true',
4447 help='Lookup the branch(es) for the specified issues. If '
4448 'no issues are specified, all branches with mapped '
4449 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004450 parser.add_option('--json',
4451 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004452 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004453 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004454 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455
dnj@chromium.org406c4402015-03-03 17:22:28 +00004456 if options.reverse:
4457 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004458 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004459 # Reverse issue lookup.
4460 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004461
4462 git_config = {}
4463 for config in RunGit(['config', '--get-regexp',
4464 r'branch\..*issue']).splitlines():
4465 name, _space, val = config.partition(' ')
4466 git_config[name] = val
4467
dnj@chromium.org406c4402015-03-03 17:22:28 +00004468 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004469 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4470 config_key = _git_branch_config_key(ShortBranchName(branch),
4471 cls.IssueConfigKey())
4472 issue = git_config.get(config_key)
4473 if issue:
4474 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004475 if not args:
4476 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004477 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004478 for issue in args:
4479 if not issue:
4480 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004481 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004482 print('Branch for issue number %s: %s' % (
4483 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004484 if options.json:
4485 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004486 return 0
4487
4488 if len(args) > 0:
4489 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4490 if not issue.valid:
4491 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4492 'or no argument to list it.\n'
4493 'Maybe you want to run git cl status?')
4494 cl = Changelist(codereview=issue.codereview)
4495 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004496 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004497 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004498 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4499 if options.json:
4500 write_json(options.json, {
4501 'issue': cl.GetIssue(),
4502 'issue_url': cl.GetIssueURL(),
4503 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004504 return 0
4505
4506
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004507@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004508def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004509 """Shows or posts review comments for any changelist."""
4510 parser.add_option('-a', '--add-comment', dest='comment',
4511 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004512 parser.add_option('-i', '--issue', dest='issue',
4513 help='review issue id (defaults to current issue). '
4514 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004515 parser.add_option('-m', '--machine-readable', dest='readable',
4516 action='store_false', default=True,
4517 help='output comments in a format compatible with '
4518 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004519 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004520 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004521 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004522 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004523 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004524 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004525 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004526
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004527 issue = None
4528 if options.issue:
4529 try:
4530 issue = int(options.issue)
4531 except ValueError:
4532 DieWithError('A review issue id is expected to be a number')
4533
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004534 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4535
4536 if not cl.IsGerrit():
4537 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004538
4539 if options.comment:
4540 cl.AddComment(options.comment)
4541 return 0
4542
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004543 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4544 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004545 for comment in summary:
4546 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004547 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004548 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004549 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004550 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004551 color = Fore.MAGENTA
4552 else:
4553 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004554 print('\n%s%s %s%s\n%s' % (
4555 color,
4556 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4557 comment.sender,
4558 Fore.RESET,
4559 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4560
smut@google.comc85ac942015-09-15 16:34:43 +00004561 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004562 def pre_serialize(c):
4563 dct = c.__dict__.copy()
4564 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4565 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004566 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004567 return 0
4568
4569
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004570@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004571@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004572def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004573 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004574 parser.add_option('-d', '--display', action='store_true',
4575 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004576 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004577 help='New description to set for this issue (- for stdin, '
4578 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004579 parser.add_option('-f', '--force', action='store_true',
4580 help='Delete any unpublished Gerrit edits for this issue '
4581 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004582
4583 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004584 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004585 options, args = parser.parse_args(args)
4586 _process_codereview_select_options(parser, options)
4587
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004588 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004589 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004590 target_issue_arg = ParseIssueNumberArgument(args[0],
4591 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004592 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004593 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004594
martiniss6eda05f2016-06-30 10:18:35 -07004595 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004596 'auth_config': auth.extract_auth_config_from_options(options),
4597 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004598 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004599 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004600 if target_issue_arg:
4601 kwargs['issue'] = target_issue_arg.issue
4602 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004603 if target_issue_arg.codereview and not options.forced_codereview:
4604 detected_codereview_from_url = True
4605 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004606
4607 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004608 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004609 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004610 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004611
4612 if detected_codereview_from_url:
4613 logging.info('canonical issue/change URL: %s (type: %s)\n',
4614 cl.GetIssueURL(), target_issue_arg.codereview)
4615
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004616 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004617
smut@google.com34fb6b12015-07-13 20:03:26 +00004618 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004619 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004620 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004621
4622 if options.new_description:
4623 text = options.new_description
4624 if text == '-':
4625 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004626 elif text == '+':
4627 base_branch = cl.GetCommonAncestorWithUpstream()
4628 change = cl.GetChange(base_branch, None, local_description=True)
4629 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004630
4631 description.set_description(text)
4632 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004633 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004634
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004635 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004636 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004637 return 0
4638
4639
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004640@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004641def CMDlint(parser, args):
4642 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004643 parser.add_option('--filter', action='append', metavar='-x,+y',
4644 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004645 auth.add_auth_options(parser)
4646 options, args = parser.parse_args(args)
4647 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004648
4649 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004650 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004651 try:
4652 import cpplint
4653 import cpplint_chromium
4654 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004655 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004656 return 1
4657
4658 # Change the current working directory before calling lint so that it
4659 # shows the correct base.
4660 previous_cwd = os.getcwd()
4661 os.chdir(settings.GetRoot())
4662 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004663 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004664 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4665 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004666 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004667 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004668 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004669
4670 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004671 command = args + files
4672 if options.filter:
4673 command = ['--filter=' + ','.join(options.filter)] + command
4674 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004675
4676 white_regex = re.compile(settings.GetLintRegex())
4677 black_regex = re.compile(settings.GetLintIgnoreRegex())
4678 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4679 for filename in filenames:
4680 if white_regex.match(filename):
4681 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004682 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004683 else:
4684 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4685 extra_check_functions)
4686 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004687 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004688 finally:
4689 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004690 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004691 if cpplint._cpplint_state.error_count != 0:
4692 return 1
4693 return 0
4694
4695
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004696@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004697def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004698 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004699 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004700 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004701 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004702 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004703 parser.add_option('--all', action='store_true',
4704 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004705 parser.add_option('--parallel', action='store_true',
4706 help='Run all tests specified by input_api.RunTests in all '
4707 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004708 auth.add_auth_options(parser)
4709 options, args = parser.parse_args(args)
4710 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004711
sbc@chromium.org71437c02015-04-09 19:29:40 +00004712 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004713 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004714 return 1
4715
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004716 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004717 if args:
4718 base_branch = args[0]
4719 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004720 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004721 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004722
Aaron Gable8076c282017-11-29 14:39:41 -08004723 if options.all:
4724 base_change = cl.GetChange(base_branch, None)
4725 files = [('M', f) for f in base_change.AllFiles()]
4726 change = presubmit_support.GitChange(
4727 base_change.Name(),
4728 base_change.FullDescriptionText(),
4729 base_change.RepositoryRoot(),
4730 files,
4731 base_change.issue,
4732 base_change.patchset,
4733 base_change.author_email,
4734 base_change._upstream)
4735 else:
4736 change = cl.GetChange(base_branch, None)
4737
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004738 cl.RunHook(
4739 committing=not options.upload,
4740 may_prompt=False,
4741 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004742 change=change,
4743 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004744 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004745
4746
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004747def GenerateGerritChangeId(message):
4748 """Returns Ixxxxxx...xxx change id.
4749
4750 Works the same way as
4751 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4752 but can be called on demand on all platforms.
4753
4754 The basic idea is to generate git hash of a state of the tree, original commit
4755 message, author/committer info and timestamps.
4756 """
4757 lines = []
4758 tree_hash = RunGitSilent(['write-tree'])
4759 lines.append('tree %s' % tree_hash.strip())
4760 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4761 if code == 0:
4762 lines.append('parent %s' % parent.strip())
4763 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4764 lines.append('author %s' % author.strip())
4765 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4766 lines.append('committer %s' % committer.strip())
4767 lines.append('')
4768 # Note: Gerrit's commit-hook actually cleans message of some lines and
4769 # whitespace. This code is not doing this, but it clearly won't decrease
4770 # entropy.
4771 lines.append(message)
4772 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4773 stdin='\n'.join(lines))
4774 return 'I%s' % change_hash.strip()
4775
4776
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004777def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004778 """Computes the remote branch ref to use for the CL.
4779
4780 Args:
4781 remote (str): The git remote for the CL.
4782 remote_branch (str): The git remote branch for the CL.
4783 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004784 """
4785 if not (remote and remote_branch):
4786 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004787
wittman@chromium.org455dc922015-01-26 20:15:50 +00004788 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004789 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004790 # refs, which are then translated into the remote full symbolic refs
4791 # below.
4792 if '/' not in target_branch:
4793 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4794 else:
4795 prefix_replacements = (
4796 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4797 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4798 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4799 )
4800 match = None
4801 for regex, replacement in prefix_replacements:
4802 match = re.search(regex, target_branch)
4803 if match:
4804 remote_branch = target_branch.replace(match.group(0), replacement)
4805 break
4806 if not match:
4807 # This is a branch path but not one we recognize; use as-is.
4808 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004809 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4810 # Handle the refs that need to land in different refs.
4811 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004812
wittman@chromium.org455dc922015-01-26 20:15:50 +00004813 # Create the true path to the remote branch.
4814 # Does the following translation:
4815 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4816 # * refs/remotes/origin/master -> refs/heads/master
4817 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4818 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4819 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4820 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4821 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4822 'refs/heads/')
4823 elif remote_branch.startswith('refs/remotes/branch-heads'):
4824 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004825
wittman@chromium.org455dc922015-01-26 20:15:50 +00004826 return remote_branch
4827
4828
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004829def cleanup_list(l):
4830 """Fixes a list so that comma separated items are put as individual items.
4831
4832 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4833 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4834 """
4835 items = sum((i.split(',') for i in l), [])
4836 stripped_items = (i.strip() for i in items)
4837 return sorted(filter(None, stripped_items))
4838
4839
Aaron Gable4db38df2017-11-03 14:59:07 -07004840@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004841@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004842def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004843 """Uploads the current changelist to codereview.
4844
4845 Can skip dependency patchset uploads for a branch by running:
4846 git config branch.branch_name.skip-deps-uploads True
4847 To unset run:
4848 git config --unset branch.branch_name.skip-deps-uploads
4849 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004850
4851 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4852 a bug number, this bug number is automatically populated in the CL
4853 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004854
4855 If subject contains text in square brackets or has "<text>: " prefix, such
4856 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4857 [git-cl] add support for hashtags
4858 Foo bar: implement foo
4859 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004860 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004861 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4862 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004863 parser.add_option('--bypass-watchlists', action='store_true',
4864 dest='bypass_watchlists',
4865 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004866 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004867 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004868 parser.add_option('--message', '-m', dest='message',
4869 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004870 parser.add_option('-b', '--bug',
4871 help='pre-populate the bug number(s) for this issue. '
4872 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004873 parser.add_option('--message-file', dest='message_file',
4874 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004875 parser.add_option('--title', '-t', dest='title',
4876 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004877 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004878 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004879 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004880 parser.add_option('--tbrs',
4881 action='append', default=[],
4882 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004883 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004884 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004885 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004886 parser.add_option('--hashtag', dest='hashtags',
4887 action='append', default=[],
4888 help=('Gerrit hashtag for new CL; '
4889 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004890 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004891 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004892 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004893 help='tell the commit queue to commit this patchset; '
4894 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004895 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004896 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004897 metavar='TARGET',
4898 help='Apply CL to remote ref TARGET. ' +
4899 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004900 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004901 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004902 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004903 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004904 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004905 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004906 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4907 const='TBR', help='add a set of OWNERS to TBR')
4908 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4909 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004910 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4911 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004912 help='Send the patchset to do a CQ dry run right after '
4913 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004914 parser.add_option('--dependencies', action='store_true',
4915 help='Uploads CLs of all the local branches that depend on '
4916 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004917 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4918 help='Sends your change to the CQ after an approval. Only '
4919 'works on repos that have the Auto-Submit label '
4920 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004921 parser.add_option('--parallel', action='store_true',
4922 help='Run all tests specified by input_api.RunTests in all '
4923 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004924
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004925 parser.add_option('--no-autocc', action='store_true',
4926 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004927 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004928 help='Set the review private. This implies --no-autocc.')
4929
rmistry@google.com2dd99862015-06-22 12:22:18 +00004930 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004931 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004932 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004933 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004934 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004935 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004936
sbc@chromium.org71437c02015-04-09 19:29:40 +00004937 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004938 return 1
4939
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004940 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004941 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004942 options.cc = cleanup_list(options.cc)
4943
tandriib80458a2016-06-23 12:20:07 -07004944 if options.message_file:
4945 if options.message:
4946 parser.error('only one of --message and --message-file allowed.')
4947 options.message = gclient_utils.FileRead(options.message_file)
4948 options.message_file = None
4949
tandrii4d0545a2016-07-06 03:56:49 -07004950 if options.cq_dry_run and options.use_commit_queue:
4951 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4952
Aaron Gableedbc4132017-09-11 13:22:28 -07004953 if options.use_commit_queue:
4954 options.send_mail = True
4955
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004956 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4957 settings.GetIsGerrit()
4958
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004959 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004960 if not cl.IsGerrit():
4961 # Error out with instructions for repos not yet configured for Gerrit.
4962 print('=====================================')
4963 print('NOTICE: Rietveld is no longer supported. '
4964 'You can upload changes to Gerrit with')
4965 print(' git cl upload --gerrit')
4966 print('or set Gerrit to be your default code review tool with')
4967 print(' git config gerrit.host true')
4968 print('=====================================')
4969 return 1
4970
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004971 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004972
4973
Francois Dorayd42c6812017-05-30 15:10:20 -04004974@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004975@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04004976def CMDsplit(parser, args):
4977 """Splits a branch into smaller branches and uploads CLs.
4978
4979 Creates a branch and uploads a CL for each group of files modified in the
4980 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004981 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004982 the shared OWNERS file.
4983 """
4984 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05004985 help="A text file containing a CL description in which "
4986 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04004987 parser.add_option("-c", "--comment", dest="comment_file",
4988 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11004989 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
4990 default=False,
4991 help="List the files and reviewers for each CL that would "
4992 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00004993 parser.add_option("--cq-dry-run", action='store_true',
4994 help="If set, will do a cq dry run for each uploaded CL. "
4995 "Please be careful when doing this; more than ~10 CLs "
4996 "has the potential to overload our build "
4997 "infrastructure. Try to upload these not during high "
4998 "load times (usually 11-3 Mountain View time). Email "
4999 "infra-dev@chromium.org with any questions.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005000 options, _ = parser.parse_args(args)
5001
5002 if not options.description_file:
5003 parser.error('No --description flag specified.')
5004
5005 def WrappedCMDupload(args):
5006 return CMDupload(OptionParser(), args)
5007
5008 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00005009 Changelist, WrappedCMDupload, options.dry_run,
5010 options.cq_dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005011
5012
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005013@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005014@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005015def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005016 """DEPRECATED: Used to commit the current changelist via git-svn."""
5017 message = ('git-cl no longer supports committing to SVN repositories via '
5018 'git-svn. You probably want to use `git cl land` instead.')
5019 print(message)
5020 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005021
5022
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005023# Two special branches used by git cl land.
5024MERGE_BRANCH = 'git-cl-commit'
5025CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5026
5027
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005028@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005029@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005030def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005031 """Commits the current changelist via git.
5032
5033 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5034 upstream and closes the issue automatically and atomically.
5035
5036 Otherwise (in case of Rietveld):
5037 Squashes branch into a single commit.
5038 Updates commit message with metadata (e.g. pointer to review).
5039 Pushes the code upstream.
5040 Updates review and closes.
5041 """
5042 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5043 help='bypass upload presubmit hook')
5044 parser.add_option('-m', dest='message',
5045 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005046 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005047 help="force yes to questions (don't prompt)")
5048 parser.add_option('-c', dest='contributor',
5049 help="external contributor for patch (appended to " +
5050 "description and used as author for git). Should be " +
5051 "formatted as 'First Last <email@example.com>'")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005052 parser.add_option('--parallel', action='store_true',
5053 help='Run all tests specified by input_api.RunTests in all '
5054 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005055 auth.add_auth_options(parser)
5056 (options, args) = parser.parse_args(args)
5057 auth_config = auth.extract_auth_config_from_options(options)
5058
5059 cl = Changelist(auth_config=auth_config)
5060
Robert Iannucci2e73d432018-03-14 01:10:47 -07005061 if not cl.IsGerrit():
5062 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005063
Robert Iannucci2e73d432018-03-14 01:10:47 -07005064 if options.message:
5065 # This could be implemented, but it requires sending a new patch to
5066 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5067 # Besides, Gerrit has the ability to change the commit message on submit
5068 # automatically, thus there is no need to support this option (so far?).
5069 parser.error('-m MESSAGE option is not supported for Gerrit.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005070 if options.contributor:
Robert Iannucci2e73d432018-03-14 01:10:47 -07005071 parser.error(
5072 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5073 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5074 'the contributor\'s "name <email>". If you can\'t upload such a '
5075 'commit for review, contact your repository admin and request'
5076 '"Forge-Author" permission.')
5077 if not cl.GetIssue():
5078 DieWithError('You must upload the change first to Gerrit.\n'
5079 ' If you would rather have `git cl land` upload '
5080 'automatically for you, see http://crbug.com/642759')
5081 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02005082 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005083
5084
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005085def PushToGitWithAutoRebase(remote, branch, original_description,
5086 git_numberer_enabled, max_attempts=3):
5087 """Pushes current HEAD commit on top of remote's branch.
5088
5089 Attempts to fetch and autorebase on push failures.
5090 Adds git number footers on the fly.
5091
5092 Returns integer code from last command.
5093 """
5094 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5095 code = 0
5096 attempts_left = max_attempts
5097 while attempts_left:
5098 attempts_left -= 1
5099 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5100
5101 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5102 # If fetch fails, retry.
5103 print('Fetching %s/%s...' % (remote, branch))
5104 code, out = RunGitWithCode(
5105 ['retry', 'fetch', remote,
5106 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5107 if code:
5108 print('Fetch failed with exit code %d.' % code)
5109 print(out.strip())
5110 continue
5111
5112 print('Cherry-picking commit on top of latest %s' % branch)
5113 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5114 suppress_stderr=True)
5115 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5116 code, out = RunGitWithCode(['cherry-pick', cherry])
5117 if code:
5118 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5119 'the following files have merge conflicts:' %
5120 (branch, parent_hash))
Aaron Gable7817f022017-12-12 09:43:17 -08005121 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5122 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005123 print('Please rebase your patch and try again.')
5124 RunGitWithCode(['cherry-pick', '--abort'])
5125 break
5126
5127 commit_desc = ChangeDescription(original_description)
5128 if git_numberer_enabled:
5129 logging.debug('Adding git number footers')
5130 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5131 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5132 branch)
5133 # Ensure timestamps are monotonically increasing.
5134 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5135 _get_committer_timestamp('HEAD'))
5136 _git_amend_head(commit_desc.description, timestamp)
5137
5138 code, out = RunGitWithCode(
5139 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5140 print(out)
5141 if code == 0:
5142 break
5143 if IsFatalPushFailure(out):
5144 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005145 'user.email are correct and you have push access to the repo.\n'
5146 'Hint: run command below to diangose common Git/Gerrit credential '
5147 'problems:\n'
5148 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005149 break
5150 return code
5151
5152
5153def IsFatalPushFailure(push_stdout):
5154 """True if retrying push won't help."""
5155 return '(prohibited by Gerrit)' in push_stdout
5156
5157
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005158@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005159@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005160def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005161 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005162 parser.add_option('-b', dest='newbranch',
5163 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005164 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005165 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005166 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005167 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005168 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005169 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005170 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005171 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005172 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005173 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005174
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005175
5176 group = optparse.OptionGroup(
5177 parser,
5178 'Options for continuing work on the current issue uploaded from a '
5179 'different clone (e.g. different machine). Must be used independently '
5180 'from the other options. No issue number should be specified, and the '
5181 'branch must have an issue number associated with it')
5182 group.add_option('--reapply', action='store_true', dest='reapply',
5183 help='Reset the branch and reapply the issue.\n'
5184 'CAUTION: This will undo any local changes in this '
5185 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005186
5187 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005188 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005189 parser.add_option_group(group)
5190
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005191 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005192 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005193 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005194 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005195 auth_config = auth.extract_auth_config_from_options(options)
5196
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005197 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005198 if options.newbranch:
5199 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005200 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005201 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005202
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005203 cl = Changelist(auth_config=auth_config,
5204 codereview=options.forced_codereview)
5205 if not cl.GetIssue():
5206 parser.error('current branch must have an associated issue')
5207
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005208 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005209 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005210 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005211
5212 RunGit(['reset', '--hard', upstream])
5213 if options.pull:
5214 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005215
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005216 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5217 options.directory)
5218
5219 if len(args) != 1 or not args[0]:
5220 parser.error('Must specify issue number or url')
5221
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005222 target_issue_arg = ParseIssueNumberArgument(args[0],
5223 options.forced_codereview)
5224 if not target_issue_arg.valid:
5225 parser.error('invalid codereview url or CL id')
5226
5227 cl_kwargs = {
5228 'auth_config': auth_config,
5229 'codereview_host': target_issue_arg.hostname,
5230 'codereview': options.forced_codereview,
5231 }
5232 detected_codereview_from_url = False
5233 if target_issue_arg.codereview and not options.forced_codereview:
5234 detected_codereview_from_url = True
5235 cl_kwargs['codereview'] = target_issue_arg.codereview
5236 cl_kwargs['issue'] = target_issue_arg.issue
5237
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005238 # We don't want uncommitted changes mixed up with the patch.
5239 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005240 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005242 if options.newbranch:
5243 if options.force:
5244 RunGit(['branch', '-D', options.newbranch],
5245 stderr=subprocess2.PIPE, error_ok=True)
5246 RunGit(['new-branch', options.newbranch])
5247
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005248 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005249
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005250 if cl.IsGerrit():
5251 if options.reject:
5252 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005253 if options.directory:
5254 parser.error('--directory is not supported with Gerrit codereview.')
5255
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005256 if detected_codereview_from_url:
5257 print('canonical issue/change URL: %s (type: %s)\n' %
5258 (cl.GetIssueURL(), target_issue_arg.codereview))
5259
5260 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005261 options.nocommit, options.directory,
5262 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005263
5264
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005265def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266 """Fetches the tree status and returns either 'open', 'closed',
5267 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005268 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005269 if url:
5270 status = urllib2.urlopen(url).read().lower()
5271 if status.find('closed') != -1 or status == '0':
5272 return 'closed'
5273 elif status.find('open') != -1 or status == '1':
5274 return 'open'
5275 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005276 return 'unset'
5277
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005278
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005279def GetTreeStatusReason():
5280 """Fetches the tree status from a json url and returns the message
5281 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005282 url = settings.GetTreeStatusUrl()
5283 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005284 connection = urllib2.urlopen(json_url)
5285 status = json.loads(connection.read())
5286 connection.close()
5287 return status['message']
5288
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005289
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005290@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005291def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005292 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005293 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005294 status = GetTreeStatus()
5295 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005296 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005297 return 2
5298
vapiera7fbd5a2016-06-16 09:17:49 -07005299 print('The tree is %s' % status)
5300 print()
5301 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302 if status != 'open':
5303 return 1
5304 return 0
5305
5306
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005307@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005308def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005309 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005310 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005311 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005312 '-b', '--bot', action='append',
5313 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5314 'times to specify multiple builders. ex: '
5315 '"-b win_rel -b win_layout". See '
5316 'the try server waterfall for the builders name and the tests '
5317 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005318 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005319 '-B', '--bucket', default='',
5320 help=('Buildbucket bucket to send the try requests.'))
5321 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005322 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005323 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005324 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005325 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005326 help='Revision to use for the try job; default: the revision will '
5327 'be determined by the try recipe that builder runs, which usually '
5328 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005329 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005330 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005331 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005332 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005333 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005334 '--category', default='git_cl_try', help='Specify custom build category.')
5335 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005336 '--project',
5337 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005338 'in recipe to determine to which repository or directory to '
5339 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005340 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005341 '-p', '--property', dest='properties', action='append', default=[],
5342 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005343 'key2=value2 etc. The value will be treated as '
5344 'json if decodable, or as string otherwise. '
5345 'NOTE: using this may make your try job not usable for CQ, '
5346 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005347 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005348 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5349 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005350 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005351 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005352 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005353 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005354 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005355 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005356
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005357 if options.master and options.master.startswith('luci.'):
5358 parser.error(
5359 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005360 # Make sure that all properties are prop=value pairs.
5361 bad_params = [x for x in options.properties if '=' not in x]
5362 if bad_params:
5363 parser.error('Got properties with missing "=": %s' % bad_params)
5364
maruel@chromium.org15192402012-09-06 12:38:29 +00005365 if args:
5366 parser.error('Unknown arguments: %s' % args)
5367
Koji Ishii31c14782018-01-08 17:17:33 +09005368 cl = Changelist(auth_config=auth_config, issue=options.issue,
5369 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005370 if not cl.GetIssue():
5371 parser.error('Need to upload first')
5372
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005373 if cl.IsGerrit():
5374 # HACK: warm up Gerrit change detail cache to save on RPCs.
5375 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5376
tandriie113dfd2016-10-11 10:20:12 -07005377 error_message = cl.CannotTriggerTryJobReason()
5378 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005379 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005380
borenet6c0efe62016-10-19 08:13:29 -07005381 if options.bucket and options.master:
5382 parser.error('Only one of --bucket and --master may be used.')
5383
qyearsley1fdfcb62016-10-24 13:22:03 -07005384 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005385
qyearsleydd49f942016-10-28 11:57:22 -07005386 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5387 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005388 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005389 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005390 print('git cl try with no bots now defaults to CQ dry run.')
5391 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5392 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005393
borenet6c0efe62016-10-19 08:13:29 -07005394 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005395 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005396 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005397 'of bot requires an initial job from a parent (usually a builder). '
5398 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005399 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005400 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005401
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005402 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005403 # TODO(tandrii): Checking local patchset against remote patchset is only
5404 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5405 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005406 print('Warning: Codereview server has newer patchsets (%s) than most '
5407 'recent upload from local checkout (%s). Did a previous upload '
5408 'fail?\n'
5409 'By default, git cl try uses the latest patchset from '
5410 'codereview, continuing to use patchset %s.\n' %
5411 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005412
tandrii568043b2016-10-11 07:49:18 -07005413 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005414 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005415 except BuildbucketResponseException as ex:
5416 print('ERROR: %s' % ex)
5417 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005418 return 0
5419
5420
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005421@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005422def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005423 """Prints info about try jobs associated with current CL."""
5424 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005425 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005426 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005427 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005428 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005429 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005430 '--color', action='store_true', default=setup_color.IS_TTY,
5431 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005432 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005433 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5434 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005435 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005436 '--json', help=('Path of JSON output file to write try job results to,'
5437 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005438 parser.add_option_group(group)
5439 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005440 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005441 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005442 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005443 if args:
5444 parser.error('Unrecognized args: %s' % ' '.join(args))
5445
5446 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005447 cl = Changelist(
5448 issue=options.issue, codereview=options.forced_codereview,
5449 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005450 if not cl.GetIssue():
5451 parser.error('Need to upload first')
5452
tandrii221ab252016-10-06 08:12:04 -07005453 patchset = options.patchset
5454 if not patchset:
5455 patchset = cl.GetMostRecentPatchset()
5456 if not patchset:
5457 parser.error('Codereview doesn\'t know about issue %s. '
5458 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005459 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005460 cl.GetIssue())
5461
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005462 # TODO(tandrii): Checking local patchset against remote patchset is only
5463 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5464 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005465 print('Warning: Codereview server has newer patchsets (%s) than most '
5466 'recent upload from local checkout (%s). Did a previous upload '
5467 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005468 'By default, git cl try-results uses the latest patchset from '
5469 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005470 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005471 try:
tandrii221ab252016-10-06 08:12:04 -07005472 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005473 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005474 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005475 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005476 if options.json:
5477 write_try_results_json(options.json, jobs)
5478 else:
5479 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005480 return 0
5481
5482
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005483@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005484@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005485def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005486 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005487 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005488 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005489 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005490
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005491 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005492 if args:
5493 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005494 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005495 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005496 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005497 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005498
5499 # Clear configured merge-base, if there is one.
5500 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005501 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005502 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005503 return 0
5504
5505
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005506@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005507def CMDweb(parser, args):
5508 """Opens the current CL in the web browser."""
5509 _, args = parser.parse_args(args)
5510 if args:
5511 parser.error('Unrecognized args: %s' % ' '.join(args))
5512
5513 issue_url = Changelist().GetIssueURL()
5514 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005515 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005516 return 1
5517
5518 webbrowser.open(issue_url)
5519 return 0
5520
5521
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005522@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005523def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005524 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005525 parser.add_option('-d', '--dry-run', action='store_true',
5526 help='trigger in dry run mode')
5527 parser.add_option('-c', '--clear', action='store_true',
5528 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005529 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005530 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005531 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005532 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005533 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005534 if args:
5535 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005536 if options.dry_run and options.clear:
5537 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5538
iannuccie53c9352016-08-17 14:40:40 -07005539 cl = Changelist(auth_config=auth_config, issue=options.issue,
5540 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005541 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005542 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005543 elif options.dry_run:
5544 state = _CQState.DRY_RUN
5545 else:
5546 state = _CQState.COMMIT
5547 if not cl.GetIssue():
5548 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005549 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005550 return 0
5551
5552
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005553@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005554def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005555 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005556 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005557 auth.add_auth_options(parser)
5558 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005559 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005560 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005561 if args:
5562 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005563 cl = Changelist(auth_config=auth_config, issue=options.issue,
5564 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005565 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005566 if not cl.GetIssue():
5567 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005568 cl.CloseIssue()
5569 return 0
5570
5571
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005572@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005573def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005574 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005575 parser.add_option(
5576 '--stat',
5577 action='store_true',
5578 dest='stat',
5579 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005580 auth.add_auth_options(parser)
5581 options, args = parser.parse_args(args)
5582 auth_config = auth.extract_auth_config_from_options(options)
5583 if args:
5584 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005585
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005586 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005587 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005588 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005589 if not issue:
5590 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005591
Aaron Gablea718c3e2017-08-28 17:47:28 -07005592 base = cl._GitGetBranchConfigValue('last-upload-hash')
5593 if not base:
5594 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5595 if not base:
5596 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5597 revision_info = detail['revisions'][detail['current_revision']]
5598 fetch_info = revision_info['fetch']['http']
5599 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5600 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005601
Aaron Gablea718c3e2017-08-28 17:47:28 -07005602 cmd = ['git', 'diff']
5603 if options.stat:
5604 cmd.append('--stat')
5605 cmd.append(base)
5606 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005607
5608 return 0
5609
5610
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005611@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005612def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005613 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005614 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005615 '--ignore-current',
5616 action='store_true',
5617 help='Ignore the CL\'s current reviewers and start from scratch.')
5618 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005619 '--no-color',
5620 action='store_true',
5621 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005622 parser.add_option(
5623 '--batch',
5624 action='store_true',
5625 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005626 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005627 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005628 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005629
5630 author = RunGit(['config', 'user.email']).strip() or None
5631
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005632 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005633
5634 if args:
5635 if len(args) > 1:
5636 parser.error('Unknown args')
5637 base_branch = args[0]
5638 else:
5639 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005640 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005641
5642 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005643 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5644
5645 if options.batch:
5646 db = owners.Database(change.RepositoryRoot(), file, os.path)
5647 print('\n'.join(db.reviewers_for(affected_files, author)))
5648 return 0
5649
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005650 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005651 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005652 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005653 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005654 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005655 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005656 disable_color=options.no_color,
5657 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005658
5659
Aiden Bennerc08566e2018-10-03 17:52:42 +00005660def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005661 """Generates a diff command."""
5662 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005663 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5664
5665 if not allow_prefix:
5666 diff_cmd += ['--no-prefix']
5667
5668 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005669
5670 if args:
5671 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005672 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005673 diff_cmd.append(arg)
5674 else:
5675 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005676
5677 return diff_cmd
5678
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005679
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005680def MatchingFileType(file_name, extensions):
5681 """Returns true if the file name ends with one of the given extensions."""
5682 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005683
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005684
enne@chromium.org555cfe42014-01-29 18:21:39 +00005685@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005686@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005687def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005688 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005689 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005690 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005691 parser.add_option('--full', action='store_true',
5692 help='Reformat the full content of all touched files')
5693 parser.add_option('--dry-run', action='store_true',
5694 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005695 parser.add_option('--python', action='store_true',
5696 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005697 parser.add_option('--js', action='store_true',
5698 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005699 parser.add_option('--diff', action='store_true',
5700 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005701 parser.add_option('--presubmit', action='store_true',
5702 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005703 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005704
Daniel Chengc55eecf2016-12-30 03:11:02 -08005705 # Normalize any remaining args against the current path, so paths relative to
5706 # the current directory are still resolved as expected.
5707 args = [os.path.join(os.getcwd(), arg) for arg in args]
5708
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005709 # git diff generates paths against the root of the repository. Change
5710 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005711 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005712 if rel_base_path:
5713 os.chdir(rel_base_path)
5714
digit@chromium.org29e47272013-05-17 17:01:46 +00005715 # Grab the merge-base commit, i.e. the upstream commit of the current
5716 # branch when it was created or the last time it was rebased. This is
5717 # to cover the case where the user may have called "git fetch origin",
5718 # moving the origin branch to a newer commit, but hasn't rebased yet.
5719 upstream_commit = None
5720 cl = Changelist()
5721 upstream_branch = cl.GetUpstreamBranch()
5722 if upstream_branch:
5723 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5724 upstream_commit = upstream_commit.strip()
5725
5726 if not upstream_commit:
5727 DieWithError('Could not find base commit for this branch. '
5728 'Are you in detached state?')
5729
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005730 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5731 diff_output = RunGit(changed_files_cmd)
5732 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005733 # Filter out files deleted by this CL
5734 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005735
Christopher Lamc5ba6922017-01-24 11:19:14 +11005736 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005737 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005738
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005739 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5740 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5741 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005742 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005743
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005744 top_dir = os.path.normpath(
5745 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5746
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005747 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5748 # formatted. This is used to block during the presubmit.
5749 return_value = 0
5750
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005751 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005752 # Locate the clang-format binary in the checkout
5753 try:
5754 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005755 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005756 DieWithError(e)
5757
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005758 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005759 cmd = [clang_format_tool]
5760 if not opts.dry_run and not opts.diff:
5761 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005762 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005763 if opts.diff:
5764 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005765 else:
5766 env = os.environ.copy()
5767 env['PATH'] = str(os.path.dirname(clang_format_tool))
5768 try:
5769 script = clang_format.FindClangFormatScriptInChromiumTree(
5770 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005771 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005772 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005773
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005774 cmd = [sys.executable, script, '-p0']
5775 if not opts.dry_run and not opts.diff:
5776 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005777
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005778 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5779 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005780
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005781 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5782 if opts.diff:
5783 sys.stdout.write(stdout)
5784 if opts.dry_run and len(stdout) > 0:
5785 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005786
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005787 # Similar code to above, but using yapf on .py files rather than clang-format
5788 # on C/C++ files
Aiden Bennerc08566e2018-10-03 17:52:42 +00005789 if opts.python and python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005790 yapf_tool = gclient_utils.FindExecutable('yapf')
5791 if yapf_tool is None:
5792 DieWithError('yapf not found in PATH')
5793
Aiden Bennerc08566e2018-10-03 17:52:42 +00005794 # If we couldn't find a yapf file we'll default to the chromium style
5795 # specified in depot_tools.
5796 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5797 chromium_default_yapf_style = os.path.join(depot_tools_path,
5798 YAPF_CONFIG_FILENAME)
5799
5800 # Note: yapf still seems to fix indentation of the entire file
5801 # even if line ranges are specified.
5802 # See https://github.com/google/yapf/issues/499
5803 if not opts.full:
5804 py_line_diffs = _ComputeDiffLineRanges(python_diff_files, upstream_commit)
5805
5806 # Used for caching.
5807 yapf_configs = {}
5808 for f in python_diff_files:
5809 # Find the yapf style config for the current file, defaults to depot
5810 # tools default.
5811 yapf_config = _FindYapfConfigFile(
5812 os.path.abspath(f), yapf_configs, top_dir,
5813 chromium_default_yapf_style)
5814
5815 cmd = [yapf_tool, '--style', yapf_config, f]
5816
5817 has_formattable_lines = False
5818 if not opts.full:
5819 # Only run yapf over changed line ranges.
5820 for diff_start, diff_len in py_line_diffs[f]:
5821 diff_end = diff_start + diff_len - 1
5822 # Yapf errors out if diff_end < diff_start but this
5823 # is a valid line range diff for a removal.
5824 if diff_end >= diff_start:
5825 has_formattable_lines = True
5826 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5827 # If all line diffs were removals we have nothing to format.
5828 if not has_formattable_lines:
5829 continue
5830
5831 if opts.diff or opts.dry_run:
5832 cmd += ['--diff']
5833 # Will return non-zero exit code if non-empty diff.
5834 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5835 if opts.diff:
5836 sys.stdout.write(stdout)
5837 elif len(stdout) > 0:
5838 return_value = 2
5839 else:
5840 cmd += ['-i']
5841 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005842
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005843 # Dart's formatter does not have the nice property of only operating on
5844 # modified chunks, so hard code full.
5845 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005846 try:
5847 command = [dart_format.FindDartFmtToolInChromiumTree()]
5848 if not opts.dry_run and not opts.diff:
5849 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005850 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005851
ppi@chromium.org6593d932016-03-03 15:41:15 +00005852 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005853 if opts.dry_run and stdout:
5854 return_value = 2
5855 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005856 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5857 'found in this checkout. Files in other languages are still '
5858 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005859
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005860 # Format GN build files. Always run on full build files for canonical form.
5861 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005862 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005863 if opts.dry_run or opts.diff:
5864 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005865 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005866 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5867 shell=sys.platform == 'win32',
5868 cwd=top_dir)
5869 if opts.dry_run and gn_ret == 2:
5870 return_value = 2 # Not formatted.
5871 elif opts.diff and gn_ret == 2:
5872 # TODO this should compute and print the actual diff.
5873 print("This change has GN build file diff for " + gn_diff_file)
5874 elif gn_ret != 0:
5875 # For non-dry run cases (and non-2 return values for dry-run), a
5876 # nonzero error code indicates a failure, probably because the file
5877 # doesn't parse.
5878 DieWithError("gn format failed on " + gn_diff_file +
5879 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005880
Ilya Shermane081cbe2017-08-15 17:51:04 -07005881 # Skip the metrics formatting from the global presubmit hook. These files have
5882 # a separate presubmit hook that issues an error if the files need formatting,
5883 # whereas the top-level presubmit script merely issues a warning. Formatting
5884 # these files is somewhat slow, so it's important not to duplicate the work.
5885 if not opts.presubmit:
5886 for xml_dir in GetDirtyMetricsDirs(diff_files):
5887 tool_dir = os.path.join(top_dir, xml_dir)
5888 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5889 if opts.dry_run or opts.diff:
5890 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005891 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005892 if opts.diff:
5893 sys.stdout.write(stdout)
5894 if opts.dry_run and stdout:
5895 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005896
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005897 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005898
Steven Holte2e664bf2017-04-21 13:10:47 -07005899def GetDirtyMetricsDirs(diff_files):
5900 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5901 metrics_xml_dirs = [
5902 os.path.join('tools', 'metrics', 'actions'),
5903 os.path.join('tools', 'metrics', 'histograms'),
5904 os.path.join('tools', 'metrics', 'rappor'),
5905 os.path.join('tools', 'metrics', 'ukm')]
5906 for xml_dir in metrics_xml_dirs:
5907 if any(file.startswith(xml_dir) for file in xml_diff_files):
5908 yield xml_dir
5909
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005910
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005911@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005912@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005913def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005914 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005915 _, args = parser.parse_args(args)
5916
5917 if len(args) != 1:
5918 parser.print_help()
5919 return 1
5920
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005921 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005922 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005923 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005924
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005925 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005926
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005927 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005928 output = RunGit(['config', '--local', '--get-regexp',
5929 r'branch\..*\.%s' % issueprefix],
5930 error_ok=True)
5931 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005932 if issue == target_issue:
5933 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005934
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005935 branches = []
5936 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005937 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005938 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005939 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005940 return 1
5941 if len(branches) == 1:
5942 RunGit(['checkout', branches[0]])
5943 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005944 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005945 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005946 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005947 which = raw_input('Choose by index: ')
5948 try:
5949 RunGit(['checkout', branches[int(which)]])
5950 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005951 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005952 return 1
5953
5954 return 0
5955
5956
maruel@chromium.org29404b52014-09-08 22:58:00 +00005957def CMDlol(parser, args):
5958 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005959 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005960 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5961 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5962 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005963 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005964 return 0
5965
5966
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005967class OptionParser(optparse.OptionParser):
5968 """Creates the option parse and add --verbose support."""
5969 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005970 optparse.OptionParser.__init__(
5971 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005972 self.add_option(
5973 '-v', '--verbose', action='count', default=0,
5974 help='Use 2 times for more debugging info')
5975
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005976 def parse_args(self, args=None, _values=None):
5977 # Create an optparse.Values object that will store only the actual passed
5978 # options, without the defaults.
5979 actual_options = optparse.Values()
5980 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5981 # Create an optparse.Values object with the default options.
5982 options = optparse.Values(self.get_default_values().__dict__)
5983 # Update it with the options passed by the user.
5984 options._update_careful(actual_options.__dict__)
5985 # Store the options passed by the user in an _actual_options attribute.
5986 # We store only the keys, and not the values, since the values can contain
5987 # arbitrary information, which might be PII.
5988 metrics.collector.add('arguments', actual_options.__dict__.keys())
5989
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005990 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005991 logging.basicConfig(
5992 level=levels[min(options.verbose, len(levels) - 1)],
5993 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5994 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005995
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005996 return options, args
5997
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005998
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005999def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006000 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006001 print('\nYour python version %s is unsupported, please upgrade.\n' %
6002 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006003 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006004
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006005 # Reload settings.
6006 global settings
6007 settings = Settings()
6008
Edward Lemurad463c92018-07-25 21:31:23 +00006009 if not metrics.DISABLE_METRICS_COLLECTION:
6010 metrics.collector.add('project_urls', [settings.GetViewVCUrl().strip('/+')])
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006011 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006012 dispatcher = subcommand.CommandDispatcher(__name__)
6013 try:
6014 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006015 except auth.AuthenticationError as e:
6016 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006017 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006018 if e.code != 500:
6019 raise
6020 DieWithError(
6021 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6022 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006023 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006024
6025
6026if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006027 # These affect sys.stdout so do it outside of main() to simplify mocks in
6028 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006029 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006030 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006031 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006032 sys.exit(main(sys.argv[1:]))