blob: 176e0b715959fef331f060f2e6726cb2e9be4a50 [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
Edward Lemurfec80c42018-11-01 23:14:14 +000032import time
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000033import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000035import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000036import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000037import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000038import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000039
40try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080041 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000042except ImportError:
43 pass
44
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000045from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000046from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000047from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000048import auth
skobes6468b902016-10-24 08:45:10 -070049import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000050import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000051import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000052import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000053import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000054import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000055import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000056import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000057import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000058import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000059import metrics
Edward Lesmes93277a72018-10-18 22:04:26 +000060import metrics_utils
piman@chromium.org336f9122014-09-04 02:16:55 +000061import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000062import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000064import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040066import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000067import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000068import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000069import watchlists
70
tandrii7400cf02016-06-21 08:48:07 -070071__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000072
tandrii9d2c7a32016-06-22 03:42:45 -070073COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070074DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080075POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000076DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000077REFS_THAT_ALIAS_TO_OTHER_REFS = {
78 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
79 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
80}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000081
thestig@chromium.org44202a22014-03-11 19:22:18 +000082# Valid extensions for files we want to lint.
83DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
84DEFAULT_LINT_IGNORE_REGEX = r"$^"
85
Aiden Bennerc08566e2018-10-03 17:52:42 +000086# File name for yapf style config files.
87YAPF_CONFIG_FILENAME = '.style.yapf'
88
borenet6c0efe62016-10-19 08:13:29 -070089# Buildbucket master name prefix.
90MASTER_PREFIX = 'master.'
91
Edward Lemur83bd7f42018-10-10 00:14:21 +000092# TODO(crbug.com/881860): Remove
93# Log gerrit failures to a gerrit_util.GERRIT_ERR_LOG_FILE.
94GERRIT_ERR_LOGGER = logging.getLogger('GerritErrorLogs')
95
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000096# Shortcut since it quickly becomes redundant.
97Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000098
maruel@chromium.orgddd59412011-11-30 14:20:38 +000099# Initialized in main()
100settings = None
101
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100102# Used by tests/git_cl_test.py to add extra logging.
103# Inside the weirdly failing test, add this:
104# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700105# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100106_IS_BEING_TESTED = False
107
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000108
Christopher Lamf732cd52017-01-24 12:40:11 +1100109def DieWithError(message, change_desc=None):
110 if change_desc:
111 SaveDescriptionBackup(change_desc)
112
vapiera7fbd5a2016-06-16 09:17:49 -0700113 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000114 sys.exit(1)
115
116
Christopher Lamf732cd52017-01-24 12:40:11 +1100117def SaveDescriptionBackup(change_desc):
118 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000119 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100120 backup_file = open(backup_path, 'w')
121 backup_file.write(change_desc.description)
122 backup_file.close()
123
124
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000125def GetNoGitPagerEnv():
126 env = os.environ.copy()
127 # 'cat' is a magical git string that disables pagers on all platforms.
128 env['GIT_PAGER'] = 'cat'
129 return env
130
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000131
bsep@chromium.org627d9002016-04-29 00:00:52 +0000132def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000133 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000134 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000135 except subprocess2.CalledProcessError as e:
136 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000137 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000138 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000139 'Command "%s" failed.\n%s' % (
140 ' '.join(args), error_message or e.stdout or ''))
141 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000142
143
144def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000145 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000146 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000147
148
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000149def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000150 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700151 if suppress_stderr:
152 stderr = subprocess2.VOID
153 else:
154 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000155 try:
tandrii5d48c322016-08-18 16:19:37 -0700156 (out, _), code = subprocess2.communicate(['git'] + args,
157 env=GetNoGitPagerEnv(),
158 stdout=subprocess2.PIPE,
159 stderr=stderr)
160 return code, out
161 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900162 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700163 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000164
165
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000166def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000167 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000168 return RunGitWithCode(args, suppress_stderr=True)[1]
169
170
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000171def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000172 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000173 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000174 return (version.startswith(prefix) and
175 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000176
177
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000178def BranchExists(branch):
179 """Return True if specified branch exists."""
180 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
181 suppress_stderr=True)
182 return not code
183
184
tandrii2a16b952016-10-19 07:09:44 -0700185def time_sleep(seconds):
186 # Use this so that it can be mocked in tests without interfering with python
187 # system machinery.
tandrii2a16b952016-10-19 07:09:44 -0700188 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()
Edward Lemurfec80c42018-11-01 23:14:14 +00003011 before_push = time.time()
3012 push_returncode = 0
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003013 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003014 ['git', 'push', self.GetRemoteUrl(), refspec],
Edward Lemur83bd7f42018-10-10 00:14:21 +00003015 print_stdout=False,
3016 filter_fn=filter_fn,
3017 env=env)
Edward Lemurfec80c42018-11-01 23:14:14 +00003018 except subprocess2.CalledProcessError as e:
3019 push_returncode = e.returncode
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003020 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003021 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003022 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003023 'credential problems:\n'
3024 ' git cl creds-check\n',
3025 change_desc)
Edward Lemurfec80c42018-11-01 23:14:14 +00003026 finally:
3027 metrics.collector.add_repeated('sub_commands', {
3028 'command': 'git push',
3029 'execution_time': time.time() - before_push,
3030 'exit_code': push_returncode,
3031 'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
3032 })
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003033
3034 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003035 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003036 change_numbers = [m.group(1)
3037 for m in map(regex.match, push_stdout.splitlines())
3038 if m]
3039 if len(change_numbers) != 1:
3040 DieWithError(
3041 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003042 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003043 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003044 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003045
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003046 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003047 # GetIssue() is not set in case of non-squash uploads according to tests.
3048 # TODO(agable): non-squash uploads in git cl should be removed.
3049 gerrit_util.AddReviewers(
3050 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003051 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003052 reviewers, cc,
3053 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003054
Aaron Gablefd238082017-06-07 13:42:34 -07003055 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003056 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3057 score = 1
3058 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3059 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3060 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003061 gerrit_util.SetReview(
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003062 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003063 self._GerritChangeIdentifier(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003064 msg='Self-approving for TBR',
3065 labels={'Code-Review': score})
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00003066 # Labels aren't set through refspec only if tbr is set (see check above).
3067 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
3068 options.cq_dry_run)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003069 return 0
3070
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003071 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3072 change_desc):
3073 """Computes parent of the generated commit to be uploaded to Gerrit.
3074
3075 Returns revision or a ref name.
3076 """
3077 if custom_cl_base:
3078 # Try to avoid creating additional unintended CLs when uploading, unless
3079 # user wants to take this risk.
3080 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3081 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3082 local_ref_of_target_remote])
3083 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003084 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003085 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3086 'If you proceed with upload, more than 1 CL may be created by '
3087 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3088 'If you are certain that specified base `%s` has already been '
3089 'uploaded to Gerrit as another CL, you may proceed.\n' %
3090 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3091 if not force:
3092 confirm_or_exit(
3093 'Do you take responsibility for cleaning up potential mess '
3094 'resulting from proceeding with upload?',
3095 action='upload')
3096 return custom_cl_base
3097
Aaron Gablef97e33d2017-03-30 15:44:27 -07003098 if remote != '.':
3099 return self.GetCommonAncestorWithUpstream()
3100
3101 # If our upstream branch is local, we base our squashed commit on its
3102 # squashed version.
3103 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3104
Aaron Gablef97e33d2017-03-30 15:44:27 -07003105 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003106 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003107
3108 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003109 # TODO(tandrii): consider checking parent change in Gerrit and using its
3110 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3111 # the tree hash of the parent branch. The upside is less likely bogus
3112 # requests to reupload parent change just because it's uploadhash is
3113 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003114 parent = RunGit(['config',
3115 'branch.%s.gerritsquashhash' % upstream_branch_name],
3116 error_ok=True).strip()
3117 # Verify that the upstream branch has been uploaded too, otherwise
3118 # Gerrit will create additional CLs when uploading.
3119 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3120 RunGitSilent(['rev-parse', parent + ':'])):
3121 DieWithError(
3122 '\nUpload upstream branch %s first.\n'
3123 'It is likely that this branch has been rebased since its last '
3124 'upload, so you just need to upload it again.\n'
3125 '(If you uploaded it with --no-squash, then branch dependencies '
3126 'are not supported, and you should reupload with --squash.)'
3127 % upstream_branch_name,
3128 change_desc)
3129 return parent
3130
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003131 def _AddChangeIdToCommitMessage(self, options, args):
3132 """Re-commits using the current message, assumes the commit hook is in
3133 place.
3134 """
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003135 log_desc = options.message or _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003136 git_command = ['commit', '--amend', '-m', log_desc]
3137 RunGit(git_command)
Andrii Shyshkalovb07575f2018-10-16 06:16:21 +00003138 new_log_desc = _create_description_from_log(args)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003139 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003140 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003141 return new_log_desc
3142 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003143 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003144
Ravi Mistry31e7d562018-04-02 12:53:57 -04003145 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3146 """Sets labels on the change based on the provided flags."""
3147 labels = {}
3148 notify = None;
3149 if enable_auto_submit:
3150 labels['Auto-Submit'] = 1
3151 if use_commit_queue:
3152 labels['Commit-Queue'] = 2
3153 elif cq_dry_run:
3154 labels['Commit-Queue'] = 1
3155 notify = False
3156 if labels:
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003157 gerrit_util.SetReview(
3158 self._GetGerritHost(),
3159 self._GerritChangeIdentifier(),
3160 labels=labels, notify=notify)
Ravi Mistry31e7d562018-04-02 12:53:57 -04003161
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003162 def SetCQState(self, new_state):
3163 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003164 vote_map = {
3165 _CQState.NONE: 0,
3166 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003167 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003168 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003169 labels = {'Commit-Queue': vote_map[new_state]}
3170 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003171 gerrit_util.SetReview(
3172 self._GetGerritHost(), self._GerritChangeIdentifier(),
3173 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003174
tandriie113dfd2016-10-11 10:20:12 -07003175 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003176 try:
3177 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003178 except GerritChangeNotExists:
3179 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003180
3181 if data['status'] in ('ABANDONED', 'MERGED'):
3182 return 'CL %s is closed' % self.GetIssue()
3183
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003184 def GetTryJobProperties(self, patchset=None):
3185 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003186 data = self._GetChangeDetail(['ALL_REVISIONS'])
3187 patchset = int(patchset or self.GetPatchset())
3188 assert patchset
3189 revision_data = None # Pylint wants it to be defined.
3190 for revision_data in data['revisions'].itervalues():
3191 if int(revision_data['_number']) == patchset:
3192 break
3193 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003194 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003195 (patchset, self.GetIssue()))
3196 return {
3197 'patch_issue': self.GetIssue(),
3198 'patch_set': patchset or self.GetPatchset(),
3199 'patch_project': data['project'],
3200 'patch_storage': 'gerrit',
3201 'patch_ref': revision_data['fetch']['http']['ref'],
3202 'patch_repository_url': revision_data['fetch']['http']['url'],
3203 'patch_gerrit_url': self.GetCodereviewServer(),
3204 }
tandriie113dfd2016-10-11 10:20:12 -07003205
tandriide281ae2016-10-12 06:02:30 -07003206 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003207 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003208
Edward Lemur707d70b2018-02-07 00:50:14 +01003209 def GetReviewers(self):
3210 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3211 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3212
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003213
3214_CODEREVIEW_IMPLEMENTATIONS = {
3215 'rietveld': _RietveldChangelistImpl,
3216 'gerrit': _GerritChangelistImpl,
3217}
3218
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003219
iannuccie53c9352016-08-17 14:40:40 -07003220def _add_codereview_issue_select_options(parser, extra=""):
3221 _add_codereview_select_options(parser)
3222
3223 text = ('Operate on this issue number instead of the current branch\'s '
3224 'implicit issue.')
3225 if extra:
3226 text += ' '+extra
3227 parser.add_option('-i', '--issue', type=int, help=text)
3228
3229
3230def _process_codereview_issue_select_options(parser, options):
3231 _process_codereview_select_options(parser, options)
3232 if options.issue is not None and not options.forced_codereview:
3233 parser.error('--issue must be specified with either --rietveld or --gerrit')
3234
3235
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003236def _add_codereview_select_options(parser):
3237 """Appends --gerrit and --rietveld options to force specific codereview."""
3238 parser.codereview_group = optparse.OptionGroup(
3239 parser, 'EXPERIMENTAL! Codereview override options')
3240 parser.add_option_group(parser.codereview_group)
3241 parser.codereview_group.add_option(
3242 '--gerrit', action='store_true',
3243 help='Force the use of Gerrit for codereview')
3244 parser.codereview_group.add_option(
3245 '--rietveld', action='store_true',
3246 help='Force the use of Rietveld for codereview')
3247
3248
3249def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003250 if options.rietveld:
3251 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003252 options.forced_codereview = None
3253 if options.gerrit:
3254 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003255
3256
tandriif9aefb72016-07-01 09:06:51 -07003257def _get_bug_line_values(default_project, bugs):
3258 """Given default_project and comma separated list of bugs, yields bug line
3259 values.
3260
3261 Each bug can be either:
3262 * a number, which is combined with default_project
3263 * string, which is left as is.
3264
3265 This function may produce more than one line, because bugdroid expects one
3266 project per line.
3267
3268 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3269 ['v8:123', 'chromium:789']
3270 """
3271 default_bugs = []
3272 others = []
3273 for bug in bugs.split(','):
3274 bug = bug.strip()
3275 if bug:
3276 try:
3277 default_bugs.append(int(bug))
3278 except ValueError:
3279 others.append(bug)
3280
3281 if default_bugs:
3282 default_bugs = ','.join(map(str, default_bugs))
3283 if default_project:
3284 yield '%s:%s' % (default_project, default_bugs)
3285 else:
3286 yield default_bugs
3287 for other in sorted(others):
3288 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3289 yield other
3290
3291
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003292class ChangeDescription(object):
3293 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003294 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003295 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003296 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003297 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003298 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3299 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3300 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3301 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003302
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003303 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003304 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003305
agable@chromium.org42c20792013-09-12 17:34:49 +00003306 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003307 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003308 return '\n'.join(self._description_lines)
3309
3310 def set_description(self, desc):
3311 if isinstance(desc, basestring):
3312 lines = desc.splitlines()
3313 else:
3314 lines = [line.rstrip() for line in desc]
3315 while lines and not lines[0]:
3316 lines.pop(0)
3317 while lines and not lines[-1]:
3318 lines.pop(-1)
3319 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003320
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003321 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3322 """Rewrites the R=/TBR= line(s) as a single line each.
3323
3324 Args:
3325 reviewers (list(str)) - list of additional emails to use for reviewers.
3326 tbrs (list(str)) - list of additional emails to use for TBRs.
3327 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3328 the change that are missing OWNER coverage. If this is not None, you
3329 must also pass a value for `change`.
3330 change (Change) - The Change that should be used for OWNERS lookups.
3331 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003332 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003333 assert isinstance(tbrs, list), tbrs
3334
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003335 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003336 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003337
3338 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003339 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003340
3341 reviewers = set(reviewers)
3342 tbrs = set(tbrs)
3343 LOOKUP = {
3344 'TBR': tbrs,
3345 'R': reviewers,
3346 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003347
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003348 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003349 regexp = re.compile(self.R_LINE)
3350 matches = [regexp.match(line) for line in self._description_lines]
3351 new_desc = [l for i, l in enumerate(self._description_lines)
3352 if not matches[i]]
3353 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003354
agable@chromium.org42c20792013-09-12 17:34:49 +00003355 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003356
3357 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003358 for match in matches:
3359 if not match:
3360 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003361 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3362
3363 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003364 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003365 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003366 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003367 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003368 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003369 LOOKUP[add_owners_to].update(
3370 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003371
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003372 # If any folks ended up in both groups, remove them from tbrs.
3373 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003374
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003375 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3376 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003377
3378 # Put the new lines in the description where the old first R= line was.
3379 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3380 if 0 <= line_loc < len(self._description_lines):
3381 if new_tbr_line:
3382 self._description_lines.insert(line_loc, new_tbr_line)
3383 if new_r_line:
3384 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003385 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003386 if new_r_line:
3387 self.append_footer(new_r_line)
3388 if new_tbr_line:
3389 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003390
Aaron Gable3a16ed12017-03-23 10:51:55 -07003391 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003392 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003393 self.set_description([
3394 '# Enter a description of the change.',
3395 '# This will be displayed on the codereview site.',
3396 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003397 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003398 '--------------------',
3399 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003400
agable@chromium.org42c20792013-09-12 17:34:49 +00003401 regexp = re.compile(self.BUG_LINE)
3402 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003403 prefix = settings.GetBugPrefix()
3404 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003405 if git_footer:
3406 self.append_footer('Bug: %s' % ', '.join(values))
3407 else:
3408 for value in values:
3409 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003410
agable@chromium.org42c20792013-09-12 17:34:49 +00003411 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003412 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003413 if not content:
3414 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003415 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003416
Bruce Dawson2377b012018-01-11 16:46:49 -08003417 # Strip off comments and default inserted "Bug:" line.
3418 clean_lines = [line.rstrip() for line in lines if not
3419 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003420 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003421 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003422 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003423
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003424 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003425 """Adds a footer line to the description.
3426
3427 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3428 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3429 that Gerrit footers are always at the end.
3430 """
3431 parsed_footer_line = git_footers.parse_footer(line)
3432 if parsed_footer_line:
3433 # Line is a gerrit footer in the form: Footer-Key: any value.
3434 # Thus, must be appended observing Gerrit footer rules.
3435 self.set_description(
3436 git_footers.add_footer(self.description,
3437 key=parsed_footer_line[0],
3438 value=parsed_footer_line[1]))
3439 return
3440
3441 if not self._description_lines:
3442 self._description_lines.append(line)
3443 return
3444
3445 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3446 if gerrit_footers:
3447 # git_footers.split_footers ensures that there is an empty line before
3448 # actual (gerrit) footers, if any. We have to keep it that way.
3449 assert top_lines and top_lines[-1] == ''
3450 top_lines, separator = top_lines[:-1], top_lines[-1:]
3451 else:
3452 separator = [] # No need for separator if there are no gerrit_footers.
3453
3454 prev_line = top_lines[-1] if top_lines else ''
3455 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3456 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3457 top_lines.append('')
3458 top_lines.append(line)
3459 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003460
tandrii99a72f22016-08-17 14:33:24 -07003461 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003462 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003463 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003464 reviewers = [match.group(2).strip()
3465 for match in matches
3466 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003467 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003468
bradnelsond975b302016-10-23 12:20:23 -07003469 def get_cced(self):
3470 """Retrieves the list of reviewers."""
3471 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3472 cced = [match.group(2).strip() for match in matches if match]
3473 return cleanup_list(cced)
3474
Nodir Turakulov23b82142017-11-16 11:04:25 -08003475 def get_hash_tags(self):
3476 """Extracts and sanitizes a list of Gerrit hashtags."""
3477 subject = (self._description_lines or ('',))[0]
3478 subject = re.sub(
3479 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3480
3481 tags = []
3482 start = 0
3483 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3484 while True:
3485 m = bracket_exp.match(subject, start)
3486 if not m:
3487 break
3488 tags.append(self.sanitize_hash_tag(m.group(1)))
3489 start = m.end()
3490
3491 if not tags:
3492 # Try "Tag: " prefix.
3493 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3494 if m:
3495 tags.append(self.sanitize_hash_tag(m.group(1)))
3496 return tags
3497
3498 @classmethod
3499 def sanitize_hash_tag(cls, tag):
3500 """Returns a sanitized Gerrit hash tag.
3501
3502 A sanitized hashtag can be used as a git push refspec parameter value.
3503 """
3504 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3505
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003506 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3507 """Updates this commit description given the parent.
3508
3509 This is essentially what Gnumbd used to do.
3510 Consult https://goo.gl/WMmpDe for more details.
3511 """
3512 assert parent_msg # No, orphan branch creation isn't supported.
3513 assert parent_hash
3514 assert dest_ref
3515 parent_footer_map = git_footers.parse_footers(parent_msg)
3516 # This will also happily parse svn-position, which GnumbD is no longer
3517 # supporting. While we'd generate correct footers, the verifier plugin
3518 # installed in Gerrit will block such commit (ie git push below will fail).
3519 parent_position = git_footers.get_position(parent_footer_map)
3520
3521 # Cherry-picks may have last line obscuring their prior footers,
3522 # from git_footers perspective. This is also what Gnumbd did.
3523 cp_line = None
3524 if (self._description_lines and
3525 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3526 cp_line = self._description_lines.pop()
3527
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003528 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003529
3530 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3531 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003532 for i, line in enumerate(footer_lines):
3533 k, v = git_footers.parse_footer(line) or (None, None)
3534 if k and k.startswith('Cr-'):
3535 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003536
3537 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003538 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003539 if parent_position[0] == dest_ref:
3540 # Same branch as parent.
3541 number = int(parent_position[1]) + 1
3542 else:
3543 number = 1 # New branch, and extra lineage.
3544 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3545 int(parent_position[1])))
3546
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003547 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3548 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003549
3550 self._description_lines = top_lines
3551 if cp_line:
3552 self._description_lines.append(cp_line)
3553 if self._description_lines[-1] != '':
3554 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003555 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003556
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003557
Aaron Gablea1bab272017-04-11 16:38:18 -07003558def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003559 """Retrieves the reviewers that approved a CL from the issue properties with
3560 messages.
3561
3562 Note that the list may contain reviewers that are not committer, thus are not
3563 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003564
3565 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003566 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003567 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003568 return sorted(
3569 set(
3570 message['sender']
3571 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003572 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003573 )
3574 )
3575
3576
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003577def FindCodereviewSettingsFile(filename='codereview.settings'):
3578 """Finds the given file starting in the cwd and going up.
3579
3580 Only looks up to the top of the repository unless an
3581 'inherit-review-settings-ok' file exists in the root of the repository.
3582 """
3583 inherit_ok_file = 'inherit-review-settings-ok'
3584 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003585 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003586 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3587 root = '/'
3588 while True:
3589 if filename in os.listdir(cwd):
3590 if os.path.isfile(os.path.join(cwd, filename)):
3591 return open(os.path.join(cwd, filename))
3592 if cwd == root:
3593 break
3594 cwd = os.path.dirname(cwd)
3595
3596
3597def LoadCodereviewSettingsFromFile(fileobj):
3598 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003599 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003601 def SetProperty(name, setting, unset_error_ok=False):
3602 fullname = 'rietveld.' + name
3603 if setting in keyvals:
3604 RunGit(['config', fullname, keyvals[setting]])
3605 else:
3606 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3607
tandrii48df5812016-10-17 03:55:37 -07003608 if not keyvals.get('GERRIT_HOST', False):
3609 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003610 # Only server setting is required. Other settings can be absent.
3611 # In that case, we ignore errors raised during option deletion attempt.
3612 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003613 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003614 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3615 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003616 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003617 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3618 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003619 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003620 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3621 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003622
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003623 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003624 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003625
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003626 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003627 RunGit(['config', 'gerrit.squash-uploads',
3628 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003629
tandrii@chromium.org28253532016-04-14 13:46:56 +00003630 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003631 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003632 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3633
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003634 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003635 # should be of the form
3636 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3637 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003638 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3639 keyvals['ORIGIN_URL_CONFIG']])
3640
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003641
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003642def urlretrieve(source, destination):
3643 """urllib is broken for SSL connections via a proxy therefore we
3644 can't use urllib.urlretrieve()."""
3645 with open(destination, 'w') as f:
3646 f.write(urllib2.urlopen(source).read())
3647
3648
ukai@chromium.org712d6102013-11-27 00:52:58 +00003649def hasSheBang(fname):
3650 """Checks fname is a #! script."""
3651 with open(fname) as f:
3652 return f.read(2).startswith('#!')
3653
3654
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003655# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3656def DownloadHooks(*args, **kwargs):
3657 pass
3658
3659
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003660def DownloadGerritHook(force):
3661 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003662
3663 Args:
3664 force: True to update hooks. False to install hooks if not present.
3665 """
3666 if not settings.GetIsGerrit():
3667 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003668 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003669 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3670 if not os.access(dst, os.X_OK):
3671 if os.path.exists(dst):
3672 if not force:
3673 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003674 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003675 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003676 if not hasSheBang(dst):
3677 DieWithError('Not a script: %s\n'
3678 'You need to download from\n%s\n'
3679 'into .git/hooks/commit-msg and '
3680 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003681 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3682 except Exception:
3683 if os.path.exists(dst):
3684 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003685 DieWithError('\nFailed to download hooks.\n'
3686 'You need to download from\n%s\n'
3687 'into .git/hooks/commit-msg and '
3688 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003689
3690
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003691def GetRietveldCodereviewSettingsInteractively():
3692 """Prompt the user for settings."""
3693 server = settings.GetDefaultServerUrl(error_ok=True)
3694 prompt = 'Rietveld server (host[:port])'
3695 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3696 newserver = ask_for_data(prompt + ':')
3697 if not server and not newserver:
3698 newserver = DEFAULT_SERVER
3699 if newserver:
3700 newserver = gclient_utils.UpgradeToHttps(newserver)
3701 if newserver != server:
3702 RunGit(['config', 'rietveld.server', newserver])
3703
3704 def SetProperty(initial, caption, name, is_url):
3705 prompt = caption
3706 if initial:
3707 prompt += ' ("x" to clear) [%s]' % initial
3708 new_val = ask_for_data(prompt + ':')
3709 if new_val == 'x':
3710 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3711 elif new_val:
3712 if is_url:
3713 new_val = gclient_utils.UpgradeToHttps(new_val)
3714 if new_val != initial:
3715 RunGit(['config', 'rietveld.' + name, new_val])
3716
3717 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3718 SetProperty(settings.GetDefaultPrivateFlag(),
3719 'Private flag (rietveld only)', 'private', False)
3720 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3721 'tree-status-url', False)
3722 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3723 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3724 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3725 'run-post-upload-hook', False)
3726
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003727
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003728class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003729 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003730
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003731 _GOOGLESOURCE = 'googlesource.com'
3732
3733 def __init__(self):
3734 # Cached list of [host, identity, source], where source is either
3735 # .gitcookies or .netrc.
3736 self._all_hosts = None
3737
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003738 def ensure_configured_gitcookies(self):
3739 """Runs checks and suggests fixes to make git use .gitcookies from default
3740 path."""
3741 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3742 configured_path = RunGitSilent(
3743 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003744 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003745 if configured_path:
3746 self._ensure_default_gitcookies_path(configured_path, default)
3747 else:
3748 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003749
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003750 @staticmethod
3751 def _ensure_default_gitcookies_path(configured_path, default_path):
3752 assert configured_path
3753 if configured_path == default_path:
3754 print('git is already configured to use your .gitcookies from %s' %
3755 configured_path)
3756 return
3757
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003758 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003759 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3760 (configured_path, default_path))
3761
3762 if not os.path.exists(configured_path):
3763 print('However, your configured .gitcookies file is missing.')
3764 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3765 action='reconfigure')
3766 RunGit(['config', '--global', 'http.cookiefile', default_path])
3767 return
3768
3769 if os.path.exists(default_path):
3770 print('WARNING: default .gitcookies file already exists %s' %
3771 default_path)
3772 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3773 default_path)
3774
3775 confirm_or_exit('Move existing .gitcookies to default location?',
3776 action='move')
3777 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003778 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003779 print('Moved and reconfigured git to use .gitcookies from %s' %
3780 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003781
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003782 @staticmethod
3783 def _configure_gitcookies_path(default_path):
3784 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3785 if os.path.exists(netrc_path):
3786 print('You seem to be using outdated .netrc for git credentials: %s' %
3787 netrc_path)
3788 print('This tool will guide you through setting up recommended '
3789 '.gitcookies store for git credentials.\n'
3790 '\n'
3791 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3792 ' git config --global --unset http.cookiefile\n'
3793 ' mv %s %s.backup\n\n' % (default_path, default_path))
3794 confirm_or_exit(action='setup .gitcookies')
3795 RunGit(['config', '--global', 'http.cookiefile', default_path])
3796 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003797
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003798 def get_hosts_with_creds(self, include_netrc=False):
3799 if self._all_hosts is None:
3800 a = gerrit_util.CookiesAuthenticator()
3801 self._all_hosts = [
3802 (h, u, s)
3803 for h, u, s in itertools.chain(
3804 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3805 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3806 )
3807 if h.endswith(self._GOOGLESOURCE)
3808 ]
3809
3810 if include_netrc:
3811 return self._all_hosts
3812 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3813
3814 def print_current_creds(self, include_netrc=False):
3815 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3816 if not hosts:
3817 print('No Git/Gerrit credentials found')
3818 return
3819 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3820 header = [('Host', 'User', 'Which file'),
3821 ['=' * l for l in lengths]]
3822 for row in (header + hosts):
3823 print('\t'.join((('%%+%ds' % l) % s)
3824 for l, s in zip(lengths, row)))
3825
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003826 @staticmethod
3827 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003828 """Parses identity "git-<username>.domain" into <username> and domain."""
3829 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003830 # distinguishable from sub-domains. But we do know typical domains:
3831 if identity.endswith('.chromium.org'):
3832 domain = 'chromium.org'
3833 username = identity[:-len('.chromium.org')]
3834 else:
3835 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003836 if username.startswith('git-'):
3837 username = username[len('git-'):]
3838 return username, domain
3839
3840 def _get_usernames_of_domain(self, domain):
3841 """Returns list of usernames referenced by .gitcookies in a given domain."""
3842 identities_by_domain = {}
3843 for _, identity, _ in self.get_hosts_with_creds():
3844 username, domain = self._parse_identity(identity)
3845 identities_by_domain.setdefault(domain, []).append(username)
3846 return identities_by_domain.get(domain)
3847
3848 def _canonical_git_googlesource_host(self, host):
3849 """Normalizes Gerrit hosts (with '-review') to Git host."""
3850 assert host.endswith(self._GOOGLESOURCE)
3851 # Prefix doesn't include '.' at the end.
3852 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3853 if prefix.endswith('-review'):
3854 prefix = prefix[:-len('-review')]
3855 return prefix + '.' + self._GOOGLESOURCE
3856
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003857 def _canonical_gerrit_googlesource_host(self, host):
3858 git_host = self._canonical_git_googlesource_host(host)
3859 prefix = git_host.split('.', 1)[0]
3860 return prefix + '-review.' + self._GOOGLESOURCE
3861
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003862 def _get_counterpart_host(self, host):
3863 assert host.endswith(self._GOOGLESOURCE)
3864 git = self._canonical_git_googlesource_host(host)
3865 gerrit = self._canonical_gerrit_googlesource_host(git)
3866 return git if gerrit == host else gerrit
3867
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003868 def has_generic_host(self):
3869 """Returns whether generic .googlesource.com has been configured.
3870
3871 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3872 """
3873 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3874 if host == '.' + self._GOOGLESOURCE:
3875 return True
3876 return False
3877
3878 def _get_git_gerrit_identity_pairs(self):
3879 """Returns map from canonic host to pair of identities (Git, Gerrit).
3880
3881 One of identities might be None, meaning not configured.
3882 """
3883 host_to_identity_pairs = {}
3884 for host, identity, _ in self.get_hosts_with_creds():
3885 canonical = self._canonical_git_googlesource_host(host)
3886 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3887 idx = 0 if canonical == host else 1
3888 pair[idx] = identity
3889 return host_to_identity_pairs
3890
3891 def get_partially_configured_hosts(self):
3892 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003893 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3894 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3895 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003896
3897 def get_conflicting_hosts(self):
3898 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003899 host
3900 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003901 if None not in (i1, i2) and i1 != i2)
3902
3903 def get_duplicated_hosts(self):
3904 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3905 return set(host for host, count in counters.iteritems() if count > 1)
3906
3907 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3908 'chromium.googlesource.com': 'chromium.org',
3909 'chrome-internal.googlesource.com': 'google.com',
3910 }
3911
3912 def get_hosts_with_wrong_identities(self):
3913 """Finds hosts which **likely** reference wrong identities.
3914
3915 Note: skips hosts which have conflicting identities for Git and Gerrit.
3916 """
3917 hosts = set()
3918 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3919 pair = self._get_git_gerrit_identity_pairs().get(host)
3920 if pair and pair[0] == pair[1]:
3921 _, domain = self._parse_identity(pair[0])
3922 if domain != expected:
3923 hosts.add(host)
3924 return hosts
3925
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003926 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003927 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003928 hosts = sorted(hosts)
3929 assert hosts
3930 if extra_column_func is None:
3931 extras = [''] * len(hosts)
3932 else:
3933 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003934 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3935 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003936 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003937 lines.append(tmpl % he)
3938 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003939
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003940 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003941 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003942 yield ('.googlesource.com wildcard record detected',
3943 ['Chrome Infrastructure team recommends to list full host names '
3944 'explicitly.'],
3945 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003946
3947 dups = self.get_duplicated_hosts()
3948 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003949 yield ('The following hosts were defined twice',
3950 self._format_hosts(dups),
3951 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003952
3953 partial = self.get_partially_configured_hosts()
3954 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003955 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3956 'These hosts are missing',
3957 self._format_hosts(partial, lambda host: 'but %s defined' %
3958 self._get_counterpart_host(host)),
3959 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003960
3961 conflicting = self.get_conflicting_hosts()
3962 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003963 yield ('The following Git hosts have differing credentials from their '
3964 'Gerrit counterparts',
3965 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3966 tuple(self._get_git_gerrit_identity_pairs()[host])),
3967 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003968
3969 wrong = self.get_hosts_with_wrong_identities()
3970 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003971 yield ('These hosts likely use wrong identity',
3972 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3973 (self._get_git_gerrit_identity_pairs()[host][0],
3974 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3975 wrong)
3976
3977 def find_and_report_problems(self):
3978 """Returns True if there was at least one problem, else False."""
3979 found = False
3980 bad_hosts = set()
3981 for title, sublines, hosts in self._find_problems():
3982 if not found:
3983 found = True
3984 print('\n\n.gitcookies problem report:\n')
3985 bad_hosts.update(hosts or [])
3986 print(' %s%s' % (title , (':' if sublines else '')))
3987 if sublines:
3988 print()
3989 print(' %s' % '\n '.join(sublines))
3990 print()
3991
3992 if bad_hosts:
3993 assert found
3994 print(' You can manually remove corresponding lines in your %s file and '
3995 'visit the following URLs with correct account to generate '
3996 'correct credential lines:\n' %
3997 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3998 print(' %s' % '\n '.join(sorted(set(
3999 gerrit_util.CookiesAuthenticator().get_new_password_url(
4000 self._canonical_git_googlesource_host(host))
4001 for host in bad_hosts
4002 ))))
4003 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004004
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004005
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004006@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004007def CMDcreds_check(parser, args):
4008 """Checks credentials and suggests changes."""
4009 _, _ = parser.parse_args(args)
4010
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004011 # Code below checks .gitcookies. Abort if using something else.
4012 authn = gerrit_util.Authenticator.get()
4013 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
4014 if isinstance(authn, gerrit_util.GceAuthenticator):
4015 DieWithError(
4016 'This command is not designed for GCE, are you on a bot?\n'
4017 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
4018 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004019 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004020 'This command is not designed for bot environment. It checks '
4021 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004022
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004023 checker = _GitCookiesChecker()
4024 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004025
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004026 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004027 checker.print_current_creds(include_netrc=True)
4028
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004029 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004030 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004031 return 0
4032 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004033
4034
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004035@subcommand.usage('[repo root containing codereview.settings]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004036@metrics.collector.collect_metrics('git cl config')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004037def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004038 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004039
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004040 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004041 # TODO(tandrii): remove this once we switch to Gerrit.
4042 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004043 parser.add_option('--activate-update', action='store_true',
4044 help='activate auto-updating [rietveld] section in '
4045 '.git/config')
4046 parser.add_option('--deactivate-update', action='store_true',
4047 help='deactivate auto-updating [rietveld] section in '
4048 '.git/config')
4049 options, args = parser.parse_args(args)
4050
4051 if options.deactivate_update:
4052 RunGit(['config', 'rietveld.autoupdate', 'false'])
4053 return
4054
4055 if options.activate_update:
4056 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4057 return
4058
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004059 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004060 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004061 return 0
4062
4063 url = args[0]
4064 if not url.endswith('codereview.settings'):
4065 url = os.path.join(url, 'codereview.settings')
4066
4067 # Load code review settings and download hooks (if available).
4068 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4069 return 0
4070
4071
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004072@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004073def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004074 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004075 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4076 branch = ShortBranchName(branchref)
4077 _, args = parser.parse_args(args)
4078 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004080 return RunGit(['config', 'branch.%s.base-url' % branch],
4081 error_ok=False).strip()
4082 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004084 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4085 error_ok=False).strip()
4086
4087
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004088def color_for_status(status):
4089 """Maps a Changelist status to color, for CMDstatus and other tools."""
4090 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004091 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004092 'waiting': Fore.BLUE,
4093 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004094 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004095 'lgtm': Fore.GREEN,
4096 'commit': Fore.MAGENTA,
4097 'closed': Fore.CYAN,
4098 'error': Fore.WHITE,
4099 }.get(status, Fore.WHITE)
4100
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004101
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004102def get_cl_statuses(changes, fine_grained, max_processes=None):
4103 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004104
4105 If fine_grained is true, this will fetch CL statuses from the server.
4106 Otherwise, simply indicate if there's a matching url for the given branches.
4107
4108 If max_processes is specified, it is used as the maximum number of processes
4109 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4110 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004111
4112 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004113 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004114 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004115 upload.verbosity = 0
4116
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004117 if not changes:
4118 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004119
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004120 if not fine_grained:
4121 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004122 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004123 for cl in changes:
4124 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004125 return
4126
4127 # First, sort out authentication issues.
4128 logging.debug('ensuring credentials exist')
4129 for cl in changes:
4130 cl.EnsureAuthenticated(force=False, refresh=True)
4131
4132 def fetch(cl):
4133 try:
4134 return (cl, cl.GetStatus())
4135 except:
4136 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07004137 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004138 raise
4139
4140 threads_count = len(changes)
4141 if max_processes:
4142 threads_count = max(1, min(threads_count, max_processes))
4143 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4144
4145 pool = ThreadPool(threads_count)
4146 fetched_cls = set()
4147 try:
4148 it = pool.imap_unordered(fetch, changes).__iter__()
4149 while True:
4150 try:
4151 cl, status = it.next(timeout=5)
4152 except multiprocessing.TimeoutError:
4153 break
4154 fetched_cls.add(cl)
4155 yield cl, status
4156 finally:
4157 pool.close()
4158
4159 # Add any branches that failed to fetch.
4160 for cl in set(changes) - fetched_cls:
4161 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004162
rmistry@google.com2dd99862015-06-22 12:22:18 +00004163
4164def upload_branch_deps(cl, args):
4165 """Uploads CLs of local branches that are dependents of the current branch.
4166
4167 If the local branch dependency tree looks like:
4168 test1 -> test2.1 -> test3.1
4169 -> test3.2
4170 -> test2.2 -> test3.3
4171
4172 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4173 run on the dependent branches in this order:
4174 test2.1, test3.1, test3.2, test2.2, test3.3
4175
4176 Note: This function does not rebase your local dependent branches. Use it when
4177 you make a change to the parent branch that will not conflict with its
4178 dependent branches, and you would like their dependencies updated in
4179 Rietveld.
4180 """
4181 if git_common.is_dirty_git_tree('upload-branch-deps'):
4182 return 1
4183
4184 root_branch = cl.GetBranch()
4185 if root_branch is None:
4186 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4187 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004188 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00004189 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4190 'patchset dependencies without an uploaded CL.')
4191
4192 branches = RunGit(['for-each-ref',
4193 '--format=%(refname:short) %(upstream:short)',
4194 'refs/heads'])
4195 if not branches:
4196 print('No local branches found.')
4197 return 0
4198
4199 # Create a dictionary of all local branches to the branches that are dependent
4200 # on it.
4201 tracked_to_dependents = collections.defaultdict(list)
4202 for b in branches.splitlines():
4203 tokens = b.split()
4204 if len(tokens) == 2:
4205 branch_name, tracked = tokens
4206 tracked_to_dependents[tracked].append(branch_name)
4207
vapiera7fbd5a2016-06-16 09:17:49 -07004208 print()
4209 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004210 dependents = []
4211 def traverse_dependents_preorder(branch, padding=''):
4212 dependents_to_process = tracked_to_dependents.get(branch, [])
4213 padding += ' '
4214 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004215 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004216 dependents.append(dependent)
4217 traverse_dependents_preorder(dependent, padding)
4218 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004219 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004220
4221 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004222 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004223 return 0
4224
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004225 confirm_or_exit('This command will checkout all dependent branches and run '
4226 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004227
rmistry@google.com2dd99862015-06-22 12:22:18 +00004228 # Record all dependents that failed to upload.
4229 failures = {}
4230 # Go through all dependents, checkout the branch and upload.
4231 try:
4232 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004233 print()
4234 print('--------------------------------------')
4235 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004236 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004238 try:
4239 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004240 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004241 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004242 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004243 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004244 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004245 finally:
4246 # Swap back to the original root branch.
4247 RunGit(['checkout', '-q', root_branch])
4248
vapiera7fbd5a2016-06-16 09:17:49 -07004249 print()
4250 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004251 for dependent_branch in dependents:
4252 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004253 print(' %s : %s' % (dependent_branch, upload_status))
4254 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004255
4256 return 0
4257
4258
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004259@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004260def CMDarchive(parser, args):
4261 """Archives and deletes branches associated with closed changelists."""
4262 parser.add_option(
4263 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004264 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004265 parser.add_option(
4266 '-f', '--force', action='store_true',
4267 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004268 parser.add_option(
4269 '-d', '--dry-run', action='store_true',
4270 help='Skip the branch tagging and removal steps.')
4271 parser.add_option(
4272 '-t', '--notags', action='store_true',
4273 help='Do not tag archived branches. '
4274 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004275
4276 auth.add_auth_options(parser)
4277 options, args = parser.parse_args(args)
4278 if args:
4279 parser.error('Unsupported args: %s' % ' '.join(args))
4280 auth_config = auth.extract_auth_config_from_options(options)
4281
4282 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4283 if not branches:
4284 return 0
4285
vapiera7fbd5a2016-06-16 09:17:49 -07004286 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004287 changes = [Changelist(branchref=b, auth_config=auth_config)
4288 for b in branches.splitlines()]
4289 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4290 statuses = get_cl_statuses(changes,
4291 fine_grained=True,
4292 max_processes=options.maxjobs)
4293 proposal = [(cl.GetBranch(),
4294 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4295 for cl, status in statuses
Andrii Shyshkalov51bdf8c2018-10-18 01:07:58 +00004296 if status in ('closed', 'rietveld-not-supported')]
kmarshall3bff56b2016-06-06 18:31:47 -07004297 proposal.sort()
4298
4299 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004300 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004301 return 0
4302
4303 current_branch = GetCurrentBranch()
4304
vapiera7fbd5a2016-06-16 09:17:49 -07004305 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004306 if options.notags:
4307 for next_item in proposal:
4308 print(' ' + next_item[0])
4309 else:
4310 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4311 for next_item in proposal:
4312 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004313
kmarshall9249e012016-08-23 12:02:16 -07004314 # Quit now on precondition failure or if instructed by the user, either
4315 # via an interactive prompt or by command line flags.
4316 if options.dry_run:
4317 print('\nNo changes were made (dry run).\n')
4318 return 0
4319 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004320 print('You are currently on a branch \'%s\' which is associated with a '
4321 'closed codereview issue, so archive cannot proceed. Please '
4322 'checkout another branch and run this command again.' %
4323 current_branch)
4324 return 1
kmarshall9249e012016-08-23 12:02:16 -07004325 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004326 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4327 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004328 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004329 return 1
4330
4331 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004332 if not options.notags:
4333 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004334 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004335
vapiera7fbd5a2016-06-16 09:17:49 -07004336 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004337
4338 return 0
4339
4340
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004341@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004342def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004343 """Show status of changelists.
4344
4345 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004346 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004347 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004348 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004349 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004350 - Magenta in the commit queue
4351 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004352 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004353
4354 Also see 'git cl comments'.
4355 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004356 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004357 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004358 parser.add_option('-f', '--fast', action='store_true',
4359 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004360 parser.add_option(
4361 '-j', '--maxjobs', action='store', type=int,
4362 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004363
4364 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004365 _add_codereview_issue_select_options(
4366 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004367 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004368 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004369 if args:
4370 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004371 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004372
iannuccie53c9352016-08-17 14:40:40 -07004373 if options.issue is not None and not options.field:
4374 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004375
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004376 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004377 cl = Changelist(auth_config=auth_config, issue=options.issue,
4378 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004379 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004380 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004381 elif options.field == 'id':
4382 issueid = cl.GetIssue()
4383 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004384 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004385 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004386 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004387 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004388 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004389 elif options.field == 'status':
4390 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004391 elif options.field == 'url':
4392 url = cl.GetIssueURL()
4393 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004394 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004395 return 0
4396
4397 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4398 if not branches:
4399 print('No local branch found.')
4400 return 0
4401
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004402 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004403 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004404 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004405 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004406 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004407 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004408 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004409
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004410 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004411 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4412 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4413 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004414 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004415 c, status = output.next()
4416 branch_statuses[c.GetBranch()] = status
4417 status = branch_statuses.pop(branch)
4418 url = cl.GetIssueURL()
4419 if url and (not status or status == 'error'):
4420 # The issue probably doesn't exist anymore.
4421 url += ' (broken)'
4422
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004423 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004424 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004425 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004426 color = ''
4427 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004428 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004429 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004430 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004431 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004432
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004433
4434 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004435 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004436 print('Current branch: %s' % branch)
4437 for cl in changes:
4438 if cl.GetBranch() == branch:
4439 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004440 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004442 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004443 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004444 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004445 print('Issue description:')
4446 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004447 return 0
4448
4449
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004450def colorize_CMDstatus_doc():
4451 """To be called once in main() to add colors to git cl status help."""
4452 colors = [i for i in dir(Fore) if i[0].isupper()]
4453
4454 def colorize_line(line):
4455 for color in colors:
4456 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004457 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004458 indent = len(line) - len(line.lstrip(' ')) + 1
4459 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4460 return line
4461
4462 lines = CMDstatus.__doc__.splitlines()
4463 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4464
4465
phajdan.jre328cf92016-08-22 04:12:17 -07004466def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004467 if path == '-':
4468 json.dump(contents, sys.stdout)
4469 else:
4470 with open(path, 'w') as f:
4471 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004472
4473
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004474@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004475@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004476def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004477 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004478
4479 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004480 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004481 parser.add_option('-r', '--reverse', action='store_true',
4482 help='Lookup the branch(es) for the specified issues. If '
4483 'no issues are specified, all branches with mapped '
4484 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004485 parser.add_option('--json',
4486 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004487 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004488 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004489 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004490
dnj@chromium.org406c4402015-03-03 17:22:28 +00004491 if options.reverse:
4492 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004493 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004494 # Reverse issue lookup.
4495 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004496
4497 git_config = {}
4498 for config in RunGit(['config', '--get-regexp',
4499 r'branch\..*issue']).splitlines():
4500 name, _space, val = config.partition(' ')
4501 git_config[name] = val
4502
dnj@chromium.org406c4402015-03-03 17:22:28 +00004503 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004504 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4505 config_key = _git_branch_config_key(ShortBranchName(branch),
4506 cls.IssueConfigKey())
4507 issue = git_config.get(config_key)
4508 if issue:
4509 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004510 if not args:
4511 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004512 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004513 for issue in args:
4514 if not issue:
4515 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004516 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004517 print('Branch for issue number %s: %s' % (
4518 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004519 if options.json:
4520 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004521 return 0
4522
4523 if len(args) > 0:
4524 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4525 if not issue.valid:
4526 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4527 'or no argument to list it.\n'
4528 'Maybe you want to run git cl status?')
4529 cl = Changelist(codereview=issue.codereview)
4530 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004531 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004532 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004533 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4534 if options.json:
4535 write_json(options.json, {
4536 'issue': cl.GetIssue(),
4537 'issue_url': cl.GetIssueURL(),
4538 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004539 return 0
4540
4541
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004542@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004543def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004544 """Shows or posts review comments for any changelist."""
4545 parser.add_option('-a', '--add-comment', dest='comment',
4546 help='comment to add to an issue')
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004547 parser.add_option('-p', '--publish', action='store_true',
4548 help='marks CL as ready and sends comment to reviewers')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004549 parser.add_option('-i', '--issue', dest='issue',
4550 help='review issue id (defaults to current issue). '
4551 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004552 parser.add_option('-m', '--machine-readable', dest='readable',
4553 action='store_false', default=True,
4554 help='output comments in a format compatible with '
4555 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004556 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004557 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004558 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004559 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004560 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004561 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004562 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004563
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004564 issue = None
4565 if options.issue:
4566 try:
4567 issue = int(options.issue)
4568 except ValueError:
4569 DieWithError('A review issue id is expected to be a number')
4570
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004571 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4572
4573 if not cl.IsGerrit():
4574 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004575
4576 if options.comment:
Sergiy Byelozyorovcb629a42018-10-28 19:20:39 +00004577 cl.AddComment(options.comment, options.publish)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004578 return 0
4579
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004580 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4581 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004582 for comment in summary:
4583 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004584 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004585 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004586 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004587 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004588 color = Fore.MAGENTA
4589 else:
4590 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004591 print('\n%s%s %s%s\n%s' % (
4592 color,
4593 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4594 comment.sender,
4595 Fore.RESET,
4596 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4597
smut@google.comc85ac942015-09-15 16:34:43 +00004598 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004599 def pre_serialize(c):
4600 dct = c.__dict__.copy()
4601 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4602 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004603 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004604 return 0
4605
4606
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004607@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004608@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004609def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004610 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004611 parser.add_option('-d', '--display', action='store_true',
4612 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004613 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004614 help='New description to set for this issue (- for stdin, '
4615 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004616 parser.add_option('-f', '--force', action='store_true',
4617 help='Delete any unpublished Gerrit edits for this issue '
4618 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004619
4620 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004621 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004622 options, args = parser.parse_args(args)
4623 _process_codereview_select_options(parser, options)
4624
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004625 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004626 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004627 target_issue_arg = ParseIssueNumberArgument(args[0],
4628 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004629 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004630 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004631
martiniss6eda05f2016-06-30 10:18:35 -07004632 kwargs = {
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00004633 'auth_config': auth.extract_auth_config_from_options(options),
4634 'codereview': options.forced_codereview,
martiniss6eda05f2016-06-30 10:18:35 -07004635 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004636 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004637 if target_issue_arg:
4638 kwargs['issue'] = target_issue_arg.issue
4639 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004640 if target_issue_arg.codereview and not options.forced_codereview:
4641 detected_codereview_from_url = True
4642 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004643
4644 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004645 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004646 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004647 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004648
4649 if detected_codereview_from_url:
4650 logging.info('canonical issue/change URL: %s (type: %s)\n',
4651 cl.GetIssueURL(), target_issue_arg.codereview)
4652
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004653 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004654
smut@google.com34fb6b12015-07-13 20:03:26 +00004655 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004656 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004657 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004658
4659 if options.new_description:
4660 text = options.new_description
4661 if text == '-':
4662 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004663 elif text == '+':
4664 base_branch = cl.GetCommonAncestorWithUpstream()
4665 change = cl.GetChange(base_branch, None, local_description=True)
4666 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004667
4668 description.set_description(text)
4669 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004670 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004671
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004672 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004673 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004674 return 0
4675
4676
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004677@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004678def CMDlint(parser, args):
4679 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004680 parser.add_option('--filter', action='append', metavar='-x,+y',
4681 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004682 auth.add_auth_options(parser)
4683 options, args = parser.parse_args(args)
4684 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004685
4686 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004687 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004688 try:
4689 import cpplint
4690 import cpplint_chromium
4691 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004692 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004693 return 1
4694
4695 # Change the current working directory before calling lint so that it
4696 # shows the correct base.
4697 previous_cwd = os.getcwd()
4698 os.chdir(settings.GetRoot())
4699 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004700 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004701 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4702 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004703 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004704 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004705 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004706
4707 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004708 command = args + files
4709 if options.filter:
4710 command = ['--filter=' + ','.join(options.filter)] + command
4711 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004712
4713 white_regex = re.compile(settings.GetLintRegex())
4714 black_regex = re.compile(settings.GetLintIgnoreRegex())
4715 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4716 for filename in filenames:
4717 if white_regex.match(filename):
4718 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004719 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004720 else:
4721 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4722 extra_check_functions)
4723 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004724 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004725 finally:
4726 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004727 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004728 if cpplint._cpplint_state.error_count != 0:
4729 return 1
4730 return 0
4731
4732
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004733@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004734def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004735 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004736 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004737 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004738 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004739 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004740 parser.add_option('--all', action='store_true',
4741 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004742 parser.add_option('--parallel', action='store_true',
4743 help='Run all tests specified by input_api.RunTests in all '
4744 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004745 auth.add_auth_options(parser)
4746 options, args = parser.parse_args(args)
4747 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004748
sbc@chromium.org71437c02015-04-09 19:29:40 +00004749 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004750 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004751 return 1
4752
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004753 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004754 if args:
4755 base_branch = args[0]
4756 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004757 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004758 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004759
Aaron Gable8076c282017-11-29 14:39:41 -08004760 if options.all:
4761 base_change = cl.GetChange(base_branch, None)
4762 files = [('M', f) for f in base_change.AllFiles()]
4763 change = presubmit_support.GitChange(
4764 base_change.Name(),
4765 base_change.FullDescriptionText(),
4766 base_change.RepositoryRoot(),
4767 files,
4768 base_change.issue,
4769 base_change.patchset,
4770 base_change.author_email,
4771 base_change._upstream)
4772 else:
4773 change = cl.GetChange(base_branch, None)
4774
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004775 cl.RunHook(
4776 committing=not options.upload,
4777 may_prompt=False,
4778 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004779 change=change,
4780 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004781 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004782
4783
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004784def GenerateGerritChangeId(message):
4785 """Returns Ixxxxxx...xxx change id.
4786
4787 Works the same way as
4788 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4789 but can be called on demand on all platforms.
4790
4791 The basic idea is to generate git hash of a state of the tree, original commit
4792 message, author/committer info and timestamps.
4793 """
4794 lines = []
4795 tree_hash = RunGitSilent(['write-tree'])
4796 lines.append('tree %s' % tree_hash.strip())
4797 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4798 if code == 0:
4799 lines.append('parent %s' % parent.strip())
4800 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4801 lines.append('author %s' % author.strip())
4802 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4803 lines.append('committer %s' % committer.strip())
4804 lines.append('')
4805 # Note: Gerrit's commit-hook actually cleans message of some lines and
4806 # whitespace. This code is not doing this, but it clearly won't decrease
4807 # entropy.
4808 lines.append(message)
4809 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4810 stdin='\n'.join(lines))
4811 return 'I%s' % change_hash.strip()
4812
4813
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004814def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004815 """Computes the remote branch ref to use for the CL.
4816
4817 Args:
4818 remote (str): The git remote for the CL.
4819 remote_branch (str): The git remote branch for the CL.
4820 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004821 """
4822 if not (remote and remote_branch):
4823 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004824
wittman@chromium.org455dc922015-01-26 20:15:50 +00004825 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004826 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004827 # refs, which are then translated into the remote full symbolic refs
4828 # below.
4829 if '/' not in target_branch:
4830 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4831 else:
4832 prefix_replacements = (
4833 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4834 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4835 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4836 )
4837 match = None
4838 for regex, replacement in prefix_replacements:
4839 match = re.search(regex, target_branch)
4840 if match:
4841 remote_branch = target_branch.replace(match.group(0), replacement)
4842 break
4843 if not match:
4844 # This is a branch path but not one we recognize; use as-is.
4845 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004846 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4847 # Handle the refs that need to land in different refs.
4848 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004849
wittman@chromium.org455dc922015-01-26 20:15:50 +00004850 # Create the true path to the remote branch.
4851 # Does the following translation:
4852 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4853 # * refs/remotes/origin/master -> refs/heads/master
4854 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4855 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4856 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4857 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4858 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4859 'refs/heads/')
4860 elif remote_branch.startswith('refs/remotes/branch-heads'):
4861 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004862
wittman@chromium.org455dc922015-01-26 20:15:50 +00004863 return remote_branch
4864
4865
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004866def cleanup_list(l):
4867 """Fixes a list so that comma separated items are put as individual items.
4868
4869 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4870 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4871 """
4872 items = sum((i.split(',') for i in l), [])
4873 stripped_items = (i.strip() for i in items)
4874 return sorted(filter(None, stripped_items))
4875
4876
Aaron Gable4db38df2017-11-03 14:59:07 -07004877@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004878@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004879def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004880 """Uploads the current changelist to codereview.
4881
4882 Can skip dependency patchset uploads for a branch by running:
4883 git config branch.branch_name.skip-deps-uploads True
4884 To unset run:
4885 git config --unset branch.branch_name.skip-deps-uploads
4886 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004887
4888 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4889 a bug number, this bug number is automatically populated in the CL
4890 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004891
4892 If subject contains text in square brackets or has "<text>: " prefix, such
4893 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4894 [git-cl] add support for hashtags
4895 Foo bar: implement foo
4896 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004897 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004898 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4899 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004900 parser.add_option('--bypass-watchlists', action='store_true',
4901 dest='bypass_watchlists',
4902 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004903 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004904 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004905 parser.add_option('--message', '-m', dest='message',
4906 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004907 parser.add_option('-b', '--bug',
4908 help='pre-populate the bug number(s) for this issue. '
4909 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004910 parser.add_option('--message-file', dest='message_file',
4911 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004912 parser.add_option('--title', '-t', dest='title',
4913 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004914 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004915 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004916 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004917 parser.add_option('--tbrs',
4918 action='append', default=[],
4919 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004920 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004921 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004922 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004923 parser.add_option('--hashtag', dest='hashtags',
4924 action='append', default=[],
4925 help=('Gerrit hashtag for new CL; '
4926 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004927 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004928 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004929 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004930 help='tell the commit queue to commit this patchset; '
4931 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004932 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004933 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004934 metavar='TARGET',
4935 help='Apply CL to remote ref TARGET. ' +
4936 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004937 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004938 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004939 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004940 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004941 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004942 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004943 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4944 const='TBR', help='add a set of OWNERS to TBR')
4945 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4946 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004947 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4948 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004949 help='Send the patchset to do a CQ dry run right after '
4950 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004951 parser.add_option('--dependencies', action='store_true',
4952 help='Uploads CLs of all the local branches that depend on '
4953 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004954 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4955 help='Sends your change to the CQ after an approval. Only '
4956 'works on repos that have the Auto-Submit label '
4957 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004958 parser.add_option('--parallel', action='store_true',
4959 help='Run all tests specified by input_api.RunTests in all '
4960 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004961
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004962 parser.add_option('--no-autocc', action='store_true',
4963 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004964 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004965 help='Set the review private. This implies --no-autocc.')
4966
rmistry@google.com2dd99862015-06-22 12:22:18 +00004967 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004968 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004969 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004970 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004971 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004972 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004973
sbc@chromium.org71437c02015-04-09 19:29:40 +00004974 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004975 return 1
4976
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004977 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004978 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004979 options.cc = cleanup_list(options.cc)
4980
tandriib80458a2016-06-23 12:20:07 -07004981 if options.message_file:
4982 if options.message:
4983 parser.error('only one of --message and --message-file allowed.')
4984 options.message = gclient_utils.FileRead(options.message_file)
4985 options.message_file = None
4986
tandrii4d0545a2016-07-06 03:56:49 -07004987 if options.cq_dry_run and options.use_commit_queue:
4988 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4989
Aaron Gableedbc4132017-09-11 13:22:28 -07004990 if options.use_commit_queue:
4991 options.send_mail = True
4992
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004993 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4994 settings.GetIsGerrit()
4995
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004996 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004997 if not cl.IsGerrit():
4998 # Error out with instructions for repos not yet configured for Gerrit.
4999 print('=====================================')
5000 print('NOTICE: Rietveld is no longer supported. '
5001 'You can upload changes to Gerrit with')
5002 print(' git cl upload --gerrit')
5003 print('or set Gerrit to be your default code review tool with')
5004 print(' git config gerrit.host true')
5005 print('=====================================')
5006 return 1
5007
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005008 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005009
5010
Francois Dorayd42c6812017-05-30 15:10:20 -04005011@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005012@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005013def CMDsplit(parser, args):
5014 """Splits a branch into smaller branches and uploads CLs.
5015
5016 Creates a branch and uploads a CL for each group of files modified in the
5017 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005018 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005019 the shared OWNERS file.
5020 """
5021 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005022 help="A text file containing a CL description in which "
5023 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005024 parser.add_option("-c", "--comment", dest="comment_file",
5025 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11005026 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
5027 default=False,
5028 help="List the files and reviewers for each CL that would "
5029 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00005030 parser.add_option("--cq-dry-run", action='store_true',
5031 help="If set, will do a cq dry run for each uploaded CL. "
5032 "Please be careful when doing this; more than ~10 CLs "
5033 "has the potential to overload our build "
5034 "infrastructure. Try to upload these not during high "
5035 "load times (usually 11-3 Mountain View time). Email "
5036 "infra-dev@chromium.org with any questions.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005037 options, _ = parser.parse_args(args)
5038
5039 if not options.description_file:
5040 parser.error('No --description flag specified.')
5041
5042 def WrappedCMDupload(args):
5043 return CMDupload(OptionParser(), args)
5044
5045 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00005046 Changelist, WrappedCMDupload, options.dry_run,
5047 options.cq_dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005048
5049
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005050@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005051@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005052def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005053 """DEPRECATED: Used to commit the current changelist via git-svn."""
5054 message = ('git-cl no longer supports committing to SVN repositories via '
5055 'git-svn. You probably want to use `git cl land` instead.')
5056 print(message)
5057 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005058
5059
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005060# Two special branches used by git cl land.
5061MERGE_BRANCH = 'git-cl-commit'
5062CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5063
5064
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005065@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005066@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005067def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005068 """Commits the current changelist via git.
5069
5070 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5071 upstream and closes the issue automatically and atomically.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005072 """
5073 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5074 help='bypass upload presubmit hook')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005075 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005076 help="force yes to questions (don't prompt)")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005077 parser.add_option('--parallel', action='store_true',
5078 help='Run all tests specified by input_api.RunTests in all '
5079 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005080 auth.add_auth_options(parser)
5081 (options, args) = parser.parse_args(args)
5082 auth_config = auth.extract_auth_config_from_options(options)
5083
5084 cl = Changelist(auth_config=auth_config)
5085
Robert Iannucci2e73d432018-03-14 01:10:47 -07005086 if not cl.IsGerrit():
5087 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005088
Robert Iannucci2e73d432018-03-14 01:10:47 -07005089 if not cl.GetIssue():
5090 DieWithError('You must upload the change first to Gerrit.\n'
5091 ' If you would rather have `git cl land` upload '
5092 'automatically for you, see http://crbug.com/642759')
5093 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02005094 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005095
5096
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005097@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005098@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005099def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005100 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005101 parser.add_option('-b', dest='newbranch',
5102 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005103 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005104 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005105 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005106 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005107 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005108 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005109 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005110 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005111 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005112 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005113
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005114
5115 group = optparse.OptionGroup(
5116 parser,
5117 'Options for continuing work on the current issue uploaded from a '
5118 'different clone (e.g. different machine). Must be used independently '
5119 'from the other options. No issue number should be specified, and the '
5120 'branch must have an issue number associated with it')
5121 group.add_option('--reapply', action='store_true', dest='reapply',
5122 help='Reset the branch and reapply the issue.\n'
5123 'CAUTION: This will undo any local changes in this '
5124 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005125
5126 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005127 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005128 parser.add_option_group(group)
5129
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005130 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005131 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005132 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005133 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005134 auth_config = auth.extract_auth_config_from_options(options)
5135
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005136 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005137 if options.newbranch:
5138 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005139 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005140 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005141
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005142 cl = Changelist(auth_config=auth_config,
5143 codereview=options.forced_codereview)
5144 if not cl.GetIssue():
5145 parser.error('current branch must have an associated issue')
5146
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005147 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005148 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005149 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005150
5151 RunGit(['reset', '--hard', upstream])
5152 if options.pull:
5153 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005154
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005155 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5156 options.directory)
5157
5158 if len(args) != 1 or not args[0]:
5159 parser.error('Must specify issue number or url')
5160
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005161 target_issue_arg = ParseIssueNumberArgument(args[0],
5162 options.forced_codereview)
5163 if not target_issue_arg.valid:
5164 parser.error('invalid codereview url or CL id')
5165
5166 cl_kwargs = {
5167 'auth_config': auth_config,
5168 'codereview_host': target_issue_arg.hostname,
5169 'codereview': options.forced_codereview,
5170 }
5171 detected_codereview_from_url = False
5172 if target_issue_arg.codereview and not options.forced_codereview:
5173 detected_codereview_from_url = True
5174 cl_kwargs['codereview'] = target_issue_arg.codereview
5175 cl_kwargs['issue'] = target_issue_arg.issue
5176
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005177 # We don't want uncommitted changes mixed up with the patch.
5178 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005179 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005180
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005181 if options.newbranch:
5182 if options.force:
5183 RunGit(['branch', '-D', options.newbranch],
5184 stderr=subprocess2.PIPE, error_ok=True)
5185 RunGit(['new-branch', options.newbranch])
5186
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005187 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005188
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005189 if cl.IsGerrit():
5190 if options.reject:
5191 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005192 if options.directory:
5193 parser.error('--directory is not supported with Gerrit codereview.')
5194
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005195 if detected_codereview_from_url:
5196 print('canonical issue/change URL: %s (type: %s)\n' %
5197 (cl.GetIssueURL(), target_issue_arg.codereview))
5198
5199 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005200 options.nocommit, options.directory,
5201 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005202
5203
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005204def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005205 """Fetches the tree status and returns either 'open', 'closed',
5206 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005207 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208 if url:
5209 status = urllib2.urlopen(url).read().lower()
5210 if status.find('closed') != -1 or status == '0':
5211 return 'closed'
5212 elif status.find('open') != -1 or status == '1':
5213 return 'open'
5214 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005215 return 'unset'
5216
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005217
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005218def GetTreeStatusReason():
5219 """Fetches the tree status from a json url and returns the message
5220 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005221 url = settings.GetTreeStatusUrl()
5222 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005223 connection = urllib2.urlopen(json_url)
5224 status = json.loads(connection.read())
5225 connection.close()
5226 return status['message']
5227
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005228
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005229@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005230def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005231 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005232 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005233 status = GetTreeStatus()
5234 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005235 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005236 return 2
5237
vapiera7fbd5a2016-06-16 09:17:49 -07005238 print('The tree is %s' % status)
5239 print()
5240 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241 if status != 'open':
5242 return 1
5243 return 0
5244
5245
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005246@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005247def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005248 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005249 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005250 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005251 '-b', '--bot', action='append',
5252 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5253 'times to specify multiple builders. ex: '
5254 '"-b win_rel -b win_layout". See '
5255 'the try server waterfall for the builders name and the tests '
5256 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005257 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005258 '-B', '--bucket', default='',
5259 help=('Buildbucket bucket to send the try requests.'))
5260 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005261 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005262 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005263 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005264 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005265 help='Revision to use for the try job; default: the revision will '
5266 'be determined by the try recipe that builder runs, which usually '
5267 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005268 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005269 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005270 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005271 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005272 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005273 '--category', default='git_cl_try', help='Specify custom build category.')
5274 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005275 '--project',
5276 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005277 'in recipe to determine to which repository or directory to '
5278 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005279 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005280 '-p', '--property', dest='properties', action='append', default=[],
5281 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005282 'key2=value2 etc. The value will be treated as '
5283 'json if decodable, or as string otherwise. '
5284 'NOTE: using this may make your try job not usable for CQ, '
5285 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005286 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005287 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5288 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005289 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005290 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005291 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005292 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005293 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005294 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005295
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005296 if options.master and options.master.startswith('luci.'):
5297 parser.error(
5298 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005299 # Make sure that all properties are prop=value pairs.
5300 bad_params = [x for x in options.properties if '=' not in x]
5301 if bad_params:
5302 parser.error('Got properties with missing "=": %s' % bad_params)
5303
maruel@chromium.org15192402012-09-06 12:38:29 +00005304 if args:
5305 parser.error('Unknown arguments: %s' % args)
5306
Koji Ishii31c14782018-01-08 17:17:33 +09005307 cl = Changelist(auth_config=auth_config, issue=options.issue,
5308 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005309 if not cl.GetIssue():
5310 parser.error('Need to upload first')
5311
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005312 if cl.IsGerrit():
5313 # HACK: warm up Gerrit change detail cache to save on RPCs.
5314 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5315
tandriie113dfd2016-10-11 10:20:12 -07005316 error_message = cl.CannotTriggerTryJobReason()
5317 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005318 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005319
borenet6c0efe62016-10-19 08:13:29 -07005320 if options.bucket and options.master:
5321 parser.error('Only one of --bucket and --master may be used.')
5322
qyearsley1fdfcb62016-10-24 13:22:03 -07005323 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005324
qyearsleydd49f942016-10-28 11:57:22 -07005325 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5326 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005327 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005328 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005329 print('git cl try with no bots now defaults to CQ dry run.')
5330 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5331 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005332
borenet6c0efe62016-10-19 08:13:29 -07005333 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005334 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005335 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005336 'of bot requires an initial job from a parent (usually a builder). '
5337 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005338 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005339 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005340
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005341 patchset = cl.GetMostRecentPatchset()
tandrii568043b2016-10-11 07:49:18 -07005342 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005343 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005344 except BuildbucketResponseException as ex:
5345 print('ERROR: %s' % ex)
5346 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005347 return 0
5348
5349
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005350@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005351def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005352 """Prints info about try jobs associated with current CL."""
5353 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005354 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005355 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005356 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005357 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005358 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005359 '--color', action='store_true', default=setup_color.IS_TTY,
5360 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005361 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005362 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5363 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005364 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005365 '--json', help=('Path of JSON output file to write try job results to,'
5366 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005367 parser.add_option_group(group)
5368 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005369 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005370 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005371 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005372 if args:
5373 parser.error('Unrecognized args: %s' % ' '.join(args))
5374
5375 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005376 cl = Changelist(
5377 issue=options.issue, codereview=options.forced_codereview,
5378 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005379 if not cl.GetIssue():
5380 parser.error('Need to upload first')
5381
tandrii221ab252016-10-06 08:12:04 -07005382 patchset = options.patchset
5383 if not patchset:
5384 patchset = cl.GetMostRecentPatchset()
5385 if not patchset:
5386 parser.error('Codereview doesn\'t know about issue %s. '
5387 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005388 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005389 cl.GetIssue())
5390
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005391 try:
tandrii221ab252016-10-06 08:12:04 -07005392 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005393 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005394 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005395 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005396 if options.json:
5397 write_try_results_json(options.json, jobs)
5398 else:
5399 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005400 return 0
5401
5402
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005403@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005404@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005405def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005406 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005407 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005408 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005409 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005410
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005411 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005412 if args:
5413 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005414 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005415 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005416 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005417 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005418
5419 # Clear configured merge-base, if there is one.
5420 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005421 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005422 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005423 return 0
5424
5425
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005426@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005427def CMDweb(parser, args):
5428 """Opens the current CL in the web browser."""
5429 _, args = parser.parse_args(args)
5430 if args:
5431 parser.error('Unrecognized args: %s' % ' '.join(args))
5432
5433 issue_url = Changelist().GetIssueURL()
5434 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005435 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005436 return 1
5437
Sergiy Byelozyorov2b718322018-10-24 17:43:31 +00005438 # Redirect I/O before invoking browser to hide its output. For example, this
5439 # allows to hide "Created new window in existing browser session." message
5440 # from Chrome. Based on https://stackoverflow.com/a/2323563.
5441 saved_stdout = os.dup(1)
5442 os.close(1)
5443 os.open(os.devnull, os.O_RDWR)
5444 try:
5445 webbrowser.open(issue_url)
5446 finally:
5447 os.dup2(saved_stdout, 1)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005448 return 0
5449
5450
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005451@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005452def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005453 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005454 parser.add_option('-d', '--dry-run', action='store_true',
5455 help='trigger in dry run mode')
5456 parser.add_option('-c', '--clear', action='store_true',
5457 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005458 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005459 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005460 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005461 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005462 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005463 if args:
5464 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005465 if options.dry_run and options.clear:
5466 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5467
iannuccie53c9352016-08-17 14:40:40 -07005468 cl = Changelist(auth_config=auth_config, issue=options.issue,
5469 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005470 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005471 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005472 elif options.dry_run:
5473 state = _CQState.DRY_RUN
5474 else:
5475 state = _CQState.COMMIT
5476 if not cl.GetIssue():
5477 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005478 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005479 return 0
5480
5481
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005482@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005483def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005484 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005485 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005486 auth.add_auth_options(parser)
5487 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005488 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005489 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005490 if args:
5491 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005492 cl = Changelist(auth_config=auth_config, issue=options.issue,
5493 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005494 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005495 if not cl.GetIssue():
5496 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005497 cl.CloseIssue()
5498 return 0
5499
5500
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005501@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005502def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005503 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005504 parser.add_option(
5505 '--stat',
5506 action='store_true',
5507 dest='stat',
5508 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005509 auth.add_auth_options(parser)
5510 options, args = parser.parse_args(args)
5511 auth_config = auth.extract_auth_config_from_options(options)
5512 if args:
5513 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005514
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005515 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005516 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005517 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005518 if not issue:
5519 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005520
Aaron Gablea718c3e2017-08-28 17:47:28 -07005521 base = cl._GitGetBranchConfigValue('last-upload-hash')
5522 if not base:
5523 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5524 if not base:
5525 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5526 revision_info = detail['revisions'][detail['current_revision']]
5527 fetch_info = revision_info['fetch']['http']
5528 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5529 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005530
Aaron Gablea718c3e2017-08-28 17:47:28 -07005531 cmd = ['git', 'diff']
5532 if options.stat:
5533 cmd.append('--stat')
5534 cmd.append(base)
5535 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005536
5537 return 0
5538
5539
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005540@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005541def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005542 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005543 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005544 '--ignore-current',
5545 action='store_true',
5546 help='Ignore the CL\'s current reviewers and start from scratch.')
5547 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005548 '--no-color',
5549 action='store_true',
5550 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005551 parser.add_option(
5552 '--batch',
5553 action='store_true',
5554 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005555 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005556 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005557 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005558
5559 author = RunGit(['config', 'user.email']).strip() or None
5560
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005561 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005562
5563 if args:
5564 if len(args) > 1:
5565 parser.error('Unknown args')
5566 base_branch = args[0]
5567 else:
5568 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005569 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005570
5571 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005572 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5573
5574 if options.batch:
5575 db = owners.Database(change.RepositoryRoot(), file, os.path)
5576 print('\n'.join(db.reviewers_for(affected_files, author)))
5577 return 0
5578
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005579 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005580 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005581 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005582 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005583 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005584 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005585 disable_color=options.no_color,
5586 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005587
5588
Aiden Bennerc08566e2018-10-03 17:52:42 +00005589def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005590 """Generates a diff command."""
5591 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005592 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5593
5594 if not allow_prefix:
5595 diff_cmd += ['--no-prefix']
5596
5597 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005598
5599 if args:
5600 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005601 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005602 diff_cmd.append(arg)
5603 else:
5604 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005605
5606 return diff_cmd
5607
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005608
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005609def MatchingFileType(file_name, extensions):
5610 """Returns true if the file name ends with one of the given extensions."""
5611 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005612
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005613
enne@chromium.org555cfe42014-01-29 18:21:39 +00005614@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005615@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005616def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005617 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005618 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005619 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005620 parser.add_option('--full', action='store_true',
5621 help='Reformat the full content of all touched files')
5622 parser.add_option('--dry-run', action='store_true',
5623 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005624 parser.add_option('--python', action='store_true',
5625 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005626 parser.add_option('--js', action='store_true',
5627 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005628 parser.add_option('--diff', action='store_true',
5629 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005630 parser.add_option('--presubmit', action='store_true',
5631 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005632 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005633
Daniel Chengc55eecf2016-12-30 03:11:02 -08005634 # Normalize any remaining args against the current path, so paths relative to
5635 # the current directory are still resolved as expected.
5636 args = [os.path.join(os.getcwd(), arg) for arg in args]
5637
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005638 # git diff generates paths against the root of the repository. Change
5639 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005640 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005641 if rel_base_path:
5642 os.chdir(rel_base_path)
5643
digit@chromium.org29e47272013-05-17 17:01:46 +00005644 # Grab the merge-base commit, i.e. the upstream commit of the current
5645 # branch when it was created or the last time it was rebased. This is
5646 # to cover the case where the user may have called "git fetch origin",
5647 # moving the origin branch to a newer commit, but hasn't rebased yet.
5648 upstream_commit = None
5649 cl = Changelist()
5650 upstream_branch = cl.GetUpstreamBranch()
5651 if upstream_branch:
5652 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5653 upstream_commit = upstream_commit.strip()
5654
5655 if not upstream_commit:
5656 DieWithError('Could not find base commit for this branch. '
5657 'Are you in detached state?')
5658
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005659 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5660 diff_output = RunGit(changed_files_cmd)
5661 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005662 # Filter out files deleted by this CL
5663 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005664
Christopher Lamc5ba6922017-01-24 11:19:14 +11005665 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005666 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005667
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005668 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5669 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5670 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005671 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005672
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005673 top_dir = os.path.normpath(
5674 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5675
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005676 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5677 # formatted. This is used to block during the presubmit.
5678 return_value = 0
5679
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005680 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005681 # Locate the clang-format binary in the checkout
5682 try:
5683 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005684 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005685 DieWithError(e)
5686
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005687 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005688 cmd = [clang_format_tool]
5689 if not opts.dry_run and not opts.diff:
5690 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005691 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005692 if opts.diff:
5693 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005694 else:
5695 env = os.environ.copy()
5696 env['PATH'] = str(os.path.dirname(clang_format_tool))
5697 try:
5698 script = clang_format.FindClangFormatScriptInChromiumTree(
5699 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005700 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005701 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005702
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005703 cmd = [sys.executable, script, '-p0']
5704 if not opts.dry_run and not opts.diff:
5705 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005706
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005707 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5708 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005709
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005710 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5711 if opts.diff:
5712 sys.stdout.write(stdout)
5713 if opts.dry_run and len(stdout) > 0:
5714 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005715
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005716 # Similar code to above, but using yapf on .py files rather than clang-format
5717 # on C/C++ files
Aiden Bennerc08566e2018-10-03 17:52:42 +00005718 if opts.python and python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005719 yapf_tool = gclient_utils.FindExecutable('yapf')
5720 if yapf_tool is None:
5721 DieWithError('yapf not found in PATH')
5722
Aiden Bennerc08566e2018-10-03 17:52:42 +00005723 # If we couldn't find a yapf file we'll default to the chromium style
5724 # specified in depot_tools.
5725 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5726 chromium_default_yapf_style = os.path.join(depot_tools_path,
5727 YAPF_CONFIG_FILENAME)
5728
5729 # Note: yapf still seems to fix indentation of the entire file
5730 # even if line ranges are specified.
5731 # See https://github.com/google/yapf/issues/499
5732 if not opts.full:
5733 py_line_diffs = _ComputeDiffLineRanges(python_diff_files, upstream_commit)
5734
5735 # Used for caching.
5736 yapf_configs = {}
5737 for f in python_diff_files:
5738 # Find the yapf style config for the current file, defaults to depot
5739 # tools default.
5740 yapf_config = _FindYapfConfigFile(
5741 os.path.abspath(f), yapf_configs, top_dir,
5742 chromium_default_yapf_style)
5743
5744 cmd = [yapf_tool, '--style', yapf_config, f]
5745
5746 has_formattable_lines = False
5747 if not opts.full:
5748 # Only run yapf over changed line ranges.
5749 for diff_start, diff_len in py_line_diffs[f]:
5750 diff_end = diff_start + diff_len - 1
5751 # Yapf errors out if diff_end < diff_start but this
5752 # is a valid line range diff for a removal.
5753 if diff_end >= diff_start:
5754 has_formattable_lines = True
5755 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5756 # If all line diffs were removals we have nothing to format.
5757 if not has_formattable_lines:
5758 continue
5759
5760 if opts.diff or opts.dry_run:
5761 cmd += ['--diff']
5762 # Will return non-zero exit code if non-empty diff.
5763 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5764 if opts.diff:
5765 sys.stdout.write(stdout)
5766 elif len(stdout) > 0:
5767 return_value = 2
5768 else:
5769 cmd += ['-i']
5770 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005771
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005772 # Dart's formatter does not have the nice property of only operating on
5773 # modified chunks, so hard code full.
5774 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005775 try:
5776 command = [dart_format.FindDartFmtToolInChromiumTree()]
5777 if not opts.dry_run and not opts.diff:
5778 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005779 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005780
ppi@chromium.org6593d932016-03-03 15:41:15 +00005781 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005782 if opts.dry_run and stdout:
5783 return_value = 2
5784 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005785 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5786 'found in this checkout. Files in other languages are still '
5787 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005788
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005789 # Format GN build files. Always run on full build files for canonical form.
5790 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005791 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005792 if opts.dry_run or opts.diff:
5793 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005794 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005795 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5796 shell=sys.platform == 'win32',
5797 cwd=top_dir)
5798 if opts.dry_run and gn_ret == 2:
5799 return_value = 2 # Not formatted.
5800 elif opts.diff and gn_ret == 2:
5801 # TODO this should compute and print the actual diff.
5802 print("This change has GN build file diff for " + gn_diff_file)
5803 elif gn_ret != 0:
5804 # For non-dry run cases (and non-2 return values for dry-run), a
5805 # nonzero error code indicates a failure, probably because the file
5806 # doesn't parse.
5807 DieWithError("gn format failed on " + gn_diff_file +
5808 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005809
Ilya Shermane081cbe2017-08-15 17:51:04 -07005810 # Skip the metrics formatting from the global presubmit hook. These files have
5811 # a separate presubmit hook that issues an error if the files need formatting,
5812 # whereas the top-level presubmit script merely issues a warning. Formatting
5813 # these files is somewhat slow, so it's important not to duplicate the work.
5814 if not opts.presubmit:
5815 for xml_dir in GetDirtyMetricsDirs(diff_files):
5816 tool_dir = os.path.join(top_dir, xml_dir)
5817 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5818 if opts.dry_run or opts.diff:
5819 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005820 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005821 if opts.diff:
5822 sys.stdout.write(stdout)
5823 if opts.dry_run and stdout:
5824 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005825
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005826 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005827
Steven Holte2e664bf2017-04-21 13:10:47 -07005828def GetDirtyMetricsDirs(diff_files):
5829 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5830 metrics_xml_dirs = [
5831 os.path.join('tools', 'metrics', 'actions'),
5832 os.path.join('tools', 'metrics', 'histograms'),
5833 os.path.join('tools', 'metrics', 'rappor'),
5834 os.path.join('tools', 'metrics', 'ukm')]
5835 for xml_dir in metrics_xml_dirs:
5836 if any(file.startswith(xml_dir) for file in xml_diff_files):
5837 yield xml_dir
5838
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005839
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005840@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005841@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005842def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005843 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005844 _, args = parser.parse_args(args)
5845
5846 if len(args) != 1:
5847 parser.print_help()
5848 return 1
5849
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005850 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005851 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005852 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005853
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005854 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005855
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005856 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005857 output = RunGit(['config', '--local', '--get-regexp',
5858 r'branch\..*\.%s' % issueprefix],
5859 error_ok=True)
5860 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005861 if issue == target_issue:
5862 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005863
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005864 branches = []
5865 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005866 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005867 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005868 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005869 return 1
5870 if len(branches) == 1:
5871 RunGit(['checkout', branches[0]])
5872 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005873 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005874 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005875 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005876 which = raw_input('Choose by index: ')
5877 try:
5878 RunGit(['checkout', branches[int(which)]])
5879 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005880 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005881 return 1
5882
5883 return 0
5884
5885
maruel@chromium.org29404b52014-09-08 22:58:00 +00005886def CMDlol(parser, args):
5887 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005888 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005889 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5890 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5891 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005892 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005893 return 0
5894
5895
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005896class OptionParser(optparse.OptionParser):
5897 """Creates the option parse and add --verbose support."""
5898 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005899 optparse.OptionParser.__init__(
5900 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005901 self.add_option(
5902 '-v', '--verbose', action='count', default=0,
5903 help='Use 2 times for more debugging info')
5904
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005905 def parse_args(self, args=None, _values=None):
Andrii Shyshkalov46f20cd2018-10-30 06:42:54 +00005906 try:
5907 return self._parse_args(args)
5908 finally:
5909 # Regardless of success or failure of args parsing, we want to report
5910 # metrics, but only after logging has been initialized (if parsing
5911 # succeeded).
5912 global settings
5913 settings = Settings()
5914
5915 if not metrics.DISABLE_METRICS_COLLECTION:
5916 # GetViewVCUrl ultimately calls logging method.
5917 project_url = settings.GetViewVCUrl().strip('/+')
5918 if project_url in metrics_utils.KNOWN_PROJECT_URLS:
5919 metrics.collector.add('project_urls', [project_url])
5920
5921 def _parse_args(self, args=None):
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005922 # Create an optparse.Values object that will store only the actual passed
5923 # options, without the defaults.
5924 actual_options = optparse.Values()
5925 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
5926 # Create an optparse.Values object with the default options.
5927 options = optparse.Values(self.get_default_values().__dict__)
5928 # Update it with the options passed by the user.
5929 options._update_careful(actual_options.__dict__)
5930 # Store the options passed by the user in an _actual_options attribute.
5931 # We store only the keys, and not the values, since the values can contain
5932 # arbitrary information, which might be PII.
5933 metrics.collector.add('arguments', actual_options.__dict__.keys())
5934
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005935 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005936 logging.basicConfig(
5937 level=levels[min(options.verbose, len(levels) - 1)],
5938 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5939 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00005940
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005941 return options, args
5942
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005943
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005944def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005945 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005946 print('\nYour python version %s is unsupported, please upgrade.\n' %
5947 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005948 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005949
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005950 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005951 dispatcher = subcommand.CommandDispatcher(__name__)
5952 try:
5953 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005954 except auth.AuthenticationError as e:
5955 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005956 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005957 if e.code != 500:
5958 raise
5959 DieWithError(
5960 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5961 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005962 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005963
5964
5965if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005966 # These affect sys.stdout so do it outside of main() to simplify mocks in
5967 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005968 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005969 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00005970 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00005971 sys.exit(main(sys.argv[1:]))