blob: 8f7f6b77da1a0c5d5b39caac246ea01c51737eaa [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
Edward Lesmes93277a72018-10-18 22:04:26 +000059import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000060import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000061import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000063import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040065import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000066import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000067import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068import watchlists
69
tandrii7400cf02016-06-21 08:48:07 -070070__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000071
tandrii9d2c7a32016-06-22 03:42:45 -070072COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070073DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080074POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000075DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000076REFS_THAT_ALIAS_TO_OTHER_REFS = {
77 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
78 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
79}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000080
thestig@chromium.org44202a22014-03-11 19:22:18 +000081# Valid extensions for files we want to lint.
82DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
83DEFAULT_LINT_IGNORE_REGEX = r"$^"
84
Aiden Bennerc08566e2018-10-03 17:52:42 +000085# File name for yapf style config files.
86YAPF_CONFIG_FILENAME = '.style.yapf'
87
borenet6c0efe62016-10-19 08:13:29 -070088# Buildbucket master name prefix.
89MASTER_PREFIX = 'master.'
90
Edward Lemur83bd7f42018-10-10 00:14:21 +000091# TODO(crbug.com/881860): Remove
92# Log gerrit failures to a gerrit_util.GERRIT_ERR_LOG_FILE.
93GERRIT_ERR_LOGGER = logging.getLogger('GerritErrorLogs')
94
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000095# Shortcut since it quickly becomes redundant.
96Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000097
maruel@chromium.orgddd59412011-11-30 14:20:38 +000098# Initialized in main()
99settings = None
100
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100101# Used by tests/git_cl_test.py to add extra logging.
102# Inside the weirdly failing test, add this:
103# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700104# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100105_IS_BEING_TESTED = False
106
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000107
Christopher Lamf732cd52017-01-24 12:40:11 +1100108def DieWithError(message, change_desc=None):
109 if change_desc:
110 SaveDescriptionBackup(change_desc)
111
vapiera7fbd5a2016-06-16 09:17:49 -0700112 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113 sys.exit(1)
114
115
Christopher Lamf732cd52017-01-24 12:40:11 +1100116def SaveDescriptionBackup(change_desc):
117 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000118 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100119 backup_file = open(backup_path, 'w')
120 backup_file.write(change_desc.description)
121 backup_file.close()
122
123
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000124def GetNoGitPagerEnv():
125 env = os.environ.copy()
126 # 'cat' is a magical git string that disables pagers on all platforms.
127 env['GIT_PAGER'] = 'cat'
128 return env
129
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000130
bsep@chromium.org627d9002016-04-29 00:00:52 +0000131def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000133 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000134 except subprocess2.CalledProcessError as e:
135 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000136 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000138 'Command "%s" failed.\n%s' % (
139 ' '.join(args), error_message or e.stdout or ''))
140 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000141
142
143def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000144 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000145 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000146
147
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000148def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000149 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700150 if suppress_stderr:
151 stderr = subprocess2.VOID
152 else:
153 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000154 try:
tandrii5d48c322016-08-18 16:19:37 -0700155 (out, _), code = subprocess2.communicate(['git'] + args,
156 env=GetNoGitPagerEnv(),
157 stdout=subprocess2.PIPE,
158 stderr=stderr)
159 return code, out
160 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900161 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700162 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000163
164
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000165def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000166 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000167 return RunGitWithCode(args, suppress_stderr=True)[1]
168
169
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000170def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000171 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000172 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000173 return (version.startswith(prefix) and
174 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000175
176
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000177def BranchExists(branch):
178 """Return True if specified branch exists."""
179 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
180 suppress_stderr=True)
181 return not code
182
183
tandrii2a16b952016-10-19 07:09:44 -0700184def time_sleep(seconds):
185 # Use this so that it can be mocked in tests without interfering with python
186 # system machinery.
187 import time # Local import to discourage others from importing time globally.
188 return time.sleep(seconds)
189
190
maruel@chromium.org90541732011-04-01 17:54:18 +0000191def ask_for_data(prompt):
192 try:
193 return raw_input(prompt)
194 except KeyboardInterrupt:
195 # Hide the exception.
196 sys.exit(1)
197
198
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100199def confirm_or_exit(prefix='', action='confirm'):
200 """Asks user to press enter to continue or press Ctrl+C to abort."""
201 if not prefix or prefix.endswith('\n'):
202 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100203 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100204 mid = ' Press'
205 elif prefix.endswith(' '):
206 mid = 'press'
207 else:
208 mid = ' press'
209 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
210
211
212def ask_for_explicit_yes(prompt):
213 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
214 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
215 while True:
216 if 'yes'.startswith(result):
217 return True
218 if 'no'.startswith(result):
219 return False
220 result = ask_for_data('Please, type yes or no: ').lower()
221
222
tandrii5d48c322016-08-18 16:19:37 -0700223def _git_branch_config_key(branch, key):
224 """Helper method to return Git config key for a branch."""
225 assert branch, 'branch name is required to set git config for it'
226 return 'branch.%s.%s' % (branch, key)
227
228
229def _git_get_branch_config_value(key, default=None, value_type=str,
230 branch=False):
231 """Returns git config value of given or current branch if any.
232
233 Returns default in all other cases.
234 """
235 assert value_type in (int, str, bool)
236 if branch is False: # Distinguishing default arg value from None.
237 branch = GetCurrentBranch()
238
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000239 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700240 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000241
tandrii5d48c322016-08-18 16:19:37 -0700242 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700243 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700244 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700245 # git config also has --int, but apparently git config suffers from integer
246 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700247 args.append(_git_branch_config_key(branch, key))
248 code, out = RunGitWithCode(args)
249 if code == 0:
250 value = out.strip()
251 if value_type == int:
252 return int(value)
253 if value_type == bool:
254 return bool(value.lower() == 'true')
255 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000256 return default
257
258
tandrii5d48c322016-08-18 16:19:37 -0700259def _git_set_branch_config_value(key, value, branch=None, **kwargs):
260 """Sets the value or unsets if it's None of a git branch config.
261
262 Valid, though not necessarily existing, branch must be provided,
263 otherwise currently checked out branch is used.
264 """
265 if not branch:
266 branch = GetCurrentBranch()
267 assert branch, 'a branch name OR currently checked out branch is required'
268 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700269 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700270 if value is None:
271 args.append('--unset')
272 elif isinstance(value, bool):
273 args.append('--bool')
274 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700275 else:
tandrii33a46ff2016-08-23 05:53:40 -0700276 # git config also has --int, but apparently git config suffers from integer
277 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700278 value = str(value)
279 args.append(_git_branch_config_key(branch, key))
280 if value is not None:
281 args.append(value)
282 RunGit(args, **kwargs)
283
284
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100285def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700286 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100287
288 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
289 """
290 # Git also stores timezone offset, but it only affects visual display,
291 # actual point in time is defined by this timestamp only.
292 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
293
294
295def _git_amend_head(message, committer_timestamp):
296 """Amends commit with new message and desired committer_timestamp.
297
298 Sets committer timezone to UTC.
299 """
300 env = os.environ.copy()
301 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
302 return RunGit(['commit', '--amend', '-m', message], env=env)
303
304
machenbach@chromium.org45453142015-09-15 08:45:22 +0000305def _get_properties_from_options(options):
306 properties = dict(x.split('=', 1) for x in options.properties)
307 for key, val in properties.iteritems():
308 try:
309 properties[key] = json.loads(val)
310 except ValueError:
311 pass # If a value couldn't be evaluated, treat it as a string.
312 return properties
313
314
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000315def _prefix_master(master):
316 """Convert user-specified master name to full master name.
317
318 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
319 name, while the developers always use shortened master name
320 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
321 function does the conversion for buildbucket migration.
322 """
borenet6c0efe62016-10-19 08:13:29 -0700323 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000324 return master
borenet6c0efe62016-10-19 08:13:29 -0700325 return '%s%s' % (MASTER_PREFIX, master)
326
327
328def _unprefix_master(bucket):
329 """Convert bucket name to shortened master name.
330
331 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
332 name, while the developers always use shortened master name
333 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
334 function does the conversion for buildbucket migration.
335 """
336 if bucket.startswith(MASTER_PREFIX):
337 return bucket[len(MASTER_PREFIX):]
338 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000339
340
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000341def _buildbucket_retry(operation_name, http, *args, **kwargs):
342 """Retries requests to buildbucket service and returns parsed json content."""
343 try_count = 0
344 while True:
345 response, content = http.request(*args, **kwargs)
346 try:
347 content_json = json.loads(content)
348 except ValueError:
349 content_json = None
350
351 # Buildbucket could return an error even if status==200.
352 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000353 error = content_json.get('error')
354 if error.get('code') == 403:
355 raise BuildbucketResponseException(
356 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000357 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000358 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000359 raise BuildbucketResponseException(msg)
360
361 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700362 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000363 raise BuildbucketResponseException(
364 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700365 'Please file bugs at http://crbug.com, '
366 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000367 content)
368 return content_json
369 if response.status < 500 or try_count >= 2:
370 raise httplib2.HttpLib2Error(content)
371
372 # status >= 500 means transient failures.
373 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700374 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000375 try_count += 1
376 assert False, 'unreachable'
377
378
qyearsley1fdfcb62016-10-24 13:22:03 -0700379def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700380 """Returns a dict mapping bucket names to builders and tests,
381 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700382 """
qyearsleydd49f942016-10-28 11:57:22 -0700383 # If no bots are listed, we try to get a set of builders and tests based
384 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700385 if not options.bot:
386 change = changelist.GetChange(
387 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700388 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700389 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700390 change=change,
391 changed_files=change.LocalPaths(),
392 repository_root=settings.GetRoot(),
393 default_presubmit=None,
394 project=None,
395 verbose=options.verbose,
396 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700397 if masters is None:
398 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100399 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700400
qyearsley1fdfcb62016-10-24 13:22:03 -0700401 if options.bucket:
402 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700403 if options.master:
404 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700405
qyearsleydd49f942016-10-28 11:57:22 -0700406 # If bots are listed but no master or bucket, then we need to find out
407 # the corresponding master for each bot.
408 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
409 if error_message:
410 option_parser.error(
411 'Tryserver master cannot be found because: %s\n'
412 'Please manually specify the tryserver master, e.g. '
413 '"-m tryserver.chromium.linux".' % error_message)
414 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700415
416
qyearsley123a4682016-10-26 09:12:17 -0700417def _get_bucket_map_for_builders(builders):
418 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 map_url = 'https://builders-map.appspot.com/'
420 try:
qyearsley123a4682016-10-26 09:12:17 -0700421 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700422 except urllib2.URLError as e:
423 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
424 (map_url, e))
425 except ValueError as e:
426 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700427 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700428 return None, 'Failed to build master map.'
429
qyearsley123a4682016-10-26 09:12:17 -0700430 bucket_map = {}
431 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800432 bucket = builders_map.get(builder, {}).get('bucket')
433 if bucket:
434 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700435 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700436
437
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800438def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700439 """Sends a request to Buildbucket to trigger try jobs for a changelist.
440
441 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700442 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700443 changelist: Changelist that the try jobs are associated with.
444 buckets: A nested dict mapping bucket names to builders to tests.
445 options: Command-line options.
446 """
tandriide281ae2016-10-12 06:02:30 -0700447 assert changelist.GetIssue(), 'CL must be uploaded first'
448 codereview_url = changelist.GetCodereviewServer()
449 assert codereview_url, 'CL must be uploaded first'
450 patchset = patchset or changelist.GetMostRecentPatchset()
451 assert patchset, 'CL must be uploaded first'
452
453 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700454 # Cache the buildbucket credentials under the codereview host key, so that
455 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700456 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000457 http = authenticator.authorize(httplib2.Http())
458 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700459
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000460 buildbucket_put_url = (
461 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000462 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000463 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700464 hostname=codereview_host,
465 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000466 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700467
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700468 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800469 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700470 if options.clobber:
471 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700472 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700473 if extra_properties:
474 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000475
476 batch_req_body = {'builds': []}
477 print_text = []
478 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700479 for bucket, builders_and_tests in sorted(buckets.iteritems()):
480 print_text.append('Bucket: %s' % bucket)
481 master = None
482 if bucket.startswith(MASTER_PREFIX):
483 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000484 for builder, tests in sorted(builders_and_tests.iteritems()):
485 print_text.append(' %s: %s' % (builder, tests))
486 parameters = {
487 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000488 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100489 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000490 'revision': options.revision,
491 }],
tandrii8c5a3532016-11-04 07:52:02 -0700492 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000494 if 'presubmit' in builder.lower():
495 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000496 if tests:
497 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700498
499 tags = [
500 'builder:%s' % builder,
501 'buildset:%s' % buildset,
502 'user_agent:git_cl_try',
503 ]
504 if master:
505 parameters['properties']['master'] = master
506 tags.append('master:%s' % master)
507
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000508 batch_req_body['builds'].append(
509 {
510 'bucket': bucket,
511 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000512 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700513 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000514 }
515 )
516
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000517 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700518 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000519 http,
520 buildbucket_put_url,
521 'PUT',
522 body=json.dumps(batch_req_body),
523 headers={'Content-Type': 'application/json'}
524 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000525 print_text.append('To see results here, run: git cl try-results')
526 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700527 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000528
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000529
tandrii221ab252016-10-06 08:12:04 -0700530def fetch_try_jobs(auth_config, changelist, buildbucket_host,
531 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700532 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533
qyearsley53f48a12016-09-01 10:45:13 -0700534 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535 """
tandrii221ab252016-10-06 08:12:04 -0700536 assert buildbucket_host
537 assert changelist.GetIssue(), 'CL must be uploaded first'
538 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
539 patchset = patchset or changelist.GetMostRecentPatchset()
540 assert patchset, 'CL must be uploaded first'
541
542 codereview_url = changelist.GetCodereviewServer()
543 codereview_host = urlparse.urlparse(codereview_url).hostname
544 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000545 if authenticator.has_cached_credentials():
546 http = authenticator.authorize(httplib2.Http())
547 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700548 print('Warning: Some results might be missing because %s' %
549 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700550 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 http = httplib2.Http()
552
553 http.force_exception_to_status_code = True
554
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000555 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700556 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000557 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700558 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000559 params = {'tag': 'buildset:%s' % buildset}
560
561 builds = {}
562 while True:
563 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700564 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700566 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 for build in content.get('builds', []):
568 builds[build['id']] = build
569 if 'next_cursor' in content:
570 params['start_cursor'] = content['next_cursor']
571 else:
572 break
573 return builds
574
575
qyearsleyeab3c042016-08-24 09:18:28 -0700576def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 """Prints nicely result of fetch_try_jobs."""
578 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700579 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580 return
581
582 # Make a copy, because we'll be modifying builds dictionary.
583 builds = builds.copy()
584 builder_names_cache = {}
585
586 def get_builder(b):
587 try:
588 return builder_names_cache[b['id']]
589 except KeyError:
590 try:
591 parameters = json.loads(b['parameters_json'])
592 name = parameters['builder_name']
593 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700594 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700595 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000596 name = None
597 builder_names_cache[b['id']] = name
598 return name
599
600 def get_bucket(b):
601 bucket = b['bucket']
602 if bucket.startswith('master.'):
603 return bucket[len('master.'):]
604 return bucket
605
606 if options.print_master:
607 name_fmt = '%%-%ds %%-%ds' % (
608 max(len(str(get_bucket(b))) for b in builds.itervalues()),
609 max(len(str(get_builder(b))) for b in builds.itervalues()))
610 def get_name(b):
611 return name_fmt % (get_bucket(b), get_builder(b))
612 else:
613 name_fmt = '%%-%ds' % (
614 max(len(str(get_builder(b))) for b in builds.itervalues()))
615 def get_name(b):
616 return name_fmt % get_builder(b)
617
618 def sort_key(b):
619 return b['status'], b.get('result'), get_name(b), b.get('url')
620
621 def pop(title, f, color=None, **kwargs):
622 """Pop matching builds from `builds` dict and print them."""
623
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000624 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000625 colorize = str
626 else:
627 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
628
629 result = []
630 for b in builds.values():
631 if all(b.get(k) == v for k, v in kwargs.iteritems()):
632 builds.pop(b['id'])
633 result.append(b)
634 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700635 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000636 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700637 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000638
639 total = len(builds)
640 pop(status='COMPLETED', result='SUCCESS',
641 title='Successes:', color=Fore.GREEN,
642 f=lambda b: (get_name(b), b.get('url')))
643 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
644 title='Infra Failures:', color=Fore.MAGENTA,
645 f=lambda b: (get_name(b), b.get('url')))
646 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
647 title='Failures:', color=Fore.RED,
648 f=lambda b: (get_name(b), b.get('url')))
649 pop(status='COMPLETED', result='CANCELED',
650 title='Canceled:', color=Fore.MAGENTA,
651 f=lambda b: (get_name(b),))
652 pop(status='COMPLETED', result='FAILURE',
653 failure_reason='INVALID_BUILD_DEFINITION',
654 title='Wrong master/builder name:', color=Fore.MAGENTA,
655 f=lambda b: (get_name(b),))
656 pop(status='COMPLETED', result='FAILURE',
657 title='Other failures:',
658 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
659 pop(status='COMPLETED',
660 title='Other finished:',
661 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
662 pop(status='STARTED',
663 title='Started:', color=Fore.YELLOW,
664 f=lambda b: (get_name(b), b.get('url')))
665 pop(status='SCHEDULED',
666 title='Scheduled:',
667 f=lambda b: (get_name(b), 'id=%s' % b['id']))
668 # The last section is just in case buildbucket API changes OR there is a bug.
669 pop(title='Other:',
670 f=lambda b: (get_name(b), 'id=%s' % b['id']))
671 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700672 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674
Aiden Bennerc08566e2018-10-03 17:52:42 +0000675def _ComputeDiffLineRanges(files, upstream_commit):
676 """Gets the changed line ranges for each file since upstream_commit.
677
678 Parses a git diff on provided files and returns a dict that maps a file name
679 to an ordered list of range tuples in the form (start_line, count).
680 Ranges are in the same format as a git diff.
681 """
682 # If files is empty then diff_output will be a full diff.
683 if len(files) == 0:
684 return {}
685
686 # Take diff and find the line ranges where there are changes.
687 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
688 diff_output = RunGit(diff_cmd)
689
690 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
691 # 2 capture groups
692 # 0 == fname of diff file
693 # 1 == 'diff_start,diff_count' or 'diff_start'
694 # will match each of
695 # diff --git a/foo.foo b/foo.py
696 # @@ -12,2 +14,3 @@
697 # @@ -12,2 +17 @@
698 # running re.findall on the above string with pattern will give
699 # [('foo.py', ''), ('', '14,3'), ('', '17')]
700
701 curr_file = None
702 line_diffs = {}
703 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
704 if match[0] != '':
705 # Will match the second filename in diff --git a/a.py b/b.py.
706 curr_file = match[0]
707 line_diffs[curr_file] = []
708 else:
709 # Matches +14,3
710 if ',' in match[1]:
711 diff_start, diff_count = match[1].split(',')
712 else:
713 # Single line changes are of the form +12 instead of +12,1.
714 diff_start = match[1]
715 diff_count = 1
716
717 diff_start = int(diff_start)
718 diff_count = int(diff_count)
719
720 # If diff_count == 0 this is a removal we can ignore.
721 line_diffs[curr_file].append((diff_start, diff_count))
722
723 return line_diffs
724
725
726def _FindYapfConfigFile(fpath,
727 yapf_config_cache,
728 top_dir=None,
729 default_style=None):
730 """Checks if a yapf file is in any parent directory of fpath until top_dir.
731
732 Recursively checks parent directories to find yapf file
733 and if no yapf file is found returns default_style.
734 Uses yapf_config_cache as a cache for previously found files.
735 """
736 # Return result if we've already computed it.
737 if fpath in yapf_config_cache:
738 return yapf_config_cache[fpath]
739
740 # Check if there is a style file in the current directory.
741 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
742 dirname = os.path.dirname(fpath)
743 if os.path.isfile(yapf_file):
744 ret = yapf_file
745 elif fpath == top_dir or dirname == fpath:
746 # If we're at the top level directory, or if we're at root
747 # use the chromium default yapf style.
748 ret = default_style
749 else:
750 # Otherwise recurse on the current directory.
751 ret = _FindYapfConfigFile(dirname, yapf_config_cache, top_dir,
752 default_style)
753 yapf_config_cache[fpath] = ret
754 return ret
755
756
qyearsley53f48a12016-09-01 10:45:13 -0700757def write_try_results_json(output_file, builds):
758 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
759
760 The input |builds| dict is assumed to be generated by Buildbucket.
761 Buildbucket documentation: http://goo.gl/G0s101
762 """
763
764 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800765 """Extracts some of the information from one build dict."""
766 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700767 return {
768 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700769 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800770 'builder_name': parameters.get('builder_name'),
771 'created_ts': build.get('created_ts'),
772 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700773 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800774 'result': build.get('result'),
775 'status': build.get('status'),
776 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700777 'url': build.get('url'),
778 }
779
780 converted = []
781 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000782 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700783 write_json(output_file, converted)
784
785
Aaron Gable13101a62018-02-09 13:20:41 -0800786def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000787 """Prints statistics about the change to the user."""
788 # --no-ext-diff is broken in some versions of Git, so try to work around
789 # this by overriding the environment (but there is still a problem if the
790 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000791 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000792 if 'GIT_EXTERNAL_DIFF' in env:
793 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000794
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000795 try:
796 stdout = sys.stdout.fileno()
797 except AttributeError:
798 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000799 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800800 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000801 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000802
803
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000804class BuildbucketResponseException(Exception):
805 pass
806
807
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808class Settings(object):
809 def __init__(self):
810 self.default_server = None
811 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000812 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000813 self.tree_status_url = None
814 self.viewvc_url = None
815 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000816 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000817 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000818 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000819 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000820 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000821 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822
823 def LazyUpdateIfNeeded(self):
824 """Updates the settings from a codereview.settings file, if available."""
825 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000826 # The only value that actually changes the behavior is
827 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000828 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000829 error_ok=True
830 ).strip().lower()
831
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000832 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000833 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 LoadCodereviewSettingsFromFile(cr_settings_file)
835 self.updated = True
836
837 def GetDefaultServerUrl(self, error_ok=False):
838 if not self.default_server:
839 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000840 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000841 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000842 if error_ok:
843 return self.default_server
844 if not self.default_server:
845 error_message = ('Could not find settings file. You must configure '
846 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000847 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000848 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000849 return self.default_server
850
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000851 @staticmethod
852 def GetRelativeRoot():
853 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000854
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000855 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000856 if self.root is None:
857 self.root = os.path.abspath(self.GetRelativeRoot())
858 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000859
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000860 def GetGitMirror(self, remote='origin'):
861 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000862 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000863 if not os.path.isdir(local_url):
864 return None
865 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
866 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100867 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100868 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000869 if mirror.exists():
870 return mirror
871 return None
872
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000873 def GetTreeStatusUrl(self, error_ok=False):
874 if not self.tree_status_url:
875 error_message = ('You must configure your tree status URL by running '
876 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000877 self.tree_status_url = self._GetRietveldConfig(
878 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000879 return self.tree_status_url
880
881 def GetViewVCUrl(self):
882 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000883 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000884 return self.viewvc_url
885
rmistry@google.com90752582014-01-14 21:04:50 +0000886 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000887 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000888
rmistry@google.com78948ed2015-07-08 23:09:57 +0000889 def GetIsSkipDependencyUpload(self, branch_name):
890 """Returns true if specified branch should skip dep uploads."""
891 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
892 error_ok=True)
893
rmistry@google.com5626a922015-02-26 14:03:30 +0000894 def GetRunPostUploadHook(self):
895 run_post_upload_hook = self._GetRietveldConfig(
896 'run-post-upload-hook', error_ok=True)
897 return run_post_upload_hook == "True"
898
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000899 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000900 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000901
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000902 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000903 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000904
ukai@chromium.orge8077812012-02-03 03:41:46 +0000905 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700906 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000907 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700908 self.is_gerrit = (
909 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000910 return self.is_gerrit
911
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000912 def GetSquashGerritUploads(self):
913 """Return true if uploads to Gerrit should be squashed by default."""
914 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700915 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
916 if self.squash_gerrit_uploads is None:
917 # Default is squash now (http://crbug.com/611892#c23).
918 self.squash_gerrit_uploads = not (
919 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
920 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000921 return self.squash_gerrit_uploads
922
tandriia60502f2016-06-20 02:01:53 -0700923 def GetSquashGerritUploadsOverride(self):
924 """Return True or False if codereview.settings should be overridden.
925
926 Returns None if no override has been defined.
927 """
928 # See also http://crbug.com/611892#c23
929 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
930 error_ok=True).strip()
931 if result == 'true':
932 return True
933 if result == 'false':
934 return False
935 return None
936
tandrii@chromium.org28253532016-04-14 13:46:56 +0000937 def GetGerritSkipEnsureAuthenticated(self):
938 """Return True if EnsureAuthenticated should not be done for Gerrit
939 uploads."""
940 if self.gerrit_skip_ensure_authenticated is None:
941 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000942 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000943 error_ok=True).strip() == 'true')
944 return self.gerrit_skip_ensure_authenticated
945
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000946 def GetGitEditor(self):
947 """Return the editor specified in the git config, or None if none is."""
948 if self.git_editor is None:
949 self.git_editor = self._GetConfig('core.editor', error_ok=True)
950 return self.git_editor or None
951
thestig@chromium.org44202a22014-03-11 19:22:18 +0000952 def GetLintRegex(self):
953 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
954 DEFAULT_LINT_REGEX)
955
956 def GetLintIgnoreRegex(self):
957 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
958 DEFAULT_LINT_IGNORE_REGEX)
959
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000960 def GetProject(self):
961 if not self.project:
962 self.project = self._GetRietveldConfig('project', error_ok=True)
963 return self.project
964
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000965 def _GetRietveldConfig(self, param, **kwargs):
966 return self._GetConfig('rietveld.' + param, **kwargs)
967
rmistry@google.com78948ed2015-07-08 23:09:57 +0000968 def _GetBranchConfig(self, branch_name, param, **kwargs):
969 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
970
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000971 def _GetConfig(self, param, **kwargs):
972 self.LazyUpdateIfNeeded()
973 return RunGit(['config', param], **kwargs).strip()
974
975
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100976@contextlib.contextmanager
977def _get_gerrit_project_config_file(remote_url):
978 """Context manager to fetch and store Gerrit's project.config from
979 refs/meta/config branch and store it in temp file.
980
981 Provides a temporary filename or None if there was error.
982 """
983 error, _ = RunGitWithCode([
984 'fetch', remote_url,
985 '+refs/meta/config:refs/git_cl/meta/config'])
986 if error:
987 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700988 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100989 (remote_url, error))
990 yield None
991 return
992
993 error, project_config_data = RunGitWithCode(
994 ['show', 'refs/git_cl/meta/config:project.config'])
995 if error:
996 print('WARNING: project.config file not found')
997 yield None
998 return
999
1000 with gclient_utils.temporary_directory() as tempdir:
1001 project_config_file = os.path.join(tempdir, 'project.config')
1002 gclient_utils.FileWrite(project_config_file, project_config_data)
1003 yield project_config_file
1004
1005
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001006def ShortBranchName(branch):
1007 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001008 return branch.replace('refs/heads/', '', 1)
1009
1010
1011def GetCurrentBranchRef():
1012 """Returns branch ref (e.g., refs/heads/master) or None."""
1013 return RunGit(['symbolic-ref', 'HEAD'],
1014 stderr=subprocess2.VOID, error_ok=True).strip() or None
1015
1016
1017def GetCurrentBranch():
1018 """Returns current branch or None.
1019
1020 For refs/heads/* branches, returns just last part. For others, full ref.
1021 """
1022 branchref = GetCurrentBranchRef()
1023 if branchref:
1024 return ShortBranchName(branchref)
1025 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001026
1027
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001028class _CQState(object):
1029 """Enum for states of CL with respect to Commit Queue."""
1030 NONE = 'none'
1031 DRY_RUN = 'dry_run'
1032 COMMIT = 'commit'
1033
1034 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1035
1036
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001037class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001038 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001039 self.issue = issue
1040 self.patchset = patchset
1041 self.hostname = hostname
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001042 assert codereview in (None, 'gerrit', 'rietveld')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001043 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001044
1045 @property
1046 def valid(self):
1047 return self.issue is not None
1048
1049
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001050def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001051 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1052 fail_result = _ParsedIssueNumberArgument()
1053
1054 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001055 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001056 if not arg.startswith('http'):
1057 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001058
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001059 url = gclient_utils.UpgradeToHttps(arg)
1060 try:
1061 parsed_url = urlparse.urlparse(url)
1062 except ValueError:
1063 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001064
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001065 if codereview is not None:
1066 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1067 return parsed or fail_result
1068
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001069 results = {}
1070 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1071 parsed = cls.ParseIssueURL(parsed_url)
1072 if parsed is not None:
1073 results[name] = parsed
1074
1075 if not results:
1076 return fail_result
1077 if len(results) == 1:
1078 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001079
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001080 return results['gerrit']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001081
1082
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00001083def _create_description_from_log(args):
1084 """Pulls out the commit log to use as a base for the CL description."""
1085 log_args = []
1086 if len(args) == 1 and not args[0].endswith('.'):
1087 log_args = [args[0] + '..']
1088 elif len(args) == 1 and args[0].endswith('...'):
1089 log_args = [args[0][:-1]]
1090 elif len(args) == 2:
1091 log_args = [args[0] + '..' + args[1]]
1092 else:
1093 log_args = args[:] # Hope for the best!
1094 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
1095
1096
Aaron Gablea45ee112016-11-22 15:14:38 -08001097class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001098 def __init__(self, issue, url):
1099 self.issue = issue
1100 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001101 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001102
1103 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001104 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001105 self.issue, self.url)
1106
1107
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001108_CommentSummary = collections.namedtuple(
1109 '_CommentSummary', ['date', 'message', 'sender',
1110 # TODO(tandrii): these two aren't known in Gerrit.
1111 'approval', 'disapproval'])
1112
1113
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001114class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001115 """Changelist works with one changelist in local branch.
1116
1117 Supports two codereview backends: Rietveld or Gerrit, selected at object
1118 creation.
1119
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001120 Notes:
1121 * Not safe for concurrent multi-{thread,process} use.
1122 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001123 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001124 """
1125
1126 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1127 """Create a new ChangeList instance.
1128
1129 If issue is given, the codereview must be given too.
1130
1131 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1132 Otherwise, it's decided based on current configuration of the local branch,
1133 with default being 'rietveld' for backwards compatibility.
1134 See _load_codereview_impl for more details.
1135
1136 **kwargs will be passed directly to codereview implementation.
1137 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001139 global settings
1140 if not settings:
1141 # Happens when git_cl.py is used as a utility library.
1142 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001143
1144 if issue:
1145 assert codereview, 'codereview must be known, if issue is known'
1146
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.branchref = branchref
1148 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001149 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.branch = ShortBranchName(self.branchref)
1151 else:
1152 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001154 self.lookedup_issue = False
1155 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 self.has_description = False
1157 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001158 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001159 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001160 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001161 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001162 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001163 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001164
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001165 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001166 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001167 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001168 assert self._codereview_impl
1169 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001170
1171 def _load_codereview_impl(self, codereview=None, **kwargs):
1172 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001173 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1174 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1175 self._codereview = codereview
1176 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001177 return
1178
1179 # Automatic selection based on issue number set for a current branch.
1180 # Rietveld takes precedence over Gerrit.
1181 assert not self.issue
1182 # Whether we find issue or not, we are doing the lookup.
1183 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001184 if self.GetBranch():
1185 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1186 issue = _git_get_branch_config_value(
1187 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1188 if issue:
1189 self._codereview = codereview
1190 self._codereview_impl = cls(self, **kwargs)
1191 self.issue = int(issue)
1192 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001193
1194 # No issue is set for this branch, so decide based on repo-wide settings.
1195 return self._load_codereview_impl(
1196 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1197 **kwargs)
1198
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001199 def IsGerrit(self):
1200 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001201
1202 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001203 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001204
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001205 The return value is a string suitable for passing to git cl with the --cc
1206 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001207 """
1208 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001209 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001210 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001211 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1212 return self.cc
1213
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001214 def GetCCListWithoutDefault(self):
1215 """Return the users cc'd on this CL excluding default ones."""
1216 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001217 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001218 return self.cc
1219
Daniel Cheng7227d212017-11-17 08:12:37 -08001220 def ExtendCC(self, more_cc):
1221 """Extends the list of users to cc on this CL based on the changed files."""
1222 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223
1224 def GetBranch(self):
1225 """Returns the short branch name, e.g. 'master'."""
1226 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001227 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001228 if not branchref:
1229 return None
1230 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231 self.branch = ShortBranchName(self.branchref)
1232 return self.branch
1233
1234 def GetBranchRef(self):
1235 """Returns the full branch name, e.g. 'refs/heads/master'."""
1236 self.GetBranch() # Poke the lazy loader.
1237 return self.branchref
1238
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001239 def ClearBranch(self):
1240 """Clears cached branch data of this object."""
1241 self.branch = self.branchref = None
1242
tandrii5d48c322016-08-18 16:19:37 -07001243 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1244 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1245 kwargs['branch'] = self.GetBranch()
1246 return _git_get_branch_config_value(key, default, **kwargs)
1247
1248 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1249 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1250 assert self.GetBranch(), (
1251 'this CL must have an associated branch to %sset %s%s' %
1252 ('un' if value is None else '',
1253 key,
1254 '' if value is None else ' to %r' % value))
1255 kwargs['branch'] = self.GetBranch()
1256 return _git_set_branch_config_value(key, value, **kwargs)
1257
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001258 @staticmethod
1259 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001260 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 e.g. 'origin', 'refs/heads/master'
1262 """
1263 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001264 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1265
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001267 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001269 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1270 error_ok=True).strip()
1271 if upstream_branch:
1272 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001273 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001274 # Else, try to guess the origin remote.
1275 remote_branches = RunGit(['branch', '-r']).split()
1276 if 'origin/master' in remote_branches:
1277 # Fall back on origin/master if it exits.
1278 remote = 'origin'
1279 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001281 DieWithError(
1282 'Unable to determine default branch to diff against.\n'
1283 'Either pass complete "git diff"-style arguments, like\n'
1284 ' git cl upload origin/master\n'
1285 'or verify this branch is set up to track another \n'
1286 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001287
1288 return remote, upstream_branch
1289
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001290 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001291 upstream_branch = self.GetUpstreamBranch()
1292 if not BranchExists(upstream_branch):
1293 DieWithError('The upstream for the current branch (%s) does not exist '
1294 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001295 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001296 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001297
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 def GetUpstreamBranch(self):
1299 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001300 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001302 upstream_branch = upstream_branch.replace('refs/heads/',
1303 'refs/remotes/%s/' % remote)
1304 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1305 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001306 self.upstream_branch = upstream_branch
1307 return self.upstream_branch
1308
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001310 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001311 remote, branch = None, self.GetBranch()
1312 seen_branches = set()
1313 while branch not in seen_branches:
1314 seen_branches.add(branch)
1315 remote, branch = self.FetchUpstreamTuple(branch)
1316 branch = ShortBranchName(branch)
1317 if remote != '.' or branch.startswith('refs/remotes'):
1318 break
1319 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001320 remotes = RunGit(['remote'], error_ok=True).split()
1321 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001323 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001324 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001325 logging.warn('Could not determine which remote this change is '
1326 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001327 else:
1328 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001329 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 branch = 'HEAD'
1331 if branch.startswith('refs/remotes'):
1332 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001333 elif branch.startswith('refs/branch-heads/'):
1334 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001335 else:
1336 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001337 return self._remote
1338
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001339 def GitSanityChecks(self, upstream_git_obj):
1340 """Checks git repo status and ensures diff is from local commits."""
1341
sbc@chromium.org79706062015-01-14 21:18:12 +00001342 if upstream_git_obj is None:
1343 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001344 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001345 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001346 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001347 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001348 return False
1349
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001350 # Verify the commit we're diffing against is in our current branch.
1351 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1352 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1353 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001354 print('ERROR: %s is not in the current branch. You may need to rebase '
1355 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001356 return False
1357
1358 # List the commits inside the diff, and verify they are all local.
1359 commits_in_diff = RunGit(
1360 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1361 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1362 remote_branch = remote_branch.strip()
1363 if code != 0:
1364 _, remote_branch = self.GetRemoteBranch()
1365
1366 commits_in_remote = RunGit(
1367 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1368
1369 common_commits = set(commits_in_diff) & set(commits_in_remote)
1370 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001371 print('ERROR: Your diff contains %d commits already in %s.\n'
1372 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1373 'the diff. If you are using a custom git flow, you can override'
1374 ' the reference used for this check with "git config '
1375 'gitcl.remotebranch <git-ref>".' % (
1376 len(common_commits), remote_branch, upstream_git_obj),
1377 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001378 return False
1379 return True
1380
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001381 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001382 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001383
1384 Returns None if it is not set.
1385 """
tandrii5d48c322016-08-18 16:19:37 -07001386 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001387
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001388 def GetRemoteUrl(self):
1389 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1390
1391 Returns None if there is no remote.
1392 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001393 is_cached, value = self._cached_remote_url
1394 if is_cached:
1395 return value
1396
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001397 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001398 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1399
1400 # If URL is pointing to a local directory, it is probably a git cache.
1401 if os.path.isdir(url):
1402 url = RunGit(['config', 'remote.%s.url' % remote],
1403 error_ok=True,
1404 cwd=url).strip()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001405 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001406 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001408 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001409 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001410 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001411 self.issue = self._GitGetBranchConfigValue(
1412 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001413 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414 return self.issue
1415
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 def GetIssueURL(self):
1417 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001418 issue = self.GetIssue()
1419 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001420 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001421 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001423 def GetDescription(self, pretty=False, force=False):
1424 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001425 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001426 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427 self.has_description = True
1428 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001429 # Set width to 72 columns + 2 space indent.
1430 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001431 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001432 lines = self.description.splitlines()
1433 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001434 return self.description
1435
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001436 def GetDescriptionFooters(self):
1437 """Returns (non_footer_lines, footers) for the commit message.
1438
1439 Returns:
1440 non_footer_lines (list(str)) - Simple list of description lines without
1441 any footer. The lines do not contain newlines, nor does the list contain
1442 the empty line between the message and the footers.
1443 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1444 [("Change-Id", "Ideadbeef...."), ...]
1445 """
1446 raw_description = self.GetDescription()
1447 msg_lines, _, footers = git_footers.split_footers(raw_description)
1448 if footers:
1449 msg_lines = msg_lines[:len(msg_lines)-1]
1450 return msg_lines, footers
1451
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001452 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001453 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001454 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001455 self.patchset = self._GitGetBranchConfigValue(
1456 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001457 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001458 return self.patchset
1459
1460 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001461 """Set this branch's patchset. If patchset=0, clears the patchset."""
1462 assert self.GetBranch()
1463 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001464 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001465 else:
1466 self.patchset = int(patchset)
1467 self._GitSetBranchConfigValue(
1468 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001469
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001470 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001471 """Set this branch's issue. If issue isn't given, clears the issue."""
1472 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001473 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001474 issue = int(issue)
1475 self._GitSetBranchConfigValue(
1476 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001477 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001478 codereview_server = self._codereview_impl.GetCodereviewServer()
1479 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001480 self._GitSetBranchConfigValue(
1481 self._codereview_impl.CodereviewServerConfigKey(),
1482 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001483 else:
tandrii5d48c322016-08-18 16:19:37 -07001484 # Reset all of these just to be clean.
1485 reset_suffixes = [
1486 'last-upload-hash',
1487 self._codereview_impl.IssueConfigKey(),
1488 self._codereview_impl.PatchsetConfigKey(),
1489 self._codereview_impl.CodereviewServerConfigKey(),
1490 ] + self._PostUnsetIssueProperties()
1491 for prop in reset_suffixes:
1492 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001493 msg = RunGit(['log', '-1', '--format=%B']).strip()
1494 if msg and git_footers.get_footer_change_id(msg):
1495 print('WARNING: The change patched into this branch has a Change-Id. '
1496 'Removing it.')
1497 RunGit(['commit', '--amend', '-m',
1498 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001499 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001500 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001501
dnjba1b0f32016-09-02 12:37:42 -07001502 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001503 if not self.GitSanityChecks(upstream_branch):
1504 DieWithError('\nGit sanity check failure')
1505
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001506 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001507 if not root:
1508 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001509 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001510
1511 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001512 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001513 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001514 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001515 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001516 except subprocess2.CalledProcessError:
1517 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001518 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001519 'This branch probably doesn\'t exist anymore. To reset the\n'
1520 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001521 ' git branch --set-upstream-to origin/master %s\n'
1522 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001523 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001524
maruel@chromium.org52424302012-08-29 15:14:30 +00001525 issue = self.GetIssue()
1526 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001527 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001528 description = self.GetDescription()
1529 else:
1530 # If the change was never uploaded, use the log messages of all commits
1531 # up to the branch point, as git cl upload will prefill the description
1532 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001533 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1534 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001535
1536 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001537 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001538 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001539 name,
1540 description,
1541 absroot,
1542 files,
1543 issue,
1544 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001545 author,
1546 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001547
dsansomee2d6fd92016-09-08 00:10:47 -07001548 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001549 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001550 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001551 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001552
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001553 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1554 """Sets the description for this CL remotely.
1555
1556 You can get description_lines and footers with GetDescriptionFooters.
1557
1558 Args:
1559 description_lines (list(str)) - List of CL description lines without
1560 newline characters.
1561 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1562 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1563 `List-Of-Tokens`). It will be case-normalized so that each token is
1564 title-cased.
1565 """
1566 new_description = '\n'.join(description_lines)
1567 if footers:
1568 new_description += '\n'
1569 for k, v in footers:
1570 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1571 if not git_footers.FOOTER_PATTERN.match(foot):
1572 raise ValueError('Invalid footer %r' % foot)
1573 new_description += foot + '\n'
1574 self.UpdateDescription(new_description, force)
1575
Edward Lesmes8e282792018-04-03 18:50:29 -04001576 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001577 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1578 try:
1579 return presubmit_support.DoPresubmitChecks(change, committing,
1580 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1581 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001582 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1583 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001584 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001585 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001586
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001587 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1588 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001589 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1590 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001591 else:
1592 # Assume url.
1593 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1594 urlparse.urlparse(issue_arg))
1595 if not parsed_issue_arg or not parsed_issue_arg.valid:
1596 DieWithError('Failed to parse issue argument "%s". '
1597 'Must be an issue number or a valid URL.' % issue_arg)
1598 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001599 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001600
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 def CMDUpload(self, options, git_diff_args, orig_args):
1602 """Uploads a change to codereview."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001603 assert self.IsGerrit()
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001604 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001605 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001606 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001607 else:
1608 if self.GetBranch() is None:
1609 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1610
1611 # Default to diffing against common ancestor of upstream branch
1612 base_branch = self.GetCommonAncestorWithUpstream()
1613 git_diff_args = [base_branch, 'HEAD']
1614
Aaron Gablec4c40d12017-05-22 11:49:53 -07001615
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001616 # Fast best-effort checks to abort before running potentially
1617 # expensive hooks if uploading is likely to fail anyway. Passing these
1618 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001620 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001621
1622 # Apply watchlists on upload.
1623 change = self.GetChange(base_branch, None)
1624 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1625 files = [f.LocalPath() for f in change.AffectedFiles()]
1626 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001627 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001628
1629 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001630 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001631 # Set the reviewer list now so that presubmit checks can access it.
1632 change_description = ChangeDescription(change.FullDescriptionText())
1633 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001634 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001635 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001636 change)
1637 change.SetDescriptionText(change_description.description)
1638 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001639 may_prompt=not options.force,
1640 verbose=options.verbose,
1641 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001642 if not hook_results.should_continue():
1643 return 1
1644 if not options.reviewers and hook_results.reviewers:
1645 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001646 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001647
Aaron Gable13101a62018-02-09 13:20:41 -08001648 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001649 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001650 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001651 _git_set_branch_config_value('last-upload-hash',
1652 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001653 # Run post upload hooks, if specified.
1654 if settings.GetRunPostUploadHook():
1655 presubmit_support.DoPostUploadExecuter(
1656 change,
1657 self,
1658 settings.GetRoot(),
1659 options.verbose,
1660 sys.stdout)
1661
1662 # Upload all dependencies if specified.
1663 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001664 print()
1665 print('--dependencies has been specified.')
1666 print('All dependent local branches will be re-uploaded.')
1667 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001668 # Remove the dependencies flag from args so that we do not end up in a
1669 # loop.
1670 orig_args.remove('--dependencies')
1671 ret = upload_branch_deps(self, orig_args)
1672 return ret
1673
Ravi Mistry31e7d562018-04-02 12:53:57 -04001674 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1675 """Sets labels on the change based on the provided flags.
1676
1677 Sets labels if issue is already uploaded and known, else returns without
1678 doing anything.
1679
1680 Args:
1681 enable_auto_submit: Sets Auto-Submit+1 on the change.
1682 use_commit_queue: Sets Commit-Queue+2 on the change.
1683 cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
1684 both use_commit_queue and cq_dry_run are true.
1685 """
1686 if not self.GetIssue():
1687 return
1688 try:
1689 self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
1690 cq_dry_run)
1691 return 0
1692 except KeyboardInterrupt:
1693 raise
1694 except:
1695 labels = []
1696 if enable_auto_submit:
1697 labels.append('Auto-Submit')
1698 if use_commit_queue or cq_dry_run:
1699 labels.append('Commit-Queue')
1700 print('WARNING: Failed to set label(s) on your change: %s\n'
1701 'Either:\n'
1702 ' * Your project does not have the above label(s),\n'
1703 ' * You don\'t have permission to set the above label(s),\n'
1704 ' * There\'s a bug in this code (see stack trace below).\n' %
1705 (', '.join(labels)))
1706 # Still raise exception so that stack trace is printed.
1707 raise
1708
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001709 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001710 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001711
1712 Issue must have been already uploaded and known.
1713 """
1714 assert new_state in _CQState.ALL_STATES
1715 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001716 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001717 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001718 return 0
1719 except KeyboardInterrupt:
1720 raise
1721 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001722 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001723 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001724 ' * Your project has no CQ,\n'
1725 ' * You don\'t have permission to change the CQ state,\n'
1726 ' * There\'s a bug in this code (see stack trace below).\n'
1727 'Consider specifying which bots to trigger manually or asking your '
1728 'project owners for permissions or contacting Chrome Infra at:\n'
1729 'https://www.chromium.org/infra\n\n' %
1730 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001731 # Still raise exception so that stack trace is printed.
1732 raise
1733
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001734 # Forward methods to codereview specific implementation.
1735
Aaron Gable636b13f2017-07-14 10:42:48 -07001736 def AddComment(self, message, publish=None):
1737 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001738
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001739 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001740 """Returns list of _CommentSummary for each comment.
1741
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001742 args:
1743 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001744 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001745 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001746
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001747 def CloseIssue(self):
1748 return self._codereview_impl.CloseIssue()
1749
1750 def GetStatus(self):
1751 return self._codereview_impl.GetStatus()
1752
1753 def GetCodereviewServer(self):
1754 return self._codereview_impl.GetCodereviewServer()
1755
tandriide281ae2016-10-12 06:02:30 -07001756 def GetIssueOwner(self):
1757 """Get owner from codereview, which may differ from this checkout."""
1758 return self._codereview_impl.GetIssueOwner()
1759
Edward Lemur707d70b2018-02-07 00:50:14 +01001760 def GetReviewers(self):
1761 return self._codereview_impl.GetReviewers()
1762
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001763 def GetMostRecentPatchset(self):
1764 return self._codereview_impl.GetMostRecentPatchset()
1765
tandriide281ae2016-10-12 06:02:30 -07001766 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001767 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001768 return self._codereview_impl.CannotTriggerTryJobReason()
1769
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001770 def GetTryJobProperties(self, patchset=None):
1771 """Returns dictionary of properties to launch try job."""
1772 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001773
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001774 def __getattr__(self, attr):
1775 # This is because lots of untested code accesses Rietveld-specific stuff
1776 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001777 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001778 # Note that child method defines __getattr__ as well, and forwards it here,
1779 # because _RietveldChangelistImpl is not cleaned up yet, and given
1780 # deprecation of Rietveld, it should probably be just removed.
1781 # Until that time, avoid infinite recursion by bypassing __getattr__
1782 # of implementation class.
1783 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001784
1785
1786class _ChangelistCodereviewBase(object):
1787 """Abstract base class encapsulating codereview specifics of a changelist."""
1788 def __init__(self, changelist):
1789 self._changelist = changelist # instance of Changelist
1790
1791 def __getattr__(self, attr):
1792 # Forward methods to changelist.
1793 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1794 # _RietveldChangelistImpl to avoid this hack?
1795 return getattr(self._changelist, attr)
1796
1797 def GetStatus(self):
1798 """Apply a rough heuristic to give a simple summary of an issue's review
1799 or CQ status, assuming adherence to a common workflow.
1800
1801 Returns None if no issue for this branch, or specific string keywords.
1802 """
1803 raise NotImplementedError()
1804
1805 def GetCodereviewServer(self):
1806 """Returns server URL without end slash, like "https://codereview.com"."""
1807 raise NotImplementedError()
1808
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001809 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001810 """Fetches and returns description from the codereview server."""
1811 raise NotImplementedError()
1812
tandrii5d48c322016-08-18 16:19:37 -07001813 @classmethod
1814 def IssueConfigKey(cls):
1815 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 raise NotImplementedError()
1817
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001818 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001819 def PatchsetConfigKey(cls):
1820 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001821 raise NotImplementedError()
1822
tandrii5d48c322016-08-18 16:19:37 -07001823 @classmethod
1824 def CodereviewServerConfigKey(cls):
1825 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826 raise NotImplementedError()
1827
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001828 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001829 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001830 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001831
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001832 def GetGerritObjForPresubmit(self):
1833 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1834 return None
1835
dsansomee2d6fd92016-09-08 00:10:47 -07001836 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837 """Update the description on codereview site."""
1838 raise NotImplementedError()
1839
Aaron Gable636b13f2017-07-14 10:42:48 -07001840 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001841 """Posts a comment to the codereview site."""
1842 raise NotImplementedError()
1843
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001844 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001845 raise NotImplementedError()
1846
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001847 def CloseIssue(self):
1848 """Closes the issue."""
1849 raise NotImplementedError()
1850
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001851 def GetMostRecentPatchset(self):
1852 """Returns the most recent patchset number from the codereview site."""
1853 raise NotImplementedError()
1854
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001855 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001856 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001857 """Fetches and applies the issue.
1858
1859 Arguments:
1860 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1861 reject: if True, reject the failed patch instead of switching to 3-way
1862 merge. Rietveld only.
1863 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1864 only.
1865 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001866 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001867 """
1868 raise NotImplementedError()
1869
1870 @staticmethod
1871 def ParseIssueURL(parsed_url):
1872 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1873 failed."""
1874 raise NotImplementedError()
1875
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001876 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001877 """Best effort check that user is authenticated with codereview server.
1878
1879 Arguments:
1880 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001881 refresh: whether to attempt to refresh credentials. Ignored if not
1882 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001883 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001884 raise NotImplementedError()
1885
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001886 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001887 """Best effort check that uploading isn't supposed to fail for predictable
1888 reasons.
1889
1890 This method should raise informative exception if uploading shouldn't
1891 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001892
1893 Arguments:
1894 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001895 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001896 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001897
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001898 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001899 """Uploads a change to codereview."""
1900 raise NotImplementedError()
1901
Ravi Mistry31e7d562018-04-02 12:53:57 -04001902 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1903 """Sets labels on the change based on the provided flags.
1904
1905 Issue must have been already uploaded and known.
1906 """
1907 raise NotImplementedError()
1908
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001909 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001910 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001911
1912 Issue must have been already uploaded and known.
1913 """
1914 raise NotImplementedError()
1915
tandriie113dfd2016-10-11 10:20:12 -07001916 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001917 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001918 raise NotImplementedError()
1919
tandriide281ae2016-10-12 06:02:30 -07001920 def GetIssueOwner(self):
1921 raise NotImplementedError()
1922
Edward Lemur707d70b2018-02-07 00:50:14 +01001923 def GetReviewers(self):
1924 raise NotImplementedError()
1925
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001926 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001927 raise NotImplementedError()
1928
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001929
1930class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001931
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001932 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001933 super(_RietveldChangelistImpl, self).__init__(changelist)
1934 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001935 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001936 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001938 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001939 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001940 self._props = None
1941 self._rpc_server = None
1942
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 def GetCodereviewServer(self):
1944 if not self._rietveld_server:
1945 # If we're on a branch then get the server potentially associated
1946 # with that branch.
1947 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001948 self._rietveld_server = gclient_utils.UpgradeToHttps(
1949 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001950 if not self._rietveld_server:
1951 self._rietveld_server = settings.GetDefaultServerUrl()
1952 return self._rietveld_server
1953
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001954 def EnsureAuthenticated(self, force, refresh=False):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00001955 # No checks for Rietveld because we are deprecating Rietveld.
1956 pass
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001957
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001958 def EnsureCanUploadPatchset(self, force):
1959 # No checks for Rietveld because we are deprecating Rietveld.
1960 pass
1961
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001962 def FetchDescription(self, force=False):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001963 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001964
1965 def GetMostRecentPatchset(self):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001966 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001967
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 def GetIssueProperties(self):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001969 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001970
tandriie113dfd2016-10-11 10:20:12 -07001971 def CannotTriggerTryJobReason(self):
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00001972 raise NotImplementedError()
tandriie113dfd2016-10-11 10:20:12 -07001973
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001974 def GetTryJobProperties(self, patchset=None):
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00001975 raise NotImplementedError()
tandrii8c5a3532016-11-04 07:52:02 -07001976
tandriide281ae2016-10-12 06:02:30 -07001977 def GetIssueOwner(self):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00001978 raise NotImplementedError()
tandriide281ae2016-10-12 06:02:30 -07001979
Edward Lemur707d70b2018-02-07 00:50:14 +01001980 def GetReviewers(self):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00001981 raise NotImplementedError()
Edward Lemur707d70b2018-02-07 00:50:14 +01001982
Aaron Gable636b13f2017-07-14 10:42:48 -07001983 def AddComment(self, message, publish=None):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00001984 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001985
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00001986 def GetCommentsSummary(self, readable=True):
1987 raise NotImplementedError()
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001988
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001989 def GetStatus(self):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00001990 print(
1991 'WARNING! Rietveld is no longer supported.\n'
1992 '\n'
1993 'If you have old branches in your checkout, please archive/delete them.\n'
1994 ' $ git cl archive --help\n'
1995 '\n'
1996 'See also PSA https://groups.google.com/a/chromium.org/'
1997 'forum/#!topic/infra-dev/2DIVzM2wseo\n')
1998 return 'rietveld-not-supported'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001999
dsansomee2d6fd92016-09-08 00:10:47 -07002000 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00002001 raise NotImplementedError()
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002002
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002003 def CloseIssue(self):
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00002004 raise NotImplementedError()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002005
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002006 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002007 return self.SetFlags({flag: value})
2008
2009 def SetFlags(self, flags):
2010 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002011 """
phajdan.jr68598232016-08-10 03:28:28 -07002012 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002013 try:
tandrii4b233bd2016-07-06 03:50:29 -07002014 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002015 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002016 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002017 if e.code == 404:
2018 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2019 if e.code == 403:
2020 DieWithError(
2021 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002022 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002023 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002024
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002025 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002026 """Returns an upload.RpcServer() to access this review's rietveld instance.
2027 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002028 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002029 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002030 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002031 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002032 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002033
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002034 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002035 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002036 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002037
tandrii5d48c322016-08-18 16:19:37 -07002038 @classmethod
2039 def PatchsetConfigKey(cls):
2040 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002041
tandrii5d48c322016-08-18 16:19:37 -07002042 @classmethod
2043 def CodereviewServerConfigKey(cls):
2044 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002045
Ravi Mistry31e7d562018-04-02 12:53:57 -04002046 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
2047 raise NotImplementedError()
2048
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002049 def SetCQState(self, new_state):
2050 props = self.GetIssueProperties()
2051 if props.get('private'):
2052 DieWithError('Cannot set-commit on private issue')
2053
2054 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002055 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002056 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002057 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002058 else:
tandrii4b233bd2016-07-06 03:50:29 -07002059 assert new_state == _CQState.DRY_RUN
2060 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002061
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002063 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002064 # PatchIssue should never be called with a dirty tree. It is up to the
2065 # caller to check this, but just in case we assert here since the
2066 # consequences of the caller not checking this could be dire.
2067 assert(not git_common.is_dirty_git_tree('apply'))
2068 assert(parsed_issue_arg.valid)
2069 self._changelist.issue = parsed_issue_arg.issue
2070 if parsed_issue_arg.hostname:
2071 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2072
skobes6468b902016-10-24 08:45:10 -07002073 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2074 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2075 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002076 try:
skobes6468b902016-10-24 08:45:10 -07002077 scm_obj.apply_patch(patchset_object)
2078 except Exception as e:
2079 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080 return 1
2081
2082 # If we had an issue, commit the current state and register the issue.
2083 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002084 self.SetIssue(self.GetIssue())
2085 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002086 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2087 'patch from issue %(i)s at patchset '
2088 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2089 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002090 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002092 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002093 return 0
2094
2095 @staticmethod
2096 def ParseIssueURL(parsed_url):
2097 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2098 return None
wychen3c1c1722016-08-04 11:46:36 -07002099 # Rietveld patch: https://domain/<number>/#ps<patchset>
2100 match = re.match(r'/(\d+)/$', parsed_url.path)
2101 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2102 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002103 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002104 issue=int(match.group(1)),
2105 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002106 hostname=parsed_url.netloc,
2107 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002108 # Typical url: https://domain/<issue_number>[/[other]]
2109 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2110 if match:
skobes6468b902016-10-24 08:45:10 -07002111 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002112 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002113 hostname=parsed_url.netloc,
2114 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2116 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2117 if match:
skobes6468b902016-10-24 08:45:10 -07002118 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002119 issue=int(match.group(1)),
2120 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002121 hostname=parsed_url.netloc,
2122 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 return None
2124
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002125 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002126 """Upload the patch to Rietveld."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00002127 raise NotImplementedError
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002128
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002129
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002130class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002131 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002132 # auth_config is Rietveld thing, kept here to preserve interface only.
2133 super(_GerritChangelistImpl, self).__init__(changelist)
2134 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002135 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002136 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002137 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002138 # Map from change number (issue) to its detail cache.
2139 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002140
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002141 if codereview_host is not None:
2142 assert not codereview_host.startswith('https://'), codereview_host
2143 self._gerrit_host = codereview_host
2144 self._gerrit_server = 'https://%s' % codereview_host
2145
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002146 def _GetGerritHost(self):
2147 # Lazy load of configs.
2148 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002149 if self._gerrit_host and '.' not in self._gerrit_host:
2150 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2151 # This happens for internal stuff http://crbug.com/614312.
2152 parsed = urlparse.urlparse(self.GetRemoteUrl())
2153 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002154 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002155 ' Your current remote is: %s' % self.GetRemoteUrl())
2156 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2157 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002158 return self._gerrit_host
2159
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002160 def _GetGitHost(self):
2161 """Returns git host to be used when uploading change to Gerrit."""
2162 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2163
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002164 def GetCodereviewServer(self):
2165 if not self._gerrit_server:
2166 # If we're on a branch then get the server potentially associated
2167 # with that branch.
2168 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002169 self._gerrit_server = self._GitGetBranchConfigValue(
2170 self.CodereviewServerConfigKey())
2171 if self._gerrit_server:
2172 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002173 if not self._gerrit_server:
2174 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2175 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002176 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002177 parts[0] = parts[0] + '-review'
2178 self._gerrit_host = '.'.join(parts)
2179 self._gerrit_server = 'https://%s' % self._gerrit_host
2180 return self._gerrit_server
2181
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002182 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002183 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002184 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002185 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002186 logging.warn('can\'t detect Gerrit project.')
2187 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002188 project = urlparse.urlparse(remote_url).path.strip('/')
2189 if project.endswith('.git'):
2190 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002191 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2192 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2193 # gitiles/git-over-https protocol. E.g.,
2194 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2195 # as
2196 # https://chromium.googlesource.com/v8/v8
2197 if project.startswith('a/'):
2198 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002199 return project
2200
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002201 def _GerritChangeIdentifier(self):
2202 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2203
2204 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002205 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002206 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002207 project = self._GetGerritProject()
2208 if project:
2209 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2210 # Fall back on still unique, but less efficient change number.
2211 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002212
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002213 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002214 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002215 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002216
tandrii5d48c322016-08-18 16:19:37 -07002217 @classmethod
2218 def PatchsetConfigKey(cls):
2219 return 'gerritpatchset'
2220
2221 @classmethod
2222 def CodereviewServerConfigKey(cls):
2223 return 'gerritserver'
2224
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002225 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002226 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002227 if settings.GetGerritSkipEnsureAuthenticated():
2228 # For projects with unusual authentication schemes.
2229 # See http://crbug.com/603378.
2230 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002231
2232 # Check presence of cookies only if using cookies-based auth method.
2233 cookie_auth = gerrit_util.Authenticator.get()
2234 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002235 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002236
2237 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002238 self.GetCodereviewServer()
2239 git_host = self._GetGitHost()
2240 assert self._gerrit_server and self._gerrit_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002241
2242 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2243 git_auth = cookie_auth.get_auth_header(git_host)
2244 if gerrit_auth and git_auth:
2245 if gerrit_auth == git_auth:
2246 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002247 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002248 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002249 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002250 ' %s\n'
2251 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002252 ' Consider running the following command:\n'
2253 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002254 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002255 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002256 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002257 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002258 cookie_auth.get_new_password_message(git_host)))
2259 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002260 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002261 return
2262 else:
2263 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002264 ([] if gerrit_auth else [self._gerrit_host]) +
2265 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002266 DieWithError('Credentials for the following hosts are required:\n'
2267 ' %s\n'
2268 'These are read from %s (or legacy %s)\n'
2269 '%s' % (
2270 '\n '.join(missing),
2271 cookie_auth.get_gitcookies_path(),
2272 cookie_auth.get_netrc_path(),
2273 cookie_auth.get_new_password_message(git_host)))
2274
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002275 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002276 if not self.GetIssue():
2277 return
2278
2279 # Warm change details cache now to avoid RPCs later, reducing latency for
2280 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002281 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002282 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002283
2284 status = self._GetChangeDetail()['status']
2285 if status in ('MERGED', 'ABANDONED'):
2286 DieWithError('Change %s has been %s, new uploads are not allowed' %
2287 (self.GetIssueURL(),
2288 'submitted' if status == 'MERGED' else 'abandoned'))
2289
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002290 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2291 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2292 # Apparently this check is not very important? Otherwise get_auth_email
2293 # could have been added to other implementations of Authenticator.
2294 cookies_auth = gerrit_util.Authenticator.get()
2295 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002296 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002297
2298 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002299 if self.GetIssueOwner() == cookies_user:
2300 return
2301 logging.debug('change %s owner is %s, cookies user is %s',
2302 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002303 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002304 # so ask what Gerrit thinks of this user.
2305 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2306 if details['email'] == self.GetIssueOwner():
2307 return
2308 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002309 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002310 'as %s.\n'
2311 'Uploading may fail due to lack of permissions.' %
2312 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2313 confirm_or_exit(action='upload')
2314
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002315 def _PostUnsetIssueProperties(self):
2316 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002317 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002318
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002319 def GetGerritObjForPresubmit(self):
2320 return presubmit_support.GerritAccessor(self._GetGerritHost())
2321
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002322 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002323 """Apply a rough heuristic to give a simple summary of an issue's review
2324 or CQ status, assuming adherence to a common workflow.
2325
2326 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002327 * 'error' - error from review tool (including deleted issues)
2328 * 'unsent' - no reviewers added
2329 * 'waiting' - waiting for review
2330 * 'reply' - waiting for uploader to reply to review
2331 * 'lgtm' - Code-Review label has been set
2332 * 'commit' - in the commit queue
2333 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002334 """
2335 if not self.GetIssue():
2336 return None
2337
2338 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002339 data = self._GetChangeDetail([
2340 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002341 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002342 return 'error'
2343
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002344 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002345 return 'closed'
2346
Aaron Gable9ab38c62017-04-06 14:36:33 -07002347 if data['labels'].get('Commit-Queue', {}).get('approved'):
2348 # The section will have an "approved" subsection if anyone has voted
2349 # the maximum value on the label.
2350 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002351
Aaron Gable9ab38c62017-04-06 14:36:33 -07002352 if data['labels'].get('Code-Review', {}).get('approved'):
2353 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002354
2355 if not data.get('reviewers', {}).get('REVIEWER', []):
2356 return 'unsent'
2357
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002358 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002359 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2360 last_message_author = messages.pop().get('author', {})
2361 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002362 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2363 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002364 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002365 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002366 if last_message_author.get('_account_id') == owner:
2367 # Most recent message was by owner.
2368 return 'waiting'
2369 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002370 # Some reply from non-owner.
2371 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002372
2373 # Somehow there are no messages even though there are reviewers.
2374 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002375
2376 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002377 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002378 patchset = data['revisions'][data['current_revision']]['_number']
2379 self.SetPatchset(patchset)
2380 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002381
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002382 def FetchDescription(self, force=False):
2383 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2384 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002385 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002386 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002387
dsansomee2d6fd92016-09-08 00:10:47 -07002388 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002389 if gerrit_util.HasPendingChangeEdit(
2390 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002391 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002392 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002393 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002394 'unpublished edit. Either publish the edit in the Gerrit web UI '
2395 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002396
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002397 gerrit_util.DeletePendingChangeEdit(
2398 self._GetGerritHost(), self._GerritChangeIdentifier())
2399 gerrit_util.SetCommitMessage(
2400 self._GetGerritHost(), self._GerritChangeIdentifier(),
2401 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002402
Aaron Gable636b13f2017-07-14 10:42:48 -07002403 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002404 gerrit_util.SetReview(
2405 self._GetGerritHost(), self._GerritChangeIdentifier(),
2406 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002407
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002408 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002409 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002410 messages = self._GetChangeDetail(
2411 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2412 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002413 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002414
2415 # Build dictionary of file comments for easy access and sorting later.
2416 # {author+date: {path: {patchset: {line: url+message}}}}
2417 comments = collections.defaultdict(
2418 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2419 for path, line_comments in file_comments.iteritems():
2420 for comment in line_comments:
2421 if comment.get('tag', '').startswith('autogenerated'):
2422 continue
2423 key = (comment['author']['email'], comment['updated'])
2424 if comment.get('side', 'REVISION') == 'PARENT':
2425 patchset = 'Base'
2426 else:
2427 patchset = 'PS%d' % comment['patch_set']
2428 line = comment.get('line', 0)
2429 url = ('https://%s/c/%s/%s/%s#%s%s' %
2430 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2431 'b' if comment.get('side') == 'PARENT' else '',
2432 str(line) if line else ''))
2433 comments[key][path][patchset][line] = (url, comment['message'])
2434
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002435 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002436 for msg in messages:
2437 # Don't bother showing autogenerated messages.
2438 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2439 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002440 # Gerrit spits out nanoseconds.
2441 assert len(msg['date'].split('.')[-1]) == 9
2442 date = datetime.datetime.strptime(msg['date'][:-3],
2443 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002444 message = msg['message']
2445 key = (msg['author']['email'], msg['date'])
2446 if key in comments:
2447 message += '\n'
2448 for path, patchsets in sorted(comments.get(key, {}).items()):
2449 if readable:
2450 message += '\n%s' % path
2451 for patchset, lines in sorted(patchsets.items()):
2452 for line, (url, content) in sorted(lines.items()):
2453 if line:
2454 line_str = 'Line %d' % line
2455 path_str = '%s:%d:' % (path, line)
2456 else:
2457 line_str = 'File comment'
2458 path_str = '%s:0:' % path
2459 if readable:
2460 message += '\n %s, %s: %s' % (patchset, line_str, url)
2461 message += '\n %s\n' % content
2462 else:
2463 message += '\n%s ' % path_str
2464 message += '\n%s\n' % content
2465
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002466 summary.append(_CommentSummary(
2467 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002468 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002469 sender=msg['author']['email'],
2470 # These could be inferred from the text messages and correlated with
2471 # Code-Review label maximum, however this is not reliable.
2472 # Leaving as is until the need arises.
2473 approval=False,
2474 disapproval=False,
2475 ))
2476 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002477
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002478 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002479 gerrit_util.AbandonChange(
2480 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002481
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002482 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002483 gerrit_util.SubmitChange(
2484 self._GetGerritHost(), self._GerritChangeIdentifier(),
2485 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002486
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002487 def _GetChangeDetail(self, options=None, no_cache=False):
2488 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002489
2490 If fresh data is needed, set no_cache=True which will clear cache and
2491 thus new data will be fetched from Gerrit.
2492 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002493 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002494 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002495
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002496 # Optimization to avoid multiple RPCs:
2497 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2498 'CURRENT_COMMIT' not in options):
2499 options.append('CURRENT_COMMIT')
2500
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002501 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002502 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002503 options = [o.upper() for o in options]
2504
2505 # Check in cache first unless no_cache is True.
2506 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002507 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002508 else:
2509 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002510 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002511 # Assumption: data fetched before with extra options is suitable
2512 # for return for a smaller set of options.
2513 # For example, if we cached data for
2514 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2515 # and request is for options=[CURRENT_REVISION],
2516 # THEN we can return prior cached data.
2517 if options_set.issubset(cached_options_set):
2518 return data
2519
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002520 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002521 data = gerrit_util.GetChangeDetail(
2522 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002523 except gerrit_util.GerritError as e:
2524 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002525 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002526 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002527
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002528 self._detail_cache.setdefault(cache_key, []).append(
2529 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002530 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002532 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002533 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002534 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002535 data = gerrit_util.GetChangeCommit(
2536 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002537 except gerrit_util.GerritError as e:
2538 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002539 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002540 raise
agable32978d92016-11-01 12:55:02 -07002541 return data
2542
Olivier Robin75ee7252018-04-13 10:02:56 +02002543 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002544 if git_common.is_dirty_git_tree('land'):
2545 return 1
tandriid60367b2016-06-22 05:25:12 -07002546 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2547 if u'Commit-Queue' in detail.get('labels', {}):
2548 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002549 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2550 'which can test and land changes for you. '
2551 'Are you sure you wish to bypass it?\n',
2552 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002553
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002554 differs = True
tandriic4344b52016-08-29 06:04:54 -07002555 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002556 # Note: git diff outputs nothing if there is no diff.
2557 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002558 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002559 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002560 if detail['current_revision'] == last_upload:
2561 differs = False
2562 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002563 print('WARNING: Local branch contents differ from latest uploaded '
2564 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002565 if differs:
2566 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002567 confirm_or_exit(
2568 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2569 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002570 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002571 elif not bypass_hooks:
2572 hook_results = self.RunHook(
2573 committing=True,
2574 may_prompt=not force,
2575 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002576 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2577 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002578 if not hook_results.should_continue():
2579 return 1
2580
2581 self.SubmitIssue(wait_for_merge=True)
2582 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002583 links = self._GetChangeCommit().get('web_links', [])
2584 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002585 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002586 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002587 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002588 return 0
2589
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002590 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002591 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002592 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002593 assert not directory
2594 assert parsed_issue_arg.valid
2595
2596 self._changelist.issue = parsed_issue_arg.issue
2597
2598 if parsed_issue_arg.hostname:
2599 self._gerrit_host = parsed_issue_arg.hostname
2600 self._gerrit_server = 'https://%s' % self._gerrit_host
2601
tandriic2405f52016-10-10 08:13:15 -07002602 try:
2603 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002604 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002605 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002606
2607 if not parsed_issue_arg.patchset:
2608 # Use current revision by default.
2609 revision_info = detail['revisions'][detail['current_revision']]
2610 patchset = int(revision_info['_number'])
2611 else:
2612 patchset = parsed_issue_arg.patchset
2613 for revision_info in detail['revisions'].itervalues():
2614 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2615 break
2616 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002617 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002618 (parsed_issue_arg.patchset, self.GetIssue()))
2619
Aaron Gable697a91b2018-01-19 15:20:15 -08002620 remote_url = self._changelist.GetRemoteUrl()
2621 if remote_url.endswith('.git'):
2622 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002623 remote_url = remote_url.rstrip('/')
2624
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002625 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002626 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002627
2628 if remote_url != fetch_info['url']:
2629 DieWithError('Trying to patch a change from %s but this repo appears '
2630 'to be %s.' % (fetch_info['url'], remote_url))
2631
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002632 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002633
Aaron Gable62619a32017-06-16 08:22:09 -07002634 if force:
2635 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2636 print('Checked out commit for change %i patchset %i locally' %
2637 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002638 elif nocommit:
2639 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2640 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002641 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002642 RunGit(['cherry-pick', 'FETCH_HEAD'])
2643 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002644 (parsed_issue_arg.issue, patchset))
2645 print('Note: this created a local commit which does not have '
2646 'the same hash as the one uploaded for review. This will make '
2647 'uploading changes based on top of this branch difficult.\n'
2648 'If you want to do that, use "git cl patch --force" instead.')
2649
Stefan Zagerd08043c2017-10-12 12:07:02 -07002650 if self.GetBranch():
2651 self.SetIssue(parsed_issue_arg.issue)
2652 self.SetPatchset(patchset)
2653 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2654 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2655 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2656 else:
2657 print('WARNING: You are in detached HEAD state.\n'
2658 'The patch has been applied to your checkout, but you will not be '
2659 'able to upload a new patch set to the gerrit issue.\n'
2660 'Try using the \'-b\' option if you would like to work on a '
2661 'branch and/or upload a new patch set.')
2662
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002663 return 0
2664
2665 @staticmethod
2666 def ParseIssueURL(parsed_url):
2667 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2668 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002669 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2670 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002671 # Short urls like https://domain/<issue_number> can be used, but don't allow
2672 # specifying the patchset (you'd 404), but we allow that here.
2673 if parsed_url.path == '/':
2674 part = parsed_url.fragment
2675 else:
2676 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002677 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002678 if match:
2679 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002680 issue=int(match.group(3)),
2681 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002682 hostname=parsed_url.netloc,
2683 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002684 return None
2685
tandrii16e0b4e2016-06-07 10:34:28 -07002686 def _GerritCommitMsgHookCheck(self, offer_removal):
2687 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2688 if not os.path.exists(hook):
2689 return
2690 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2691 # custom developer made one.
2692 data = gclient_utils.FileRead(hook)
2693 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2694 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002695 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002696 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002697 'and may interfere with it in subtle ways.\n'
2698 'We recommend you remove the commit-msg hook.')
2699 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002700 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002701 gclient_utils.rm_file_or_tree(hook)
2702 print('Gerrit commit-msg hook removed.')
2703 else:
2704 print('OK, will keep Gerrit commit-msg hook in place.')
2705
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002706 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002707 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002708 if options.squash and options.no_squash:
2709 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002710
2711 if not options.squash and not options.no_squash:
2712 # Load default for user, repo, squash=true, in this order.
2713 options.squash = settings.GetSquashGerritUploads()
2714 elif options.no_squash:
2715 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002716
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002717 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002718 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002719
Aaron Gableb56ad332017-01-06 15:24:31 -08002720 # This may be None; default fallback value is determined in logic below.
2721 title = options.title
2722
Dominic Battre7d1c4842017-10-27 09:17:28 +02002723 # Extract bug number from branch name.
2724 bug = options.bug
2725 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2726 if not bug and match:
2727 bug = match.group(1)
2728
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002729 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002730 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002731 if self.GetIssue():
2732 # Try to get the message from a previous upload.
2733 message = self.GetDescription()
2734 if not message:
2735 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002736 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002737 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002738 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002739 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002740 # When uploading a subsequent patchset, -m|--message is taken
2741 # as the patchset title if --title was not provided.
2742 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002743 else:
2744 default_title = RunGit(
2745 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002746 if options.force:
2747 title = default_title
2748 else:
2749 title = ask_for_data(
2750 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002751 change_id = self._GetChangeDetail()['change_id']
2752 while True:
2753 footer_change_ids = git_footers.get_footer_change_id(message)
2754 if footer_change_ids == [change_id]:
2755 break
2756 if not footer_change_ids:
2757 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002758 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002759 continue
2760 # There is already a valid footer but with different or several ids.
2761 # Doing this automatically is non-trivial as we don't want to lose
2762 # existing other footers, yet we want to append just 1 desired
2763 # Change-Id. Thus, just create a new footer, but let user verify the
2764 # new description.
2765 message = '%s\n\nChange-Id: %s' % (message, change_id)
2766 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002767 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002769 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002770 'Please, check the proposed correction to the description, '
2771 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2772 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2773 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002774 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002775 if not options.force:
2776 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002777 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002778 message = change_desc.description
2779 if not message:
2780 DieWithError("Description is empty. Aborting...")
2781 # Continue the while loop.
2782 # Sanity check of this code - we should end up with proper message
2783 # footer.
2784 assert [change_id] == git_footers.get_footer_change_id(message)
2785 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002786 else: # if not self.GetIssue()
2787 if options.message:
2788 message = options.message
2789 else:
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002790 message = _create_description_from_log(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002791 if options.title:
2792 message = options.title + '\n\n' + message
2793 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002794
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002795 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002796 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002797 # On first upload, patchset title is always this string, while
2798 # --title flag gets converted to first line of message.
2799 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002800 if not change_desc.description:
2801 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002802 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002803 if len(change_ids) > 1:
2804 DieWithError('too many Change-Id footers, at most 1 allowed.')
2805 if not change_ids:
2806 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002807 change_desc.set_description(git_footers.add_footer_change_id(
2808 change_desc.description,
2809 GenerateGerritChangeId(change_desc.description)))
2810 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002811 assert len(change_ids) == 1
2812 change_id = change_ids[0]
2813
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002814 if options.reviewers or options.tbrs or options.add_owners_to:
2815 change_desc.update_reviewers(options.reviewers, options.tbrs,
2816 options.add_owners_to, change)
2817
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002818 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002819 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2820 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002821 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002822 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2823 desc_tempfile.write(change_desc.description)
2824 desc_tempfile.close()
2825 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2826 '-F', desc_tempfile.name]).strip()
2827 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002828 else:
2829 change_desc = ChangeDescription(
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00002830 options.message or _create_description_from_log(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002831 if not change_desc.description:
2832 DieWithError("Description is empty. Aborting...")
2833
2834 if not git_footers.get_footer_change_id(change_desc.description):
2835 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002836 change_desc.set_description(
2837 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002838 if options.reviewers or options.tbrs or options.add_owners_to:
2839 change_desc.update_reviewers(options.reviewers, options.tbrs,
2840 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002841 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002842 # For no-squash mode, we assume the remote called "origin" is the one we
2843 # want. It is not worthwhile to support different workflows for
2844 # no-squash mode.
2845 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002846 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2847
2848 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002849 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002850 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2851 ref_to_push)]).splitlines()
2852 if len(commits) > 1:
2853 print('WARNING: This will upload %d commits. Run the following command '
2854 'to see which commits will be uploaded: ' % len(commits))
2855 print('git log %s..%s' % (parent, ref_to_push))
2856 print('You can also use `git squash-branch` to squash these into a '
2857 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002858 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002859
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002860 if options.reviewers or options.tbrs or options.add_owners_to:
2861 change_desc.update_reviewers(options.reviewers, options.tbrs,
2862 options.add_owners_to, change)
2863
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002864 reviewers = sorted(change_desc.get_reviewers())
2865 # Add cc's from the CC_LIST and --cc flag (if any).
2866 if not options.private and not options.no_autocc:
2867 cc = self.GetCCList().split(',')
2868 else:
2869 cc = []
2870 if options.cc:
2871 cc.extend(options.cc)
2872 cc = filter(None, [email.strip() for email in cc])
2873 if change_desc.get_cced():
2874 cc.extend(change_desc.get_cced())
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00002875 if self._GetGerritHost() == 'chromium-review.googlesource.com':
2876 valid_accounts = set(reviewers + cc)
2877 # TODO(crbug/877717): relax this for all hosts.
2878 else:
2879 valid_accounts = gerrit_util.ValidAccounts(
2880 self._GetGerritHost(), reviewers + cc)
Andrii Shyshkalovf170af42018-10-30 07:00:44 +00002881 logging.info('accounts %s are recognized, %s invalid',
2882 sorted(valid_accounts),
2883 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002884
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002885 # Extra options that can be specified at push time. Doc:
2886 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002887 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002888
Aaron Gable844cf292017-06-28 11:32:59 -07002889 # By default, new changes are started in WIP mode, and subsequent patchsets
2890 # don't send email. At any time, passing --send-mail will mark the change
2891 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002892 if options.send_mail:
2893 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002894 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002895 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002896 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002897 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002898 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002899
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002900 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002901 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002902
Aaron Gable9b713dd2016-12-14 16:04:21 -08002903 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002904 # Punctuation and whitespace in |title| must be percent-encoded.
2905 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002906
agablec6787972016-09-09 16:13:34 -07002907 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002908 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002909
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002910 for r in sorted(reviewers):
2911 if r in valid_accounts:
2912 refspec_opts.append('r=%s' % r)
2913 reviewers.remove(r)
2914 else:
2915 # TODO(tandrii): this should probably be a hard failure.
2916 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2917 % r)
2918 for c in sorted(cc):
2919 # refspec option will be rejected if cc doesn't correspond to an
2920 # account, even though REST call to add such arbitrary cc may succeed.
2921 if c in valid_accounts:
2922 refspec_opts.append('cc=%s' % c)
2923 cc.remove(c)
2924
rmistry9eadede2016-09-19 11:22:43 -07002925 if options.topic:
2926 # Documentation on Gerrit topics is here:
2927 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002928 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002929
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00002930 if not change_desc.get_reviewers(tbr_only=True):
2931 # Change is not TBR, so we can inline setting other labels, too.
2932 # TODO(crbug.com/877717): make this working for TBR, too, by figuring out
2933 # max score for CR label somehow.
2934 if options.enable_auto_submit:
2935 refspec_opts.append('l=Auto-Submit+1')
2936 if options.use_commit_queue:
2937 refspec_opts.append('l=Commit-Queue+2')
2938 elif options.cq_dry_run:
2939 refspec_opts.append('l=Commit-Queue+1')
2940
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002941 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002942 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002943 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002944 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002945 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2946
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002947 refspec_suffix = ''
2948 if refspec_opts:
2949 refspec_suffix = '%' + ','.join(refspec_opts)
2950 assert ' ' not in refspec_suffix, (
2951 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2952 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2953
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002954 try:
Edward Lemur83bd7f42018-10-10 00:14:21 +00002955 # TODO(crbug.com/881860): Remove.
Edward Lemur47faa062018-10-11 19:46:02 +00002956 # Clear the log after each git-cl upload run by setting mode='w'.
2957 handler = logging.FileHandler(gerrit_util.GERRIT_ERR_LOG_FILE, mode='w')
2958 handler.setFormatter(logging.Formatter('%(asctime)s %(message)s'))
2959
2960 GERRIT_ERR_LOGGER.addHandler(handler)
2961 GERRIT_ERR_LOGGER.setLevel(logging.INFO)
2962 # Don't propagate to root logger, so that logs are not printed.
2963 GERRIT_ERR_LOGGER.propagate = 0
2964
Edward Lemur83bd7f42018-10-10 00:14:21 +00002965 # Get interesting headers from git push, to be displayed to the user if
2966 # subsequent Gerrit RPC calls fail.
2967 env = os.environ.copy()
2968 env['GIT_CURL_VERBOSE'] = '1'
2969 class FilterHeaders(object):
2970 """Filter git push headers and store them in a file.
2971
2972 Regular git push output is printed directly.
2973 """
2974
2975 def __init__(self):
2976 # The output from git push that we want to store in a file.
2977 self._output = ''
2978 # Keeps track of whether the current line is part of a request header.
2979 self._on_header = False
2980 # Keeps track of repeated empty lines, which mark the end of a request
2981 # header.
2982 self._last_line_empty = False
2983
2984 def __call__(self, line):
2985 """Handle a single line of git push output."""
2986 if not line:
2987 # Two consecutive empty lines mark the end of a header.
2988 if self._last_line_empty:
2989 self._on_header = False
2990 self._last_line_empty = True
2991 return
2992
2993 self._last_line_empty = False
2994 # A line starting with '>' marks the beggining of a request header.
2995 if line[0] == '>':
2996 self._on_header = True
2997 GERRIT_ERR_LOGGER.info(line)
2998 # Lines not starting with '*' or '<', and not part of a request header
2999 # should be displayed to the user.
3000 elif line[0] not in '*<' and not self._on_header:
3001 print(line)
3002 # Flush after every line: useful for seeing progress when running as
3003 # recipe.
3004 sys.stdout.flush()
3005 # Filter out the cookie and authorization headers.
3006 elif ('cookie: ' not in line.lower()
3007 and 'authorization: ' not in line.lower()):
3008 GERRIT_ERR_LOGGER.info(line)
3009
3010 filter_fn = FilterHeaders()
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003011 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003012 ['git', 'push', self.GetRemoteUrl(), refspec],
Edward Lemur83bd7f42018-10-10 00:14:21 +00003013 print_stdout=False,
3014 filter_fn=filter_fn,
3015 env=env)
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003016 except subprocess2.CalledProcessError:
3017 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003018 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003019 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003020 'credential problems:\n'
3021 ' git cl creds-check\n',
3022 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003023
3024 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003025 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003026 change_numbers = [m.group(1)
3027 for m in map(regex.match, push_stdout.splitlines())
3028 if m]
3029 if len(change_numbers) != 1:
3030 DieWithError(
3031 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003032 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003033 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003034 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003035
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003036 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003037 # GetIssue() is not set in case of non-squash uploads according to tests.
3038 # TODO(agable): non-squash uploads in git cl should be removed.
3039 gerrit_util.AddReviewers(
3040 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003041 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003042 reviewers, cc,
3043 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003044
Aaron Gablefd238082017-06-07 13:42:34 -07003045 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003046 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3047 score = 1
3048 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3049 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3050 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003051 gerrit_util.SetReview(
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003052 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003053 self._GerritChangeIdentifier(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003054 msg='Self-approving for TBR',
3055 labels={'Code-Review': score})
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00003056 # Labels aren't set through refspec only if tbr is set (see check above).
3057 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
3058 options.cq_dry_run)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003059 return 0
3060
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003061 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3062 change_desc):
3063 """Computes parent of the generated commit to be uploaded to Gerrit.
3064
3065 Returns revision or a ref name.
3066 """
3067 if custom_cl_base:
3068 # Try to avoid creating additional unintended CLs when uploading, unless
3069 # user wants to take this risk.
3070 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3071 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3072 local_ref_of_target_remote])
3073 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003074 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003075 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3076 'If you proceed with upload, more than 1 CL may be created by '
3077 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3078 'If you are certain that specified base `%s` has already been '
3079 'uploaded to Gerrit as another CL, you may proceed.\n' %
3080 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3081 if not force:
3082 confirm_or_exit(
3083 'Do you take responsibility for cleaning up potential mess '
3084 'resulting from proceeding with upload?',
3085 action='upload')
3086 return custom_cl_base
3087
Aaron Gablef97e33d2017-03-30 15:44:27 -07003088 if remote != '.':
3089 return self.GetCommonAncestorWithUpstream()
3090
3091 # If our upstream branch is local, we base our squashed commit on its
3092 # squashed version.
3093 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3094
Aaron Gablef97e33d2017-03-30 15:44:27 -07003095 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003096 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003097
3098 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003099 # TODO(tandrii): consider checking parent change in Gerrit and using its
3100 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3101 # the tree hash of the parent branch. The upside is less likely bogus
3102 # requests to reupload parent change just because it's uploadhash is
3103 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003104 parent = RunGit(['config',
3105 'branch.%s.gerritsquashhash' % upstream_branch_name],
3106 error_ok=True).strip()
3107 # Verify that the upstream branch has been uploaded too, otherwise
3108 # Gerrit will create additional CLs when uploading.
3109 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3110 RunGitSilent(['rev-parse', parent + ':'])):
3111 DieWithError(
3112 '\nUpload upstream branch %s first.\n'
3113 'It is likely that this branch has been rebased since its last '
3114 'upload, so you just need to upload it again.\n'
3115 '(If you uploaded it with --no-squash, then branch dependencies '
3116 'are not supported, and you should reupload with --squash.)'
3117 % upstream_branch_name,
3118 change_desc)
3119 return parent
3120
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003121 def _AddChangeIdToCommitMessage(self, options, args):
3122 """Re-commits using the current message, assumes the commit hook is in
3123 place.
3124 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003125 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003126 git_command = ['commit', '--amend', '-m', log_desc]
3127 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003128 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003129 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003130 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003131 return new_log_desc
3132 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003133 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003134
Ravi Mistry31e7d562018-04-02 12:53:57 -04003135 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3136 """Sets labels on the change based on the provided flags."""
3137 labels = {}
3138 notify = None;
3139 if enable_auto_submit:
3140 labels['Auto-Submit'] = 1
3141 if use_commit_queue:
3142 labels['Commit-Queue'] = 2
3143 elif cq_dry_run:
3144 labels['Commit-Queue'] = 1
3145 notify = False
3146 if labels:
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003147 gerrit_util.SetReview(
3148 self._GetGerritHost(),
3149 self._GerritChangeIdentifier(),
3150 labels=labels, notify=notify)
Ravi Mistry31e7d562018-04-02 12:53:57 -04003151
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003152 def SetCQState(self, new_state):
3153 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003154 vote_map = {
3155 _CQState.NONE: 0,
3156 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003157 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003158 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003159 labels = {'Commit-Queue': vote_map[new_state]}
3160 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003161 gerrit_util.SetReview(
3162 self._GetGerritHost(), self._GerritChangeIdentifier(),
3163 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003164
tandriie113dfd2016-10-11 10:20:12 -07003165 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003166 try:
3167 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003168 except GerritChangeNotExists:
3169 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003170
3171 if data['status'] in ('ABANDONED', 'MERGED'):
3172 return 'CL %s is closed' % self.GetIssue()
3173
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003174 def GetTryJobProperties(self, patchset=None):
3175 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003176 data = self._GetChangeDetail(['ALL_REVISIONS'])
3177 patchset = int(patchset or self.GetPatchset())
3178 assert patchset
3179 revision_data = None # Pylint wants it to be defined.
3180 for revision_data in data['revisions'].itervalues():
3181 if int(revision_data['_number']) == patchset:
3182 break
3183 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003184 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003185 (patchset, self.GetIssue()))
3186 return {
3187 'patch_issue': self.GetIssue(),
3188 'patch_set': patchset or self.GetPatchset(),
3189 'patch_project': data['project'],
3190 'patch_storage': 'gerrit',
3191 'patch_ref': revision_data['fetch']['http']['ref'],
3192 'patch_repository_url': revision_data['fetch']['http']['url'],
3193 'patch_gerrit_url': self.GetCodereviewServer(),
3194 }
tandriie113dfd2016-10-11 10:20:12 -07003195
tandriide281ae2016-10-12 06:02:30 -07003196 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003197 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003198
Edward Lemur707d70b2018-02-07 00:50:14 +01003199 def GetReviewers(self):
3200 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3201 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3202
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003203
3204_CODEREVIEW_IMPLEMENTATIONS = {
3205 'rietveld': _RietveldChangelistImpl,
3206 'gerrit': _GerritChangelistImpl,
3207}
3208
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003209
iannuccie53c9352016-08-17 14:40:40 -07003210def _add_codereview_issue_select_options(parser, extra=""):
3211 _add_codereview_select_options(parser)
3212
3213 text = ('Operate on this issue number instead of the current branch\'s '
3214 'implicit issue.')
3215 if extra:
3216 text += ' '+extra
3217 parser.add_option('-i', '--issue', type=int, help=text)
3218
3219
3220def _process_codereview_issue_select_options(parser, options):
3221 _process_codereview_select_options(parser, options)
3222 if options.issue is not None and not options.forced_codereview:
3223 parser.error('--issue must be specified with either --rietveld or --gerrit')
3224
3225
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003226def _add_codereview_select_options(parser):
3227 """Appends --gerrit and --rietveld options to force specific codereview."""
3228 parser.codereview_group = optparse.OptionGroup(
3229 parser, 'EXPERIMENTAL! Codereview override options')
3230 parser.add_option_group(parser.codereview_group)
3231 parser.codereview_group.add_option(
3232 '--gerrit', action='store_true',
3233 help='Force the use of Gerrit for codereview')
3234 parser.codereview_group.add_option(
3235 '--rietveld', action='store_true',
3236 help='Force the use of Rietveld for codereview')
3237
3238
3239def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003240 if options.rietveld:
3241 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003242 options.forced_codereview = None
3243 if options.gerrit:
3244 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003245
3246
tandriif9aefb72016-07-01 09:06:51 -07003247def _get_bug_line_values(default_project, bugs):
3248 """Given default_project and comma separated list of bugs, yields bug line
3249 values.
3250
3251 Each bug can be either:
3252 * a number, which is combined with default_project
3253 * string, which is left as is.
3254
3255 This function may produce more than one line, because bugdroid expects one
3256 project per line.
3257
3258 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3259 ['v8:123', 'chromium:789']
3260 """
3261 default_bugs = []
3262 others = []
3263 for bug in bugs.split(','):
3264 bug = bug.strip()
3265 if bug:
3266 try:
3267 default_bugs.append(int(bug))
3268 except ValueError:
3269 others.append(bug)
3270
3271 if default_bugs:
3272 default_bugs = ','.join(map(str, default_bugs))
3273 if default_project:
3274 yield '%s:%s' % (default_project, default_bugs)
3275 else:
3276 yield default_bugs
3277 for other in sorted(others):
3278 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3279 yield other
3280
3281
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003282class ChangeDescription(object):
3283 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003284 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003285 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003286 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003287 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003288 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3289 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3290 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3291 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003292
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003293 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003294 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003295
agable@chromium.org42c20792013-09-12 17:34:49 +00003296 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003297 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003298 return '\n'.join(self._description_lines)
3299
3300 def set_description(self, desc):
3301 if isinstance(desc, basestring):
3302 lines = desc.splitlines()
3303 else:
3304 lines = [line.rstrip() for line in desc]
3305 while lines and not lines[0]:
3306 lines.pop(0)
3307 while lines and not lines[-1]:
3308 lines.pop(-1)
3309 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003310
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003311 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3312 """Rewrites the R=/TBR= line(s) as a single line each.
3313
3314 Args:
3315 reviewers (list(str)) - list of additional emails to use for reviewers.
3316 tbrs (list(str)) - list of additional emails to use for TBRs.
3317 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3318 the change that are missing OWNER coverage. If this is not None, you
3319 must also pass a value for `change`.
3320 change (Change) - The Change that should be used for OWNERS lookups.
3321 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003322 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003323 assert isinstance(tbrs, list), tbrs
3324
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003325 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003326 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003327
3328 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003329 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003330
3331 reviewers = set(reviewers)
3332 tbrs = set(tbrs)
3333 LOOKUP = {
3334 'TBR': tbrs,
3335 'R': reviewers,
3336 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003337
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003338 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003339 regexp = re.compile(self.R_LINE)
3340 matches = [regexp.match(line) for line in self._description_lines]
3341 new_desc = [l for i, l in enumerate(self._description_lines)
3342 if not matches[i]]
3343 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003344
agable@chromium.org42c20792013-09-12 17:34:49 +00003345 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003346
3347 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003348 for match in matches:
3349 if not match:
3350 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003351 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3352
3353 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003354 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003355 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003356 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003357 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003358 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003359 LOOKUP[add_owners_to].update(
3360 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003361
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003362 # If any folks ended up in both groups, remove them from tbrs.
3363 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003364
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003365 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3366 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003367
3368 # Put the new lines in the description where the old first R= line was.
3369 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3370 if 0 <= line_loc < len(self._description_lines):
3371 if new_tbr_line:
3372 self._description_lines.insert(line_loc, new_tbr_line)
3373 if new_r_line:
3374 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003375 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003376 if new_r_line:
3377 self.append_footer(new_r_line)
3378 if new_tbr_line:
3379 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003380
Aaron Gable3a16ed12017-03-23 10:51:55 -07003381 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003382 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003383 self.set_description([
3384 '# Enter a description of the change.',
3385 '# This will be displayed on the codereview site.',
3386 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003387 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003388 '--------------------',
3389 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003390
agable@chromium.org42c20792013-09-12 17:34:49 +00003391 regexp = re.compile(self.BUG_LINE)
3392 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003393 prefix = settings.GetBugPrefix()
3394 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003395 if git_footer:
3396 self.append_footer('Bug: %s' % ', '.join(values))
3397 else:
3398 for value in values:
3399 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003400
agable@chromium.org42c20792013-09-12 17:34:49 +00003401 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003402 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003403 if not content:
3404 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003405 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003406
Bruce Dawson2377b012018-01-11 16:46:49 -08003407 # Strip off comments and default inserted "Bug:" line.
3408 clean_lines = [line.rstrip() for line in lines if not
3409 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003410 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003411 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003412 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003413
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003414 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003415 """Adds a footer line to the description.
3416
3417 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3418 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3419 that Gerrit footers are always at the end.
3420 """
3421 parsed_footer_line = git_footers.parse_footer(line)
3422 if parsed_footer_line:
3423 # Line is a gerrit footer in the form: Footer-Key: any value.
3424 # Thus, must be appended observing Gerrit footer rules.
3425 self.set_description(
3426 git_footers.add_footer(self.description,
3427 key=parsed_footer_line[0],
3428 value=parsed_footer_line[1]))
3429 return
3430
3431 if not self._description_lines:
3432 self._description_lines.append(line)
3433 return
3434
3435 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3436 if gerrit_footers:
3437 # git_footers.split_footers ensures that there is an empty line before
3438 # actual (gerrit) footers, if any. We have to keep it that way.
3439 assert top_lines and top_lines[-1] == ''
3440 top_lines, separator = top_lines[:-1], top_lines[-1:]
3441 else:
3442 separator = [] # No need for separator if there are no gerrit_footers.
3443
3444 prev_line = top_lines[-1] if top_lines else ''
3445 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3446 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3447 top_lines.append('')
3448 top_lines.append(line)
3449 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003450
tandrii99a72f22016-08-17 14:33:24 -07003451 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003452 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003453 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003454 reviewers = [match.group(2).strip()
3455 for match in matches
3456 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003457 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003458
bradnelsond975b302016-10-23 12:20:23 -07003459 def get_cced(self):
3460 """Retrieves the list of reviewers."""
3461 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3462 cced = [match.group(2).strip() for match in matches if match]
3463 return cleanup_list(cced)
3464
Nodir Turakulov23b82142017-11-16 11:04:25 -08003465 def get_hash_tags(self):
3466 """Extracts and sanitizes a list of Gerrit hashtags."""
3467 subject = (self._description_lines or ('',))[0]
3468 subject = re.sub(
3469 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3470
3471 tags = []
3472 start = 0
3473 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3474 while True:
3475 m = bracket_exp.match(subject, start)
3476 if not m:
3477 break
3478 tags.append(self.sanitize_hash_tag(m.group(1)))
3479 start = m.end()
3480
3481 if not tags:
3482 # Try "Tag: " prefix.
3483 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3484 if m:
3485 tags.append(self.sanitize_hash_tag(m.group(1)))
3486 return tags
3487
3488 @classmethod
3489 def sanitize_hash_tag(cls, tag):
3490 """Returns a sanitized Gerrit hash tag.
3491
3492 A sanitized hashtag can be used as a git push refspec parameter value.
3493 """
3494 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3495
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003496 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3497 """Updates this commit description given the parent.
3498
3499 This is essentially what Gnumbd used to do.
3500 Consult https://goo.gl/WMmpDe for more details.
3501 """
3502 assert parent_msg # No, orphan branch creation isn't supported.
3503 assert parent_hash
3504 assert dest_ref
3505 parent_footer_map = git_footers.parse_footers(parent_msg)
3506 # This will also happily parse svn-position, which GnumbD is no longer
3507 # supporting. While we'd generate correct footers, the verifier plugin
3508 # installed in Gerrit will block such commit (ie git push below will fail).
3509 parent_position = git_footers.get_position(parent_footer_map)
3510
3511 # Cherry-picks may have last line obscuring their prior footers,
3512 # from git_footers perspective. This is also what Gnumbd did.
3513 cp_line = None
3514 if (self._description_lines and
3515 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3516 cp_line = self._description_lines.pop()
3517
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003518 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003519
3520 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3521 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003522 for i, line in enumerate(footer_lines):
3523 k, v = git_footers.parse_footer(line) or (None, None)
3524 if k and k.startswith('Cr-'):
3525 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003526
3527 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003528 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003529 if parent_position[0] == dest_ref:
3530 # Same branch as parent.
3531 number = int(parent_position[1]) + 1
3532 else:
3533 number = 1 # New branch, and extra lineage.
3534 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3535 int(parent_position[1])))
3536
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003537 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3538 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003539
3540 self._description_lines = top_lines
3541 if cp_line:
3542 self._description_lines.append(cp_line)
3543 if self._description_lines[-1] != '':
3544 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003545 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003546
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003547
Aaron Gablea1bab272017-04-11 16:38:18 -07003548def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003549 """Retrieves the reviewers that approved a CL from the issue properties with
3550 messages.
3551
3552 Note that the list may contain reviewers that are not committer, thus are not
3553 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003554
3555 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003556 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003557 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003558 return sorted(
3559 set(
3560 message['sender']
3561 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003562 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003563 )
3564 )
3565
3566
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003567def FindCodereviewSettingsFile(filename='codereview.settings'):
3568 """Finds the given file starting in the cwd and going up.
3569
3570 Only looks up to the top of the repository unless an
3571 'inherit-review-settings-ok' file exists in the root of the repository.
3572 """
3573 inherit_ok_file = 'inherit-review-settings-ok'
3574 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003575 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003576 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3577 root = '/'
3578 while True:
3579 if filename in os.listdir(cwd):
3580 if os.path.isfile(os.path.join(cwd, filename)):
3581 return open(os.path.join(cwd, filename))
3582 if cwd == root:
3583 break
3584 cwd = os.path.dirname(cwd)
3585
3586
3587def LoadCodereviewSettingsFromFile(fileobj):
3588 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003589 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003590
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003591 def SetProperty(name, setting, unset_error_ok=False):
3592 fullname = 'rietveld.' + name
3593 if setting in keyvals:
3594 RunGit(['config', fullname, keyvals[setting]])
3595 else:
3596 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3597
tandrii48df5812016-10-17 03:55:37 -07003598 if not keyvals.get('GERRIT_HOST', False):
3599 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600 # Only server setting is required. Other settings can be absent.
3601 # In that case, we ignore errors raised during option deletion attempt.
3602 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003603 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003604 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3605 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003606 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003607 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3608 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003609 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003610 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3611 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003612
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003613 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003614 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003615
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003616 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003617 RunGit(['config', 'gerrit.squash-uploads',
3618 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003619
tandrii@chromium.org28253532016-04-14 13:46:56 +00003620 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003621 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003622 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3623
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003624 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003625 # should be of the form
3626 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3627 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003628 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3629 keyvals['ORIGIN_URL_CONFIG']])
3630
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003631
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003632def urlretrieve(source, destination):
3633 """urllib is broken for SSL connections via a proxy therefore we
3634 can't use urllib.urlretrieve()."""
3635 with open(destination, 'w') as f:
3636 f.write(urllib2.urlopen(source).read())
3637
3638
ukai@chromium.org712d6102013-11-27 00:52:58 +00003639def hasSheBang(fname):
3640 """Checks fname is a #! script."""
3641 with open(fname) as f:
3642 return f.read(2).startswith('#!')
3643
3644
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003645# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3646def DownloadHooks(*args, **kwargs):
3647 pass
3648
3649
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003650def DownloadGerritHook(force):
3651 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003652
3653 Args:
3654 force: True to update hooks. False to install hooks if not present.
3655 """
3656 if not settings.GetIsGerrit():
3657 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003658 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003659 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3660 if not os.access(dst, os.X_OK):
3661 if os.path.exists(dst):
3662 if not force:
3663 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003664 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003665 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003666 if not hasSheBang(dst):
3667 DieWithError('Not a script: %s\n'
3668 'You need to download from\n%s\n'
3669 'into .git/hooks/commit-msg and '
3670 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003671 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3672 except Exception:
3673 if os.path.exists(dst):
3674 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003675 DieWithError('\nFailed to download hooks.\n'
3676 'You need to download from\n%s\n'
3677 'into .git/hooks/commit-msg and '
3678 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003679
3680
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003681def GetRietveldCodereviewSettingsInteractively():
3682 """Prompt the user for settings."""
3683 server = settings.GetDefaultServerUrl(error_ok=True)
3684 prompt = 'Rietveld server (host[:port])'
3685 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3686 newserver = ask_for_data(prompt + ':')
3687 if not server and not newserver:
3688 newserver = DEFAULT_SERVER
3689 if newserver:
3690 newserver = gclient_utils.UpgradeToHttps(newserver)
3691 if newserver != server:
3692 RunGit(['config', 'rietveld.server', newserver])
3693
3694 def SetProperty(initial, caption, name, is_url):
3695 prompt = caption
3696 if initial:
3697 prompt += ' ("x" to clear) [%s]' % initial
3698 new_val = ask_for_data(prompt + ':')
3699 if new_val == 'x':
3700 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3701 elif new_val:
3702 if is_url:
3703 new_val = gclient_utils.UpgradeToHttps(new_val)
3704 if new_val != initial:
3705 RunGit(['config', 'rietveld.' + name, new_val])
3706
3707 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3708 SetProperty(settings.GetDefaultPrivateFlag(),
3709 'Private flag (rietveld only)', 'private', False)
3710 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3711 'tree-status-url', False)
3712 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3713 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3714 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3715 'run-post-upload-hook', False)
3716
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003717
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003718class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003719 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003720
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003721 _GOOGLESOURCE = 'googlesource.com'
3722
3723 def __init__(self):
3724 # Cached list of [host, identity, source], where source is either
3725 # .gitcookies or .netrc.
3726 self._all_hosts = None
3727
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003728 def ensure_configured_gitcookies(self):
3729 """Runs checks and suggests fixes to make git use .gitcookies from default
3730 path."""
3731 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3732 configured_path = RunGitSilent(
3733 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003734 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003735 if configured_path:
3736 self._ensure_default_gitcookies_path(configured_path, default)
3737 else:
3738 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003739
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003740 @staticmethod
3741 def _ensure_default_gitcookies_path(configured_path, default_path):
3742 assert configured_path
3743 if configured_path == default_path:
3744 print('git is already configured to use your .gitcookies from %s' %
3745 configured_path)
3746 return
3747
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003748 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003749 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3750 (configured_path, default_path))
3751
3752 if not os.path.exists(configured_path):
3753 print('However, your configured .gitcookies file is missing.')
3754 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3755 action='reconfigure')
3756 RunGit(['config', '--global', 'http.cookiefile', default_path])
3757 return
3758
3759 if os.path.exists(default_path):
3760 print('WARNING: default .gitcookies file already exists %s' %
3761 default_path)
3762 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3763 default_path)
3764
3765 confirm_or_exit('Move existing .gitcookies to default location?',
3766 action='move')
3767 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003768 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003769 print('Moved and reconfigured git to use .gitcookies from %s' %
3770 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003771
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003772 @staticmethod
3773 def _configure_gitcookies_path(default_path):
3774 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3775 if os.path.exists(netrc_path):
3776 print('You seem to be using outdated .netrc for git credentials: %s' %
3777 netrc_path)
3778 print('This tool will guide you through setting up recommended '
3779 '.gitcookies store for git credentials.\n'
3780 '\n'
3781 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3782 ' git config --global --unset http.cookiefile\n'
3783 ' mv %s %s.backup\n\n' % (default_path, default_path))
3784 confirm_or_exit(action='setup .gitcookies')
3785 RunGit(['config', '--global', 'http.cookiefile', default_path])
3786 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003787
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003788 def get_hosts_with_creds(self, include_netrc=False):
3789 if self._all_hosts is None:
3790 a = gerrit_util.CookiesAuthenticator()
3791 self._all_hosts = [
3792 (h, u, s)
3793 for h, u, s in itertools.chain(
3794 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3795 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3796 )
3797 if h.endswith(self._GOOGLESOURCE)
3798 ]
3799
3800 if include_netrc:
3801 return self._all_hosts
3802 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3803
3804 def print_current_creds(self, include_netrc=False):
3805 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3806 if not hosts:
3807 print('No Git/Gerrit credentials found')
3808 return
3809 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3810 header = [('Host', 'User', 'Which file'),
3811 ['=' * l for l in lengths]]
3812 for row in (header + hosts):
3813 print('\t'.join((('%%+%ds' % l) % s)
3814 for l, s in zip(lengths, row)))
3815
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003816 @staticmethod
3817 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003818 """Parses identity "git-<username>.domain" into <username> and domain."""
3819 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003820 # distinguishable from sub-domains. But we do know typical domains:
3821 if identity.endswith('.chromium.org'):
3822 domain = 'chromium.org'
3823 username = identity[:-len('.chromium.org')]
3824 else:
3825 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003826 if username.startswith('git-'):
3827 username = username[len('git-'):]
3828 return username, domain
3829
3830 def _get_usernames_of_domain(self, domain):
3831 """Returns list of usernames referenced by .gitcookies in a given domain."""
3832 identities_by_domain = {}
3833 for _, identity, _ in self.get_hosts_with_creds():
3834 username, domain = self._parse_identity(identity)
3835 identities_by_domain.setdefault(domain, []).append(username)
3836 return identities_by_domain.get(domain)
3837
3838 def _canonical_git_googlesource_host(self, host):
3839 """Normalizes Gerrit hosts (with '-review') to Git host."""
3840 assert host.endswith(self._GOOGLESOURCE)
3841 # Prefix doesn't include '.' at the end.
3842 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3843 if prefix.endswith('-review'):
3844 prefix = prefix[:-len('-review')]
3845 return prefix + '.' + self._GOOGLESOURCE
3846
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003847 def _canonical_gerrit_googlesource_host(self, host):
3848 git_host = self._canonical_git_googlesource_host(host)
3849 prefix = git_host.split('.', 1)[0]
3850 return prefix + '-review.' + self._GOOGLESOURCE
3851
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003852 def _get_counterpart_host(self, host):
3853 assert host.endswith(self._GOOGLESOURCE)
3854 git = self._canonical_git_googlesource_host(host)
3855 gerrit = self._canonical_gerrit_googlesource_host(git)
3856 return git if gerrit == host else gerrit
3857
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003858 def has_generic_host(self):
3859 """Returns whether generic .googlesource.com has been configured.
3860
3861 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3862 """
3863 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3864 if host == '.' + self._GOOGLESOURCE:
3865 return True
3866 return False
3867
3868 def _get_git_gerrit_identity_pairs(self):
3869 """Returns map from canonic host to pair of identities (Git, Gerrit).
3870
3871 One of identities might be None, meaning not configured.
3872 """
3873 host_to_identity_pairs = {}
3874 for host, identity, _ in self.get_hosts_with_creds():
3875 canonical = self._canonical_git_googlesource_host(host)
3876 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3877 idx = 0 if canonical == host else 1
3878 pair[idx] = identity
3879 return host_to_identity_pairs
3880
3881 def get_partially_configured_hosts(self):
3882 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003883 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3884 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3885 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003886
3887 def get_conflicting_hosts(self):
3888 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003889 host
3890 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003891 if None not in (i1, i2) and i1 != i2)
3892
3893 def get_duplicated_hosts(self):
3894 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3895 return set(host for host, count in counters.iteritems() if count > 1)
3896
3897 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3898 'chromium.googlesource.com': 'chromium.org',
3899 'chrome-internal.googlesource.com': 'google.com',
3900 }
3901
3902 def get_hosts_with_wrong_identities(self):
3903 """Finds hosts which **likely** reference wrong identities.
3904
3905 Note: skips hosts which have conflicting identities for Git and Gerrit.
3906 """
3907 hosts = set()
3908 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3909 pair = self._get_git_gerrit_identity_pairs().get(host)
3910 if pair and pair[0] == pair[1]:
3911 _, domain = self._parse_identity(pair[0])
3912 if domain != expected:
3913 hosts.add(host)
3914 return hosts
3915
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003916 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003917 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003918 hosts = sorted(hosts)
3919 assert hosts
3920 if extra_column_func is None:
3921 extras = [''] * len(hosts)
3922 else:
3923 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003924 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3925 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003926 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003927 lines.append(tmpl % he)
3928 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003929
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003930 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003931 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003932 yield ('.googlesource.com wildcard record detected',
3933 ['Chrome Infrastructure team recommends to list full host names '
3934 'explicitly.'],
3935 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003936
3937 dups = self.get_duplicated_hosts()
3938 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003939 yield ('The following hosts were defined twice',
3940 self._format_hosts(dups),
3941 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003942
3943 partial = self.get_partially_configured_hosts()
3944 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003945 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3946 'These hosts are missing',
3947 self._format_hosts(partial, lambda host: 'but %s defined' %
3948 self._get_counterpart_host(host)),
3949 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003950
3951 conflicting = self.get_conflicting_hosts()
3952 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003953 yield ('The following Git hosts have differing credentials from their '
3954 'Gerrit counterparts',
3955 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3956 tuple(self._get_git_gerrit_identity_pairs()[host])),
3957 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003958
3959 wrong = self.get_hosts_with_wrong_identities()
3960 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003961 yield ('These hosts likely use wrong identity',
3962 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3963 (self._get_git_gerrit_identity_pairs()[host][0],
3964 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3965 wrong)
3966
3967 def find_and_report_problems(self):
3968 """Returns True if there was at least one problem, else False."""
3969 found = False
3970 bad_hosts = set()
3971 for title, sublines, hosts in self._find_problems():
3972 if not found:
3973 found = True
3974 print('\n\n.gitcookies problem report:\n')
3975 bad_hosts.update(hosts or [])
3976 print(' %s%s' % (title , (':' if sublines else '')))
3977 if sublines:
3978 print()
3979 print(' %s' % '\n '.join(sublines))
3980 print()
3981
3982 if bad_hosts:
3983 assert found
3984 print(' You can manually remove corresponding lines in your %s file and '
3985 'visit the following URLs with correct account to generate '
3986 'correct credential lines:\n' %
3987 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3988 print(' %s' % '\n '.join(sorted(set(
3989 gerrit_util.CookiesAuthenticator().get_new_password_url(
3990 self._canonical_git_googlesource_host(host))
3991 for host in bad_hosts
3992 ))))
3993 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003994
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003995
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00003996@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003997def CMDcreds_check(parser, args):
3998 """Checks credentials and suggests changes."""
3999 _, _ = parser.parse_args(args)
4000
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004001 # Code below checks .gitcookies. Abort if using something else.
4002 authn = gerrit_util.Authenticator.get()
4003 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
4004 if isinstance(authn, gerrit_util.GceAuthenticator):
4005 DieWithError(
4006 'This command is not designed for GCE, are you on a bot?\n'
4007 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
4008 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004009 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004010 'This command is not designed for bot environment. It checks '
4011 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004012
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004013 checker = _GitCookiesChecker()
4014 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004015
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004016 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004017 checker.print_current_creds(include_netrc=True)
4018
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004019 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004020 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004021 return 0
4022 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004023
4024
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004025@subcommand.usage('[repo root containing codereview.settings]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004026@metrics.collector.collect_metrics('git cl config')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004027def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004028 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004029
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004030 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004031 # TODO(tandrii): remove this once we switch to Gerrit.
4032 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004033 parser.add_option('--activate-update', action='store_true',
4034 help='activate auto-updating [rietveld] section in '
4035 '.git/config')
4036 parser.add_option('--deactivate-update', action='store_true',
4037 help='deactivate auto-updating [rietveld] section in '
4038 '.git/config')
4039 options, args = parser.parse_args(args)
4040
4041 if options.deactivate_update:
4042 RunGit(['config', 'rietveld.autoupdate', 'false'])
4043 return
4044
4045 if options.activate_update:
4046 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4047 return
4048
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004049 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004050 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051 return 0
4052
4053 url = args[0]
4054 if not url.endswith('codereview.settings'):
4055 url = os.path.join(url, 'codereview.settings')
4056
4057 # Load code review settings and download hooks (if available).
4058 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4059 return 0
4060
4061
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004062@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004063def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004064 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004065 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4066 branch = ShortBranchName(branchref)
4067 _, args = parser.parse_args(args)
4068 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004070 return RunGit(['config', 'branch.%s.base-url' % branch],
4071 error_ok=False).strip()
4072 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004073 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004074 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4075 error_ok=False).strip()
4076
4077
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004078def color_for_status(status):
4079 """Maps a Changelist status to color, for CMDstatus and other tools."""
4080 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004081 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004082 'waiting': Fore.BLUE,
4083 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004084 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004085 'lgtm': Fore.GREEN,
4086 'commit': Fore.MAGENTA,
4087 'closed': Fore.CYAN,
4088 'error': Fore.WHITE,
4089 }.get(status, Fore.WHITE)
4090
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004091
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004092def get_cl_statuses(changes, fine_grained, max_processes=None):
4093 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004094
4095 If fine_grained is true, this will fetch CL statuses from the server.
4096 Otherwise, simply indicate if there's a matching url for the given branches.
4097
4098 If max_processes is specified, it is used as the maximum number of processes
4099 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4100 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004101
4102 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004103 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004104 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004105 upload.verbosity = 0
4106
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004107 if not changes:
4108 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004109
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004110 if not fine_grained:
4111 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004112 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004113 for cl in changes:
4114 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004115 return
4116
4117 # First, sort out authentication issues.
4118 logging.debug('ensuring credentials exist')
4119 for cl in changes:
4120 cl.EnsureAuthenticated(force=False, refresh=True)
4121
4122 def fetch(cl):
4123 try:
4124 return (cl, cl.GetStatus())
4125 except:
4126 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07004127 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004128 raise
4129
4130 threads_count = len(changes)
4131 if max_processes:
4132 threads_count = max(1, min(threads_count, max_processes))
4133 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4134
4135 pool = ThreadPool(threads_count)
4136 fetched_cls = set()
4137 try:
4138 it = pool.imap_unordered(fetch, changes).__iter__()
4139 while True:
4140 try:
4141 cl, status = it.next(timeout=5)
4142 except multiprocessing.TimeoutError:
4143 break
4144 fetched_cls.add(cl)
4145 yield cl, status
4146 finally:
4147 pool.close()
4148
4149 # Add any branches that failed to fetch.
4150 for cl in set(changes) - fetched_cls:
4151 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004152
rmistry@google.com2dd99862015-06-22 12:22:18 +00004153
4154def upload_branch_deps(cl, args):
4155 """Uploads CLs of local branches that are dependents of the current branch.
4156
4157 If the local branch dependency tree looks like:
4158 test1 -> test2.1 -> test3.1
4159 -> test3.2
4160 -> test2.2 -> test3.3
4161
4162 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4163 run on the dependent branches in this order:
4164 test2.1, test3.1, test3.2, test2.2, test3.3
4165
4166 Note: This function does not rebase your local dependent branches. Use it when
4167 you make a change to the parent branch that will not conflict with its
4168 dependent branches, and you would like their dependencies updated in
4169 Rietveld.
4170 """
4171 if git_common.is_dirty_git_tree('upload-branch-deps'):
4172 return 1
4173
4174 root_branch = cl.GetBranch()
4175 if root_branch is None:
4176 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4177 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004178 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00004179 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4180 'patchset dependencies without an uploaded CL.')
4181
4182 branches = RunGit(['for-each-ref',
4183 '--format=%(refname:short) %(upstream:short)',
4184 'refs/heads'])
4185 if not branches:
4186 print('No local branches found.')
4187 return 0
4188
4189 # Create a dictionary of all local branches to the branches that are dependent
4190 # on it.
4191 tracked_to_dependents = collections.defaultdict(list)
4192 for b in branches.splitlines():
4193 tokens = b.split()
4194 if len(tokens) == 2:
4195 branch_name, tracked = tokens
4196 tracked_to_dependents[tracked].append(branch_name)
4197
vapiera7fbd5a2016-06-16 09:17:49 -07004198 print()
4199 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004200 dependents = []
4201 def traverse_dependents_preorder(branch, padding=''):
4202 dependents_to_process = tracked_to_dependents.get(branch, [])
4203 padding += ' '
4204 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004205 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004206 dependents.append(dependent)
4207 traverse_dependents_preorder(dependent, padding)
4208 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004209 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004210
4211 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004212 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004213 return 0
4214
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004215 confirm_or_exit('This command will checkout all dependent branches and run '
4216 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004217
rmistry@google.com2dd99862015-06-22 12:22:18 +00004218 # Record all dependents that failed to upload.
4219 failures = {}
4220 # Go through all dependents, checkout the branch and upload.
4221 try:
4222 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004223 print()
4224 print('--------------------------------------')
4225 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004226 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004227 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004228 try:
4229 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004230 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004231 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004232 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004233 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004234 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004235 finally:
4236 # Swap back to the original root branch.
4237 RunGit(['checkout', '-q', root_branch])
4238
vapiera7fbd5a2016-06-16 09:17:49 -07004239 print()
4240 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004241 for dependent_branch in dependents:
4242 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004243 print(' %s : %s' % (dependent_branch, upload_status))
4244 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004245
4246 return 0
4247
4248
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004249@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004250def CMDarchive(parser, args):
4251 """Archives and deletes branches associated with closed changelists."""
4252 parser.add_option(
4253 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004254 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004255 parser.add_option(
4256 '-f', '--force', action='store_true',
4257 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004258 parser.add_option(
4259 '-d', '--dry-run', action='store_true',
4260 help='Skip the branch tagging and removal steps.')
4261 parser.add_option(
4262 '-t', '--notags', action='store_true',
4263 help='Do not tag archived branches. '
4264 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004265
4266 auth.add_auth_options(parser)
4267 options, args = parser.parse_args(args)
4268 if args:
4269 parser.error('Unsupported args: %s' % ' '.join(args))
4270 auth_config = auth.extract_auth_config_from_options(options)
4271
4272 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4273 if not branches:
4274 return 0
4275
vapiera7fbd5a2016-06-16 09:17:49 -07004276 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004277 changes = [Changelist(branchref=b, auth_config=auth_config)
4278 for b in branches.splitlines()]
4279 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4280 statuses = get_cl_statuses(changes,
4281 fine_grained=True,
4282 max_processes=options.maxjobs)
4283 proposal = [(cl.GetBranch(),
4284 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4285 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004286 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004287 proposal.sort()
4288
4289 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004290 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004291 return 0
4292
4293 current_branch = GetCurrentBranch()
4294
vapiera7fbd5a2016-06-16 09:17:49 -07004295 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004296 if options.notags:
4297 for next_item in proposal:
4298 print(' ' + next_item[0])
4299 else:
4300 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4301 for next_item in proposal:
4302 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004303
kmarshall9249e012016-08-23 12:02:16 -07004304 # Quit now on precondition failure or if instructed by the user, either
4305 # via an interactive prompt or by command line flags.
4306 if options.dry_run:
4307 print('\nNo changes were made (dry run).\n')
4308 return 0
4309 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004310 print('You are currently on a branch \'%s\' which is associated with a '
4311 'closed codereview issue, so archive cannot proceed. Please '
4312 'checkout another branch and run this command again.' %
4313 current_branch)
4314 return 1
kmarshall9249e012016-08-23 12:02:16 -07004315 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004316 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4317 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004318 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004319 return 1
4320
4321 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004322 if not options.notags:
4323 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004324 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004325
vapiera7fbd5a2016-06-16 09:17:49 -07004326 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004327
4328 return 0
4329
4330
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004331@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004332def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004333 """Show status of changelists.
4334
4335 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004336 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004337 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004338 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004339 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004340 - Magenta in the commit queue
4341 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004342 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004343
4344 Also see 'git cl comments'.
4345 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004346 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004347 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004348 parser.add_option('-f', '--fast', action='store_true',
4349 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004350 parser.add_option(
4351 '-j', '--maxjobs', action='store', type=int,
4352 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004353
4354 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004355 _add_codereview_issue_select_options(
4356 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004357 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004358 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004359 if args:
4360 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004361 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004362
iannuccie53c9352016-08-17 14:40:40 -07004363 if options.issue is not None and not options.field:
4364 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004365
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004366 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004367 cl = Changelist(auth_config=auth_config, issue=options.issue,
4368 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004369 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004370 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004371 elif options.field == 'id':
4372 issueid = cl.GetIssue()
4373 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004374 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004375 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004376 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004377 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004378 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004379 elif options.field == 'status':
4380 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004381 elif options.field == 'url':
4382 url = cl.GetIssueURL()
4383 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004384 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004385 return 0
4386
4387 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4388 if not branches:
4389 print('No local branch found.')
4390 return 0
4391
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004392 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004393 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004394 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004395 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004396 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004397 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004398 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004399
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004400 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004401 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4402 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4403 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004404 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004405 c, status = output.next()
4406 branch_statuses[c.GetBranch()] = status
4407 status = branch_statuses.pop(branch)
4408 url = cl.GetIssueURL()
4409 if url and (not status or status == 'error'):
4410 # The issue probably doesn't exist anymore.
4411 url += ' (broken)'
4412
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004413 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004414 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004415 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004416 color = ''
4417 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004418 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004419 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004420 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004421 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004422
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004423
4424 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004425 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004426 print('Current branch: %s' % branch)
4427 for cl in changes:
4428 if cl.GetBranch() == branch:
4429 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004430 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004431 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004432 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004433 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004434 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004435 print('Issue description:')
4436 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 return 0
4438
4439
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004440def colorize_CMDstatus_doc():
4441 """To be called once in main() to add colors to git cl status help."""
4442 colors = [i for i in dir(Fore) if i[0].isupper()]
4443
4444 def colorize_line(line):
4445 for color in colors:
4446 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004447 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004448 indent = len(line) - len(line.lstrip(' ')) + 1
4449 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4450 return line
4451
4452 lines = CMDstatus.__doc__.splitlines()
4453 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4454
4455
phajdan.jre328cf92016-08-22 04:12:17 -07004456def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004457 if path == '-':
4458 json.dump(contents, sys.stdout)
4459 else:
4460 with open(path, 'w') as f:
4461 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004462
4463
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004464@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004465@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004466def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004467 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468
4469 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004470 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004471 parser.add_option('-r', '--reverse', action='store_true',
4472 help='Lookup the branch(es) for the specified issues. If '
4473 'no issues are specified, all branches with mapped '
4474 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004475 parser.add_option('--json',
4476 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004477 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004478 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004479 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480
dnj@chromium.org406c4402015-03-03 17:22:28 +00004481 if options.reverse:
4482 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004483 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004484 # Reverse issue lookup.
4485 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004486
4487 git_config = {}
4488 for config in RunGit(['config', '--get-regexp',
4489 r'branch\..*issue']).splitlines():
4490 name, _space, val = config.partition(' ')
4491 git_config[name] = val
4492
dnj@chromium.org406c4402015-03-03 17:22:28 +00004493 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004494 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4495 config_key = _git_branch_config_key(ShortBranchName(branch),
4496 cls.IssueConfigKey())
4497 issue = git_config.get(config_key)
4498 if issue:
4499 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004500 if not args:
4501 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004502 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004503 for issue in args:
4504 if not issue:
4505 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004506 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004507 print('Branch for issue number %s: %s' % (
4508 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004509 if options.json:
4510 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004511 return 0
4512
4513 if len(args) > 0:
4514 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4515 if not issue.valid:
4516 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4517 'or no argument to list it.\n'
4518 'Maybe you want to run git cl status?')
4519 cl = Changelist(codereview=issue.codereview)
4520 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004521 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004522 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004523 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4524 if options.json:
4525 write_json(options.json, {
4526 'issue': cl.GetIssue(),
4527 'issue_url': cl.GetIssueURL(),
4528 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004529 return 0
4530
4531
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004532@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004533def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004534 """Shows or posts review comments for any changelist."""
4535 parser.add_option('-a', '--add-comment', dest='comment',
4536 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004537 parser.add_option('-p', '--publish', action='store_true',
4538 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004539 parser.add_option('-i', '--issue', dest='issue',
4540 help='review issue id (defaults to current issue). '
4541 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004542 parser.add_option('-m', '--machine-readable', dest='readable',
4543 action='store_false', default=True,
4544 help='output comments in a format compatible with '
4545 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004546 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004547 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004548 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004549 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004550 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004551 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004552 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004553
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004554 issue = None
4555 if options.issue:
4556 try:
4557 issue = int(options.issue)
4558 except ValueError:
4559 DieWithError('A review issue id is expected to be a number')
4560
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004561 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4562
4563 if not cl.IsGerrit():
4564 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004565
4566 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004567 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004568 return 0
4569
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004570 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4571 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004572 for comment in summary:
4573 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004574 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004575 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004576 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004577 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004578 color = Fore.MAGENTA
4579 else:
4580 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004581 print('\n%s%s %s%s\n%s' % (
4582 color,
4583 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4584 comment.sender,
4585 Fore.RESET,
4586 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4587
smut@google.comc85ac942015-09-15 16:34:43 +00004588 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004589 def pre_serialize(c):
4590 dct = c.__dict__.copy()
4591 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4592 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004593 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004594 return 0
4595
4596
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004597@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004598@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004599def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004600 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004601 parser.add_option('-d', '--display', action='store_true',
4602 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004603 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004604 help='New description to set for this issue (- for stdin, '
4605 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004606 parser.add_option('-f', '--force', action='store_true',
4607 help='Delete any unpublished Gerrit edits for this issue '
4608 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004609
4610 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004611 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004612 options, args = parser.parse_args(args)
4613 _process_codereview_select_options(parser, options)
4614
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004615 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004616 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004617 target_issue_arg = ParseIssueNumberArgument(args[0],
4618 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004619 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004620 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004621
martiniss6eda05f2016-06-30 10:18:35 -07004622 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004623 'auth_config': auth.extract_auth_config_from_options(options),
4624 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004625 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004626 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004627 if target_issue_arg:
4628 kwargs['issue'] = target_issue_arg.issue
4629 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004630 if target_issue_arg.codereview and not options.forced_codereview:
4631 detected_codereview_from_url = True
4632 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004633
4634 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004635 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004636 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004637 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004638
4639 if detected_codereview_from_url:
4640 logging.info('canonical issue/change URL: %s (type: %s)\n',
4641 cl.GetIssueURL(), target_issue_arg.codereview)
4642
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004643 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004644
smut@google.com34fb6b12015-07-13 20:03:26 +00004645 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004646 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004647 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004648
4649 if options.new_description:
4650 text = options.new_description
4651 if text == '-':
4652 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004653 elif text == '+':
4654 base_branch = cl.GetCommonAncestorWithUpstream()
4655 change = cl.GetChange(base_branch, None, local_description=True)
4656 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004657
4658 description.set_description(text)
4659 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004660 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004661
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004662 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004663 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004664 return 0
4665
4666
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004667@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004668def CMDlint(parser, args):
4669 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004670 parser.add_option('--filter', action='append', metavar='-x,+y',
4671 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004672 auth.add_auth_options(parser)
4673 options, args = parser.parse_args(args)
4674 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004675
4676 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004677 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004678 try:
4679 import cpplint
4680 import cpplint_chromium
4681 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004682 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004683 return 1
4684
4685 # Change the current working directory before calling lint so that it
4686 # shows the correct base.
4687 previous_cwd = os.getcwd()
4688 os.chdir(settings.GetRoot())
4689 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004690 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004691 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4692 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004693 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004694 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004695 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004696
4697 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004698 command = args + files
4699 if options.filter:
4700 command = ['--filter=' + ','.join(options.filter)] + command
4701 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004702
4703 white_regex = re.compile(settings.GetLintRegex())
4704 black_regex = re.compile(settings.GetLintIgnoreRegex())
4705 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4706 for filename in filenames:
4707 if white_regex.match(filename):
4708 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004709 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004710 else:
4711 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4712 extra_check_functions)
4713 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004714 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004715 finally:
4716 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004717 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004718 if cpplint._cpplint_state.error_count != 0:
4719 return 1
4720 return 0
4721
4722
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004723@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004724def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004725 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004726 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004727 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004728 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004729 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004730 parser.add_option('--all', action='store_true',
4731 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004732 parser.add_option('--parallel', action='store_true',
4733 help='Run all tests specified by input_api.RunTests in all '
4734 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004735 auth.add_auth_options(parser)
4736 options, args = parser.parse_args(args)
4737 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004738
sbc@chromium.org71437c02015-04-09 19:29:40 +00004739 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004740 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004741 return 1
4742
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004743 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004744 if args:
4745 base_branch = args[0]
4746 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004747 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004748 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004749
Aaron Gable8076c282017-11-29 14:39:41 -08004750 if options.all:
4751 base_change = cl.GetChange(base_branch, None)
4752 files = [('M', f) for f in base_change.AllFiles()]
4753 change = presubmit_support.GitChange(
4754 base_change.Name(),
4755 base_change.FullDescriptionText(),
4756 base_change.RepositoryRoot(),
4757 files,
4758 base_change.issue,
4759 base_change.patchset,
4760 base_change.author_email,
4761 base_change._upstream)
4762 else:
4763 change = cl.GetChange(base_branch, None)
4764
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004765 cl.RunHook(
4766 committing=not options.upload,
4767 may_prompt=False,
4768 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004769 change=change,
4770 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004771 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004772
4773
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004774def GenerateGerritChangeId(message):
4775 """Returns Ixxxxxx...xxx change id.
4776
4777 Works the same way as
4778 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4779 but can be called on demand on all platforms.
4780
4781 The basic idea is to generate git hash of a state of the tree, original commit
4782 message, author/committer info and timestamps.
4783 """
4784 lines = []
4785 tree_hash = RunGitSilent(['write-tree'])
4786 lines.append('tree %s' % tree_hash.strip())
4787 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4788 if code == 0:
4789 lines.append('parent %s' % parent.strip())
4790 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4791 lines.append('author %s' % author.strip())
4792 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4793 lines.append('committer %s' % committer.strip())
4794 lines.append('')
4795 # Note: Gerrit's commit-hook actually cleans message of some lines and
4796 # whitespace. This code is not doing this, but it clearly won't decrease
4797 # entropy.
4798 lines.append(message)
4799 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4800 stdin='\n'.join(lines))
4801 return 'I%s' % change_hash.strip()
4802
4803
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004804def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004805 """Computes the remote branch ref to use for the CL.
4806
4807 Args:
4808 remote (str): The git remote for the CL.
4809 remote_branch (str): The git remote branch for the CL.
4810 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004811 """
4812 if not (remote and remote_branch):
4813 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004814
wittman@chromium.org455dc922015-01-26 20:15:50 +00004815 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004816 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004817 # refs, which are then translated into the remote full symbolic refs
4818 # below.
4819 if '/' not in target_branch:
4820 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4821 else:
4822 prefix_replacements = (
4823 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4824 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4825 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4826 )
4827 match = None
4828 for regex, replacement in prefix_replacements:
4829 match = re.search(regex, target_branch)
4830 if match:
4831 remote_branch = target_branch.replace(match.group(0), replacement)
4832 break
4833 if not match:
4834 # This is a branch path but not one we recognize; use as-is.
4835 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004836 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4837 # Handle the refs that need to land in different refs.
4838 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004839
wittman@chromium.org455dc922015-01-26 20:15:50 +00004840 # Create the true path to the remote branch.
4841 # Does the following translation:
4842 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4843 # * refs/remotes/origin/master -> refs/heads/master
4844 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4845 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4846 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4847 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4848 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4849 'refs/heads/')
4850 elif remote_branch.startswith('refs/remotes/branch-heads'):
4851 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004852
wittman@chromium.org455dc922015-01-26 20:15:50 +00004853 return remote_branch
4854
4855
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004856def cleanup_list(l):
4857 """Fixes a list so that comma separated items are put as individual items.
4858
4859 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4860 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4861 """
4862 items = sum((i.split(',') for i in l), [])
4863 stripped_items = (i.strip() for i in items)
4864 return sorted(filter(None, stripped_items))
4865
4866
Aaron Gable4db38df2017-11-03 14:59:07 -07004867@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004868@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004869def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004870 """Uploads the current changelist to codereview.
4871
4872 Can skip dependency patchset uploads for a branch by running:
4873 git config branch.branch_name.skip-deps-uploads True
4874 To unset run:
4875 git config --unset branch.branch_name.skip-deps-uploads
4876 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004877
4878 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4879 a bug number, this bug number is automatically populated in the CL
4880 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004881
4882 If subject contains text in square brackets or has "<text>: " prefix, such
4883 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4884 [git-cl] add support for hashtags
4885 Foo bar: implement foo
4886 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004887 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004888 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4889 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004890 parser.add_option('--bypass-watchlists', action='store_true',
4891 dest='bypass_watchlists',
4892 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004893 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004894 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004895 parser.add_option('--message', '-m', dest='message',
4896 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004897 parser.add_option('-b', '--bug',
4898 help='pre-populate the bug number(s) for this issue. '
4899 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004900 parser.add_option('--message-file', dest='message_file',
4901 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004902 parser.add_option('--title', '-t', dest='title',
4903 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004904 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004905 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004906 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004907 parser.add_option('--tbrs',
4908 action='append', default=[],
4909 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004910 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004911 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004912 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004913 parser.add_option('--hashtag', dest='hashtags',
4914 action='append', default=[],
4915 help=('Gerrit hashtag for new CL; '
4916 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004917 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004918 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004919 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004920 help='tell the commit queue to commit this patchset; '
4921 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004922 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004923 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004924 metavar='TARGET',
4925 help='Apply CL to remote ref TARGET. ' +
4926 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004927 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004928 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004929 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004930 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004931 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004932 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004933 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4934 const='TBR', help='add a set of OWNERS to TBR')
4935 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4936 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004937 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4938 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004939 help='Send the patchset to do a CQ dry run right after '
4940 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004941 parser.add_option('--dependencies', action='store_true',
4942 help='Uploads CLs of all the local branches that depend on '
4943 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004944 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4945 help='Sends your change to the CQ after an approval. Only '
4946 'works on repos that have the Auto-Submit label '
4947 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004948 parser.add_option('--parallel', action='store_true',
4949 help='Run all tests specified by input_api.RunTests in all '
4950 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004951
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004952 parser.add_option('--no-autocc', action='store_true',
4953 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004954 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004955 help='Set the review private. This implies --no-autocc.')
4956
rmistry@google.com2dd99862015-06-22 12:22:18 +00004957 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004958 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004959 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004960 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004961 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004962 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004963
sbc@chromium.org71437c02015-04-09 19:29:40 +00004964 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004965 return 1
4966
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004967 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004968 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004969 options.cc = cleanup_list(options.cc)
4970
tandriib80458a2016-06-23 12:20:07 -07004971 if options.message_file:
4972 if options.message:
4973 parser.error('only one of --message and --message-file allowed.')
4974 options.message = gclient_utils.FileRead(options.message_file)
4975 options.message_file = None
4976
tandrii4d0545a2016-07-06 03:56:49 -07004977 if options.cq_dry_run and options.use_commit_queue:
4978 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4979
Aaron Gableedbc4132017-09-11 13:22:28 -07004980 if options.use_commit_queue:
4981 options.send_mail = True
4982
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004983 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4984 settings.GetIsGerrit()
4985
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004986 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004987 if not cl.IsGerrit():
4988 # Error out with instructions for repos not yet configured for Gerrit.
4989 print('=====================================')
4990 print('NOTICE: Rietveld is no longer supported. '
4991 'You can upload changes to Gerrit with')
4992 print(' git cl upload --gerrit')
4993 print('or set Gerrit to be your default code review tool with')
4994 print(' git config gerrit.host true')
4995 print('=====================================')
4996 return 1
4997
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004998 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004999
5000
Francois Dorayd42c6812017-05-30 15:10:20 -04005001@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005002@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005003def CMDsplit(parser, args):
5004 """Splits a branch into smaller branches and uploads CLs.
5005
5006 Creates a branch and uploads a CL for each group of files modified in the
5007 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005008 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005009 the shared OWNERS file.
5010 """
5011 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005012 help="A text file containing a CL description in which "
5013 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005014 parser.add_option("-c", "--comment", dest="comment_file",
5015 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11005016 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
5017 default=False,
5018 help="List the files and reviewers for each CL that would "
5019 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00005020 parser.add_option("--cq-dry-run", action='store_true',
5021 help="If set, will do a cq dry run for each uploaded CL. "
5022 "Please be careful when doing this; more than ~10 CLs "
5023 "has the potential to overload our build "
5024 "infrastructure. Try to upload these not during high "
5025 "load times (usually 11-3 Mountain View time). Email "
5026 "infra-dev@chromium.org with any questions.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005027 options, _ = parser.parse_args(args)
5028
5029 if not options.description_file:
5030 parser.error('No --description flag specified.')
5031
5032 def WrappedCMDupload(args):
5033 return CMDupload(OptionParser(), args)
5034
5035 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00005036 Changelist, WrappedCMDupload, options.dry_run,
5037 options.cq_dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005038
5039
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005040@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005041@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005042def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005043 """DEPRECATED: Used to commit the current changelist via git-svn."""
5044 message = ('git-cl no longer supports committing to SVN repositories via '
5045 'git-svn. You probably want to use `git cl land` instead.')
5046 print(message)
5047 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005048
5049
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005050# Two special branches used by git cl land.
5051MERGE_BRANCH = 'git-cl-commit'
5052CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5053
5054
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005055@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005056@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005057def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005058 """Commits the current changelist via git.
5059
5060 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5061 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005062 """
5063 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5064 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005065 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005066 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005067 parser.add_option('--parallel', action='store_true',
5068 help='Run all tests specified by input_api.RunTests in all '
5069 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005070 auth.add_auth_options(parser)
5071 (options, args) = parser.parse_args(args)
5072 auth_config = auth.extract_auth_config_from_options(options)
5073
5074 cl = Changelist(auth_config=auth_config)
5075
Robert Iannucci2e73d432018-03-14 01:10:47 -07005076 if not cl.IsGerrit():
5077 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005078
Robert Iannucci2e73d432018-03-14 01:10:47 -07005079 if not cl.GetIssue():
5080 DieWithError('You must upload the change first to Gerrit.\n'
5081 ' If you would rather have `git cl land` upload '
5082 'automatically for you, see http://crbug.com/642759')
5083 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02005084 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005085
5086
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005087@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005088@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005089def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005090 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005091 parser.add_option('-b', dest='newbranch',
5092 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005093 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005094 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005095 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005096 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005097 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005098 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005099 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005100 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005101 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005102 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005103
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005104
5105 group = optparse.OptionGroup(
5106 parser,
5107 'Options for continuing work on the current issue uploaded from a '
5108 'different clone (e.g. different machine). Must be used independently '
5109 'from the other options. No issue number should be specified, and the '
5110 'branch must have an issue number associated with it')
5111 group.add_option('--reapply', action='store_true', dest='reapply',
5112 help='Reset the branch and reapply the issue.\n'
5113 'CAUTION: This will undo any local changes in this '
5114 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005115
5116 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005117 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005118 parser.add_option_group(group)
5119
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005120 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005121 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005122 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005123 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005124 auth_config = auth.extract_auth_config_from_options(options)
5125
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005126 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005127 if options.newbranch:
5128 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005129 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005130 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005131
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005132 cl = Changelist(auth_config=auth_config,
5133 codereview=options.forced_codereview)
5134 if not cl.GetIssue():
5135 parser.error('current branch must have an associated issue')
5136
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005137 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005138 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005139 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005140
5141 RunGit(['reset', '--hard', upstream])
5142 if options.pull:
5143 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005144
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005145 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5146 options.directory)
5147
5148 if len(args) != 1 or not args[0]:
5149 parser.error('Must specify issue number or url')
5150
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005151 target_issue_arg = ParseIssueNumberArgument(args[0],
5152 options.forced_codereview)
5153 if not target_issue_arg.valid:
5154 parser.error('invalid codereview url or CL id')
5155
5156 cl_kwargs = {
5157 'auth_config': auth_config,
5158 'codereview_host': target_issue_arg.hostname,
5159 'codereview': options.forced_codereview,
5160 }
5161 detected_codereview_from_url = False
5162 if target_issue_arg.codereview and not options.forced_codereview:
5163 detected_codereview_from_url = True
5164 cl_kwargs['codereview'] = target_issue_arg.codereview
5165 cl_kwargs['issue'] = target_issue_arg.issue
5166
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005167 # We don't want uncommitted changes mixed up with the patch.
5168 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005169 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005170
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005171 if options.newbranch:
5172 if options.force:
5173 RunGit(['branch', '-D', options.newbranch],
5174 stderr=subprocess2.PIPE, error_ok=True)
5175 RunGit(['new-branch', options.newbranch])
5176
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005177 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005178
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005179 if cl.IsGerrit():
5180 if options.reject:
5181 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005182 if options.directory:
5183 parser.error('--directory is not supported with Gerrit codereview.')
5184
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005185 if detected_codereview_from_url:
5186 print('canonical issue/change URL: %s (type: %s)\n' %
5187 (cl.GetIssueURL(), target_issue_arg.codereview))
5188
5189 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005190 options.nocommit, options.directory,
5191 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192
5193
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005194def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005195 """Fetches the tree status and returns either 'open', 'closed',
5196 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005197 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198 if url:
5199 status = urllib2.urlopen(url).read().lower()
5200 if status.find('closed') != -1 or status == '0':
5201 return 'closed'
5202 elif status.find('open') != -1 or status == '1':
5203 return 'open'
5204 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005205 return 'unset'
5206
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005207
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208def GetTreeStatusReason():
5209 """Fetches the tree status from a json url and returns the message
5210 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005211 url = settings.GetTreeStatusUrl()
5212 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005213 connection = urllib2.urlopen(json_url)
5214 status = json.loads(connection.read())
5215 connection.close()
5216 return status['message']
5217
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005218
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005219@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005220def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005221 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005222 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005223 status = GetTreeStatus()
5224 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005225 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005226 return 2
5227
vapiera7fbd5a2016-06-16 09:17:49 -07005228 print('The tree is %s' % status)
5229 print()
5230 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005231 if status != 'open':
5232 return 1
5233 return 0
5234
5235
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005236@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005237def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005238 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005239 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005240 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005241 '-b', '--bot', action='append',
5242 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5243 'times to specify multiple builders. ex: '
5244 '"-b win_rel -b win_layout". See '
5245 'the try server waterfall for the builders name and the tests '
5246 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005247 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005248 '-B', '--bucket', default='',
5249 help=('Buildbucket bucket to send the try requests.'))
5250 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005251 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005252 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005253 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005254 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005255 help='Revision to use for the try job; default: the revision will '
5256 'be determined by the try recipe that builder runs, which usually '
5257 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005258 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005259 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005260 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005261 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005262 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005263 '--category', default='git_cl_try', help='Specify custom build category.')
5264 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005265 '--project',
5266 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005267 'in recipe to determine to which repository or directory to '
5268 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005269 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005270 '-p', '--property', dest='properties', action='append', default=[],
5271 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005272 'key2=value2 etc. The value will be treated as '
5273 'json if decodable, or as string otherwise. '
5274 'NOTE: using this may make your try job not usable for CQ, '
5275 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005276 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005277 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5278 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005279 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005280 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005281 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005282 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005283 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005284 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005285
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005286 if options.master and options.master.startswith('luci.'):
5287 parser.error(
5288 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005289 # Make sure that all properties are prop=value pairs.
5290 bad_params = [x for x in options.properties if '=' not in x]
5291 if bad_params:
5292 parser.error('Got properties with missing "=": %s' % bad_params)
5293
maruel@chromium.org15192402012-09-06 12:38:29 +00005294 if args:
5295 parser.error('Unknown arguments: %s' % args)
5296
Koji Ishii31c14782018-01-08 17:17:33 +09005297 cl = Changelist(auth_config=auth_config, issue=options.issue,
5298 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005299 if not cl.GetIssue():
5300 parser.error('Need to upload first')
5301
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005302 if cl.IsGerrit():
5303 # HACK: warm up Gerrit change detail cache to save on RPCs.
5304 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5305
tandriie113dfd2016-10-11 10:20:12 -07005306 error_message = cl.CannotTriggerTryJobReason()
5307 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005308 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005309
borenet6c0efe62016-10-19 08:13:29 -07005310 if options.bucket and options.master:
5311 parser.error('Only one of --bucket and --master may be used.')
5312
qyearsley1fdfcb62016-10-24 13:22:03 -07005313 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005314
qyearsleydd49f942016-10-28 11:57:22 -07005315 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5316 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005317 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005318 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005319 print('git cl try with no bots now defaults to CQ dry run.')
5320 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5321 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005322
borenet6c0efe62016-10-19 08:13:29 -07005323 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005324 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005325 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005326 'of bot requires an initial job from a parent (usually a builder). '
5327 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005328 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005329 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005330
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005331 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07005332 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005333 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005334 except BuildbucketResponseException as ex:
5335 print('ERROR: %s' % ex)
5336 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005337 return 0
5338
5339
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005340@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005341def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005342 """Prints info about try jobs associated with current CL."""
5343 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005344 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005345 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005346 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005347 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005348 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005349 '--color', action='store_true', default=setup_color.IS_TTY,
5350 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005351 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005352 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5353 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005354 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005355 '--json', help=('Path of JSON output file to write try job results to,'
5356 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005357 parser.add_option_group(group)
5358 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005359 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005360 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005361 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005362 if args:
5363 parser.error('Unrecognized args: %s' % ' '.join(args))
5364
5365 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005366 cl = Changelist(
5367 issue=options.issue, codereview=options.forced_codereview,
5368 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005369 if not cl.GetIssue():
5370 parser.error('Need to upload first')
5371
tandrii221ab252016-10-06 08:12:04 -07005372 patchset = options.patchset
5373 if not patchset:
5374 patchset = cl.GetMostRecentPatchset()
5375 if not patchset:
5376 parser.error('Codereview doesn\'t know about issue %s. '
5377 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005378 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005379 cl.GetIssue())
5380
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005381 try:
tandrii221ab252016-10-06 08:12:04 -07005382 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005383 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005384 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005385 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005386 if options.json:
5387 write_try_results_json(options.json, jobs)
5388 else:
5389 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005390 return 0
5391
5392
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005393@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005394@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005395def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005396 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005397 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005398 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005399 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005400
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005401 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005402 if args:
5403 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005404 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005405 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005406 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005407 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005408
5409 # Clear configured merge-base, if there is one.
5410 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005411 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005412 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005413 return 0
5414
5415
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005416@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005417def CMDweb(parser, args):
5418 """Opens the current CL in the web browser."""
5419 _, args = parser.parse_args(args)
5420 if args:
5421 parser.error('Unrecognized args: %s' % ' '.join(args))
5422
5423 issue_url = Changelist().GetIssueURL()
5424 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005425 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005426 return 1
5427
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005428 # Redirect I/O before invoking browser to hide its output. For example, this
5429 # allows to hide "Created new window in existing browser session." message
5430 # from Chrome. Based on https://stackoverflow.com/a/2323563.
5431 saved_stdout = os.dup(1)
5432 os.close(1)
5433 os.open(os.devnull, os.O_RDWR)
5434 try:
5435 webbrowser.open(issue_url)
5436 finally:
5437 os.dup2(saved_stdout, 1)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005438 return 0
5439
5440
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005441@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005442def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005443 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005444 parser.add_option('-d', '--dry-run', action='store_true',
5445 help='trigger in dry run mode')
5446 parser.add_option('-c', '--clear', action='store_true',
5447 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005448 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005449 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005450 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005451 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005452 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005453 if args:
5454 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005455 if options.dry_run and options.clear:
5456 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5457
iannuccie53c9352016-08-17 14:40:40 -07005458 cl = Changelist(auth_config=auth_config, issue=options.issue,
5459 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005460 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005461 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005462 elif options.dry_run:
5463 state = _CQState.DRY_RUN
5464 else:
5465 state = _CQState.COMMIT
5466 if not cl.GetIssue():
5467 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005468 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005469 return 0
5470
5471
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005472@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005473def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005474 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005475 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005476 auth.add_auth_options(parser)
5477 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005478 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005479 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005480 if args:
5481 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005482 cl = Changelist(auth_config=auth_config, issue=options.issue,
5483 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005484 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005485 if not cl.GetIssue():
5486 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005487 cl.CloseIssue()
5488 return 0
5489
5490
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005491@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005492def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005493 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005494 parser.add_option(
5495 '--stat',
5496 action='store_true',
5497 dest='stat',
5498 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005499 auth.add_auth_options(parser)
5500 options, args = parser.parse_args(args)
5501 auth_config = auth.extract_auth_config_from_options(options)
5502 if args:
5503 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005504
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005505 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005506 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005507 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005508 if not issue:
5509 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005510
Aaron Gablea718c3e2017-08-28 17:47:28 -07005511 base = cl._GitGetBranchConfigValue('last-upload-hash')
5512 if not base:
5513 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5514 if not base:
5515 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5516 revision_info = detail['revisions'][detail['current_revision']]
5517 fetch_info = revision_info['fetch']['http']
5518 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5519 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005520
Aaron Gablea718c3e2017-08-28 17:47:28 -07005521 cmd = ['git', 'diff']
5522 if options.stat:
5523 cmd.append('--stat')
5524 cmd.append(base)
5525 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005526
5527 return 0
5528
5529
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005530@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005531def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005532 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005533 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005534 '--ignore-current',
5535 action='store_true',
5536 help='Ignore the CL\'s current reviewers and start from scratch.')
5537 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005538 '--no-color',
5539 action='store_true',
5540 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005541 parser.add_option(
5542 '--batch',
5543 action='store_true',
5544 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005545 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005546 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005547 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005548
5549 author = RunGit(['config', 'user.email']).strip() or None
5550
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005551 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005552
5553 if args:
5554 if len(args) > 1:
5555 parser.error('Unknown args')
5556 base_branch = args[0]
5557 else:
5558 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005559 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005560
5561 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005562 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5563
5564 if options.batch:
5565 db = owners.Database(change.RepositoryRoot(), file, os.path)
5566 print('\n'.join(db.reviewers_for(affected_files, author)))
5567 return 0
5568
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005569 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005570 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005571 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005572 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005573 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005574 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005575 disable_color=options.no_color,
5576 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005577
5578
Aiden Bennerc08566e2018-10-03 17:52:42 +00005579def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005580 """Generates a diff command."""
5581 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005582 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5583
5584 if not allow_prefix:
5585 diff_cmd += ['--no-prefix']
5586
5587 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005588
5589 if args:
5590 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005591 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005592 diff_cmd.append(arg)
5593 else:
5594 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005595
5596 return diff_cmd
5597
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005598
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005599def MatchingFileType(file_name, extensions):
5600 """Returns true if the file name ends with one of the given extensions."""
5601 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005602
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005603
enne@chromium.org555cfe42014-01-29 18:21:39 +00005604@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005605@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005606def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005607 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005608 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005609 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005610 parser.add_option('--full', action='store_true',
5611 help='Reformat the full content of all touched files')
5612 parser.add_option('--dry-run', action='store_true',
5613 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005614 parser.add_option('--python', action='store_true',
5615 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005616 parser.add_option('--js', action='store_true',
5617 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005618 parser.add_option('--diff', action='store_true',
5619 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005620 parser.add_option('--presubmit', action='store_true',
5621 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005622 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005623
Daniel Chengc55eecf2016-12-30 03:11:02 -08005624 # Normalize any remaining args against the current path, so paths relative to
5625 # the current directory are still resolved as expected.
5626 args = [os.path.join(os.getcwd(), arg) for arg in args]
5627
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005628 # git diff generates paths against the root of the repository. Change
5629 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005630 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005631 if rel_base_path:
5632 os.chdir(rel_base_path)
5633
digit@chromium.org29e47272013-05-17 17:01:46 +00005634 # Grab the merge-base commit, i.e. the upstream commit of the current
5635 # branch when it was created or the last time it was rebased. This is
5636 # to cover the case where the user may have called "git fetch origin",
5637 # moving the origin branch to a newer commit, but hasn't rebased yet.
5638 upstream_commit = None
5639 cl = Changelist()
5640 upstream_branch = cl.GetUpstreamBranch()
5641 if upstream_branch:
5642 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5643 upstream_commit = upstream_commit.strip()
5644
5645 if not upstream_commit:
5646 DieWithError('Could not find base commit for this branch. '
5647 'Are you in detached state?')
5648
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005649 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5650 diff_output = RunGit(changed_files_cmd)
5651 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005652 # Filter out files deleted by this CL
5653 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005654
Christopher Lamc5ba6922017-01-24 11:19:14 +11005655 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005656 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005657
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005658 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5659 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5660 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005661 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005662
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005663 top_dir = os.path.normpath(
5664 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5665
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005666 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5667 # formatted. This is used to block during the presubmit.
5668 return_value = 0
5669
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005670 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005671 # Locate the clang-format binary in the checkout
5672 try:
5673 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005674 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005675 DieWithError(e)
5676
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005677 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005678 cmd = [clang_format_tool]
5679 if not opts.dry_run and not opts.diff:
5680 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005681 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005682 if opts.diff:
5683 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005684 else:
5685 env = os.environ.copy()
5686 env['PATH'] = str(os.path.dirname(clang_format_tool))
5687 try:
5688 script = clang_format.FindClangFormatScriptInChromiumTree(
5689 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005690 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005691 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005692
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005693 cmd = [sys.executable, script, '-p0']
5694 if not opts.dry_run and not opts.diff:
5695 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005696
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005697 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5698 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005699
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005700 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5701 if opts.diff:
5702 sys.stdout.write(stdout)
5703 if opts.dry_run and len(stdout) > 0:
5704 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005705
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005706 # Similar code to above, but using yapf on .py files rather than clang-format
5707 # on C/C++ files
Aiden Bennerc08566e2018-10-03 17:52:42 +00005708 if opts.python and python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005709 yapf_tool = gclient_utils.FindExecutable('yapf')
5710 if yapf_tool is None:
5711 DieWithError('yapf not found in PATH')
5712
Aiden Bennerc08566e2018-10-03 17:52:42 +00005713 # If we couldn't find a yapf file we'll default to the chromium style
5714 # specified in depot_tools.
5715 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5716 chromium_default_yapf_style = os.path.join(depot_tools_path,
5717 YAPF_CONFIG_FILENAME)
5718
5719 # Note: yapf still seems to fix indentation of the entire file
5720 # even if line ranges are specified.
5721 # See https://github.com/google/yapf/issues/499
5722 if not opts.full:
5723 py_line_diffs = _ComputeDiffLineRanges(python_diff_files, upstream_commit)
5724
5725 # Used for caching.
5726 yapf_configs = {}
5727 for f in python_diff_files:
5728 # Find the yapf style config for the current file, defaults to depot
5729 # tools default.
5730 yapf_config = _FindYapfConfigFile(
5731 os.path.abspath(f), yapf_configs, top_dir,
5732 chromium_default_yapf_style)
5733
5734 cmd = [yapf_tool, '--style', yapf_config, f]
5735
5736 has_formattable_lines = False
5737 if not opts.full:
5738 # Only run yapf over changed line ranges.
5739 for diff_start, diff_len in py_line_diffs[f]:
5740 diff_end = diff_start + diff_len - 1
5741 # Yapf errors out if diff_end < diff_start but this
5742 # is a valid line range diff for a removal.
5743 if diff_end >= diff_start:
5744 has_formattable_lines = True
5745 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5746 # If all line diffs were removals we have nothing to format.
5747 if not has_formattable_lines:
5748 continue
5749
5750 if opts.diff or opts.dry_run:
5751 cmd += ['--diff']
5752 # Will return non-zero exit code if non-empty diff.
5753 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5754 if opts.diff:
5755 sys.stdout.write(stdout)
5756 elif len(stdout) > 0:
5757 return_value = 2
5758 else:
5759 cmd += ['-i']
5760 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005761
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005762 # Dart's formatter does not have the nice property of only operating on
5763 # modified chunks, so hard code full.
5764 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005765 try:
5766 command = [dart_format.FindDartFmtToolInChromiumTree()]
5767 if not opts.dry_run and not opts.diff:
5768 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005769 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005770
ppi@chromium.org6593d932016-03-03 15:41:15 +00005771 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005772 if opts.dry_run and stdout:
5773 return_value = 2
5774 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005775 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5776 'found in this checkout. Files in other languages are still '
5777 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005778
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005779 # Format GN build files. Always run on full build files for canonical form.
5780 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005781 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005782 if opts.dry_run or opts.diff:
5783 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005784 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005785 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5786 shell=sys.platform == 'win32',
5787 cwd=top_dir)
5788 if opts.dry_run and gn_ret == 2:
5789 return_value = 2 # Not formatted.
5790 elif opts.diff and gn_ret == 2:
5791 # TODO this should compute and print the actual diff.
5792 print("This change has GN build file diff for " + gn_diff_file)
5793 elif gn_ret != 0:
5794 # For non-dry run cases (and non-2 return values for dry-run), a
5795 # nonzero error code indicates a failure, probably because the file
5796 # doesn't parse.
5797 DieWithError("gn format failed on " + gn_diff_file +
5798 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005799
Ilya Shermane081cbe2017-08-15 17:51:04 -07005800 # Skip the metrics formatting from the global presubmit hook. These files have
5801 # a separate presubmit hook that issues an error if the files need formatting,
5802 # whereas the top-level presubmit script merely issues a warning. Formatting
5803 # these files is somewhat slow, so it's important not to duplicate the work.
5804 if not opts.presubmit:
5805 for xml_dir in GetDirtyMetricsDirs(diff_files):
5806 tool_dir = os.path.join(top_dir, xml_dir)
5807 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5808 if opts.dry_run or opts.diff:
5809 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005810 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005811 if opts.diff:
5812 sys.stdout.write(stdout)
5813 if opts.dry_run and stdout:
5814 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005815
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005816 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005817
Steven Holte2e664bf2017-04-21 13:10:47 -07005818def GetDirtyMetricsDirs(diff_files):
5819 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5820 metrics_xml_dirs = [
5821 os.path.join('tools', 'metrics', 'actions'),
5822 os.path.join('tools', 'metrics', 'histograms'),
5823 os.path.join('tools', 'metrics', 'rappor'),
5824 os.path.join('tools', 'metrics', 'ukm')]
5825 for xml_dir in metrics_xml_dirs:
5826 if any(file.startswith(xml_dir) for file in xml_diff_files):
5827 yield xml_dir
5828
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005829
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005830@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005831@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005832def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005833 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005834 _, args = parser.parse_args(args)
5835
5836 if len(args) != 1:
5837 parser.print_help()
5838 return 1
5839
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005840 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005841 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005842 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005843
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005844 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005845
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005846 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005847 output = RunGit(['config', '--local', '--get-regexp',
5848 r'branch\..*\.%s' % issueprefix],
5849 error_ok=True)
5850 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005851 if issue == target_issue:
5852 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005853
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005854 branches = []
5855 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005856 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005857 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005858 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005859 return 1
5860 if len(branches) == 1:
5861 RunGit(['checkout', branches[0]])
5862 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005863 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005864 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005865 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005866 which = raw_input('Choose by index: ')
5867 try:
5868 RunGit(['checkout', branches[int(which)]])
5869 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005870 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005871 return 1
5872
5873 return 0
5874
5875
maruel@chromium.org29404b52014-09-08 22:58:00 +00005876def CMDlol(parser, args):
5877 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005878 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005879 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5880 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5881 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005882 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005883 return 0
5884
5885
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005886class OptionParser(optparse.OptionParser):
5887 """Creates the option parse and add --verbose support."""
5888 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005889 optparse.OptionParser.__init__(
5890 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005891 self.add_option(
5892 '-v', '--verbose', action='count', default=0,
5893 help='Use 2 times for more debugging info')
5894
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005895 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005896 try:
5897 return self._parse_args(args)
5898 finally:
5899 # Regardless of success or failure of args parsing, we want to report
5900 # metrics, but only after logging has been initialized (if parsing
5901 # succeeded).
5902 global settings
5903 settings = Settings()
5904
5905 if not metrics.DISABLE_METRICS_COLLECTION:
5906 # GetViewVCUrl ultimately calls logging method.
5907 project_url = settings.GetViewVCUrl().strip('/+')
5908 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5909 metrics.collector.add('project_urls', [project_url])
5910
5911 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005912 # Create an optparse.Values object that will store only the actual passed
5913 # options, without the defaults.
5914 actual_options = optparse.Values()
5915 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5916 # Create an optparse.Values object with the default options.
5917 options = optparse.Values(self.get_default_values().__dict__)
5918 # Update it with the options passed by the user.
5919 options._update_careful(actual_options.__dict__)
5920 # Store the options passed by the user in an _actual_options attribute.
5921 # We store only the keys, and not the values, since the values can contain
5922 # arbitrary information, which might be PII.
5923 metrics.collector.add('arguments', actual_options.__dict__.keys())
5924
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005925 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005926 logging.basicConfig(
5927 level=levels[min(options.verbose, len(levels) - 1)],
5928 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5929 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005930
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005931 return options, args
5932
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005933
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005934def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005935 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005936 print('\nYour python version %s is unsupported, please upgrade.\n' %
5937 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005938 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005939
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005940 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005941 dispatcher = subcommand.CommandDispatcher(__name__)
5942 try:
5943 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005944 except auth.AuthenticationError as e:
5945 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005946 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005947 if e.code != 500:
5948 raise
5949 DieWithError(
5950 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5951 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005952 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005953
5954
5955if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005956 # These affect sys.stdout so do it outside of main() to simplify mocks in
5957 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005958 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005959 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005960 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005961 sys.exit(main(sys.argv[1:]))