blob: 1fc3139bbd0671667db56a2e63fbd4b74807e481 [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
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
39try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080040 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000041except ImportError:
42 pass
43
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000044from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000045from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000046from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000047import auth
skobes6468b902016-10-24 08:45:10 -070048import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000049import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000050import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000051import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000052import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000053import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000054import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000055import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000056import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000057import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000058import metrics
piman@chromium.org336f9122014-09-04 02:16:55 +000059import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000060import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000062import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040064import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000065import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000066import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067import watchlists
68
tandrii7400cf02016-06-21 08:48:07 -070069__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000070
tandrii9d2c7a32016-06-22 03:42:45 -070071COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070072DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080073POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000075REFS_THAT_ALIAS_TO_OTHER_REFS = {
76 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
77 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
78}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000079
thestig@chromium.org44202a22014-03-11 19:22:18 +000080# Valid extensions for files we want to lint.
81DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
82DEFAULT_LINT_IGNORE_REGEX = r"$^"
83
Aiden Bennerc08566e2018-10-03 17:52:42 +000084# File name for yapf style config files.
85YAPF_CONFIG_FILENAME = '.style.yapf'
86
borenet6c0efe62016-10-19 08:13:29 -070087# Buildbucket master name prefix.
88MASTER_PREFIX = 'master.'
89
Edward Lemur83bd7f42018-10-10 00:14:21 +000090# TODO(crbug.com/881860): Remove
91# Log gerrit failures to a gerrit_util.GERRIT_ERR_LOG_FILE.
92GERRIT_ERR_LOGGER = logging.getLogger('GerritErrorLogs')
93
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000094# Shortcut since it quickly becomes redundant.
95Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000096
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097# Initialized in main()
98settings = None
99
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100100# Used by tests/git_cl_test.py to add extra logging.
101# Inside the weirdly failing test, add this:
102# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700103# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100104_IS_BEING_TESTED = False
105
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000106
Christopher Lamf732cd52017-01-24 12:40:11 +1100107def DieWithError(message, change_desc=None):
108 if change_desc:
109 SaveDescriptionBackup(change_desc)
110
vapiera7fbd5a2016-06-16 09:17:49 -0700111 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112 sys.exit(1)
113
114
Christopher Lamf732cd52017-01-24 12:40:11 +1100115def SaveDescriptionBackup(change_desc):
116 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000117 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100118 backup_file = open(backup_path, 'w')
119 backup_file.write(change_desc.description)
120 backup_file.close()
121
122
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000123def GetNoGitPagerEnv():
124 env = os.environ.copy()
125 # 'cat' is a magical git string that disables pagers on all platforms.
126 env['GIT_PAGER'] = 'cat'
127 return env
128
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000129
bsep@chromium.org627d9002016-04-29 00:00:52 +0000130def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000132 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000133 except subprocess2.CalledProcessError as e:
134 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000135 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000137 'Command "%s" failed.\n%s' % (
138 ' '.join(args), error_message or e.stdout or ''))
139 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000140
141
142def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000143 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000144 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000145
146
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000147def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000148 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700149 if suppress_stderr:
150 stderr = subprocess2.VOID
151 else:
152 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000153 try:
tandrii5d48c322016-08-18 16:19:37 -0700154 (out, _), code = subprocess2.communicate(['git'] + args,
155 env=GetNoGitPagerEnv(),
156 stdout=subprocess2.PIPE,
157 stderr=stderr)
158 return code, out
159 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900160 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700161 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162
163
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000164def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000165 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000166 return RunGitWithCode(args, suppress_stderr=True)[1]
167
168
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000169def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000170 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000171 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000172 return (version.startswith(prefix) and
173 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000174
175
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000176def BranchExists(branch):
177 """Return True if specified branch exists."""
178 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
179 suppress_stderr=True)
180 return not code
181
182
tandrii2a16b952016-10-19 07:09:44 -0700183def time_sleep(seconds):
184 # Use this so that it can be mocked in tests without interfering with python
185 # system machinery.
186 import time # Local import to discourage others from importing time globally.
187 return time.sleep(seconds)
188
189
maruel@chromium.org90541732011-04-01 17:54:18 +0000190def ask_for_data(prompt):
191 try:
192 return raw_input(prompt)
193 except KeyboardInterrupt:
194 # Hide the exception.
195 sys.exit(1)
196
197
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100198def confirm_or_exit(prefix='', action='confirm'):
199 """Asks user to press enter to continue or press Ctrl+C to abort."""
200 if not prefix or prefix.endswith('\n'):
201 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100202 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100203 mid = ' Press'
204 elif prefix.endswith(' '):
205 mid = 'press'
206 else:
207 mid = ' press'
208 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
209
210
211def ask_for_explicit_yes(prompt):
212 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
213 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
214 while True:
215 if 'yes'.startswith(result):
216 return True
217 if 'no'.startswith(result):
218 return False
219 result = ask_for_data('Please, type yes or no: ').lower()
220
221
tandrii5d48c322016-08-18 16:19:37 -0700222def _git_branch_config_key(branch, key):
223 """Helper method to return Git config key for a branch."""
224 assert branch, 'branch name is required to set git config for it'
225 return 'branch.%s.%s' % (branch, key)
226
227
228def _git_get_branch_config_value(key, default=None, value_type=str,
229 branch=False):
230 """Returns git config value of given or current branch if any.
231
232 Returns default in all other cases.
233 """
234 assert value_type in (int, str, bool)
235 if branch is False: # Distinguishing default arg value from None.
236 branch = GetCurrentBranch()
237
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000238 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700239 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000240
tandrii5d48c322016-08-18 16:19:37 -0700241 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700242 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700243 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700244 # git config also has --int, but apparently git config suffers from integer
245 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700246 args.append(_git_branch_config_key(branch, key))
247 code, out = RunGitWithCode(args)
248 if code == 0:
249 value = out.strip()
250 if value_type == int:
251 return int(value)
252 if value_type == bool:
253 return bool(value.lower() == 'true')
254 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000255 return default
256
257
tandrii5d48c322016-08-18 16:19:37 -0700258def _git_set_branch_config_value(key, value, branch=None, **kwargs):
259 """Sets the value or unsets if it's None of a git branch config.
260
261 Valid, though not necessarily existing, branch must be provided,
262 otherwise currently checked out branch is used.
263 """
264 if not branch:
265 branch = GetCurrentBranch()
266 assert branch, 'a branch name OR currently checked out branch is required'
267 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700268 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700269 if value is None:
270 args.append('--unset')
271 elif isinstance(value, bool):
272 args.append('--bool')
273 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700274 else:
tandrii33a46ff2016-08-23 05:53:40 -0700275 # git config also has --int, but apparently git config suffers from integer
276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 value = str(value)
278 args.append(_git_branch_config_key(branch, key))
279 if value is not None:
280 args.append(value)
281 RunGit(args, **kwargs)
282
283
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100284def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700285 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100286
287 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
288 """
289 # Git also stores timezone offset, but it only affects visual display,
290 # actual point in time is defined by this timestamp only.
291 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
292
293
294def _git_amend_head(message, committer_timestamp):
295 """Amends commit with new message and desired committer_timestamp.
296
297 Sets committer timezone to UTC.
298 """
299 env = os.environ.copy()
300 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
301 return RunGit(['commit', '--amend', '-m', message], env=env)
302
303
machenbach@chromium.org45453142015-09-15 08:45:22 +0000304def _get_properties_from_options(options):
305 properties = dict(x.split('=', 1) for x in options.properties)
306 for key, val in properties.iteritems():
307 try:
308 properties[key] = json.loads(val)
309 except ValueError:
310 pass # If a value couldn't be evaluated, treat it as a string.
311 return properties
312
313
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000314def _prefix_master(master):
315 """Convert user-specified master name to full master name.
316
317 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
318 name, while the developers always use shortened master name
319 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
320 function does the conversion for buildbucket migration.
321 """
borenet6c0efe62016-10-19 08:13:29 -0700322 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000323 return master
borenet6c0efe62016-10-19 08:13:29 -0700324 return '%s%s' % (MASTER_PREFIX, master)
325
326
327def _unprefix_master(bucket):
328 """Convert bucket name to shortened master name.
329
330 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
331 name, while the developers always use shortened master name
332 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
333 function does the conversion for buildbucket migration.
334 """
335 if bucket.startswith(MASTER_PREFIX):
336 return bucket[len(MASTER_PREFIX):]
337 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000338
339
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000340def _buildbucket_retry(operation_name, http, *args, **kwargs):
341 """Retries requests to buildbucket service and returns parsed json content."""
342 try_count = 0
343 while True:
344 response, content = http.request(*args, **kwargs)
345 try:
346 content_json = json.loads(content)
347 except ValueError:
348 content_json = None
349
350 # Buildbucket could return an error even if status==200.
351 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000352 error = content_json.get('error')
353 if error.get('code') == 403:
354 raise BuildbucketResponseException(
355 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000357 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000358 raise BuildbucketResponseException(msg)
359
360 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700361 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 raise BuildbucketResponseException(
363 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700364 'Please file bugs at http://crbug.com, '
365 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000366 content)
367 return content_json
368 if response.status < 500 or try_count >= 2:
369 raise httplib2.HttpLib2Error(content)
370
371 # status >= 500 means transient failures.
372 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700373 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000374 try_count += 1
375 assert False, 'unreachable'
376
377
qyearsley1fdfcb62016-10-24 13:22:03 -0700378def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700379 """Returns a dict mapping bucket names to builders and tests,
380 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700381 """
qyearsleydd49f942016-10-28 11:57:22 -0700382 # If no bots are listed, we try to get a set of builders and tests based
383 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700384 if not options.bot:
385 change = changelist.GetChange(
386 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700387 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700388 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700389 change=change,
390 changed_files=change.LocalPaths(),
391 repository_root=settings.GetRoot(),
392 default_presubmit=None,
393 project=None,
394 verbose=options.verbose,
395 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700396 if masters is None:
397 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100398 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700399
qyearsley1fdfcb62016-10-24 13:22:03 -0700400 if options.bucket:
401 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700402 if options.master:
403 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700404
qyearsleydd49f942016-10-28 11:57:22 -0700405 # If bots are listed but no master or bucket, then we need to find out
406 # the corresponding master for each bot.
407 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
408 if error_message:
409 option_parser.error(
410 'Tryserver master cannot be found because: %s\n'
411 'Please manually specify the tryserver master, e.g. '
412 '"-m tryserver.chromium.linux".' % error_message)
413 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700414
415
qyearsley123a4682016-10-26 09:12:17 -0700416def _get_bucket_map_for_builders(builders):
417 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 map_url = 'https://builders-map.appspot.com/'
419 try:
qyearsley123a4682016-10-26 09:12:17 -0700420 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700421 except urllib2.URLError as e:
422 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
423 (map_url, e))
424 except ValueError as e:
425 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700426 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700427 return None, 'Failed to build master map.'
428
qyearsley123a4682016-10-26 09:12:17 -0700429 bucket_map = {}
430 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800431 bucket = builders_map.get(builder, {}).get('bucket')
432 if bucket:
433 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700434 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700435
436
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800437def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700438 """Sends a request to Buildbucket to trigger try jobs for a changelist.
439
440 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700441 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700442 changelist: Changelist that the try jobs are associated with.
443 buckets: A nested dict mapping bucket names to builders to tests.
444 options: Command-line options.
445 """
tandriide281ae2016-10-12 06:02:30 -0700446 assert changelist.GetIssue(), 'CL must be uploaded first'
447 codereview_url = changelist.GetCodereviewServer()
448 assert codereview_url, 'CL must be uploaded first'
449 patchset = patchset or changelist.GetMostRecentPatchset()
450 assert patchset, 'CL must be uploaded first'
451
452 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700453 # Cache the buildbucket credentials under the codereview host key, so that
454 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700455 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000456 http = authenticator.authorize(httplib2.Http())
457 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700458
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000459 buildbucket_put_url = (
460 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000461 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700462 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
463 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
464 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
tandrii221ab252016-10-06 08:12:04 -0700555 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
556 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
557 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700559 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000560 params = {'tag': 'buildset:%s' % buildset}
561
562 builds = {}
563 while True:
564 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700565 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700567 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568 for build in content.get('builds', []):
569 builds[build['id']] = build
570 if 'next_cursor' in content:
571 params['start_cursor'] = content['next_cursor']
572 else:
573 break
574 return builds
575
576
qyearsleyeab3c042016-08-24 09:18:28 -0700577def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000578 """Prints nicely result of fetch_try_jobs."""
579 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700580 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000581 return
582
583 # Make a copy, because we'll be modifying builds dictionary.
584 builds = builds.copy()
585 builder_names_cache = {}
586
587 def get_builder(b):
588 try:
589 return builder_names_cache[b['id']]
590 except KeyError:
591 try:
592 parameters = json.loads(b['parameters_json'])
593 name = parameters['builder_name']
594 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700595 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700596 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000597 name = None
598 builder_names_cache[b['id']] = name
599 return name
600
601 def get_bucket(b):
602 bucket = b['bucket']
603 if bucket.startswith('master.'):
604 return bucket[len('master.'):]
605 return bucket
606
607 if options.print_master:
608 name_fmt = '%%-%ds %%-%ds' % (
609 max(len(str(get_bucket(b))) for b in builds.itervalues()),
610 max(len(str(get_builder(b))) for b in builds.itervalues()))
611 def get_name(b):
612 return name_fmt % (get_bucket(b), get_builder(b))
613 else:
614 name_fmt = '%%-%ds' % (
615 max(len(str(get_builder(b))) for b in builds.itervalues()))
616 def get_name(b):
617 return name_fmt % get_builder(b)
618
619 def sort_key(b):
620 return b['status'], b.get('result'), get_name(b), b.get('url')
621
622 def pop(title, f, color=None, **kwargs):
623 """Pop matching builds from `builds` dict and print them."""
624
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000625 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000626 colorize = str
627 else:
628 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
629
630 result = []
631 for b in builds.values():
632 if all(b.get(k) == v for k, v in kwargs.iteritems()):
633 builds.pop(b['id'])
634 result.append(b)
635 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700636 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700638 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000639
640 total = len(builds)
641 pop(status='COMPLETED', result='SUCCESS',
642 title='Successes:', color=Fore.GREEN,
643 f=lambda b: (get_name(b), b.get('url')))
644 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
645 title='Infra Failures:', color=Fore.MAGENTA,
646 f=lambda b: (get_name(b), b.get('url')))
647 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
648 title='Failures:', color=Fore.RED,
649 f=lambda b: (get_name(b), b.get('url')))
650 pop(status='COMPLETED', result='CANCELED',
651 title='Canceled:', color=Fore.MAGENTA,
652 f=lambda b: (get_name(b),))
653 pop(status='COMPLETED', result='FAILURE',
654 failure_reason='INVALID_BUILD_DEFINITION',
655 title='Wrong master/builder name:', color=Fore.MAGENTA,
656 f=lambda b: (get_name(b),))
657 pop(status='COMPLETED', result='FAILURE',
658 title='Other failures:',
659 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
660 pop(status='COMPLETED',
661 title='Other finished:',
662 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
663 pop(status='STARTED',
664 title='Started:', color=Fore.YELLOW,
665 f=lambda b: (get_name(b), b.get('url')))
666 pop(status='SCHEDULED',
667 title='Scheduled:',
668 f=lambda b: (get_name(b), 'id=%s' % b['id']))
669 # The last section is just in case buildbucket API changes OR there is a bug.
670 pop(title='Other:',
671 f=lambda b: (get_name(b), 'id=%s' % b['id']))
672 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700673 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674
675
Aiden Bennerc08566e2018-10-03 17:52:42 +0000676def _ComputeDiffLineRanges(files, upstream_commit):
677 """Gets the changed line ranges for each file since upstream_commit.
678
679 Parses a git diff on provided files and returns a dict that maps a file name
680 to an ordered list of range tuples in the form (start_line, count).
681 Ranges are in the same format as a git diff.
682 """
683 # If files is empty then diff_output will be a full diff.
684 if len(files) == 0:
685 return {}
686
687 # Take diff and find the line ranges where there are changes.
688 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
689 diff_output = RunGit(diff_cmd)
690
691 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
692 # 2 capture groups
693 # 0 == fname of diff file
694 # 1 == 'diff_start,diff_count' or 'diff_start'
695 # will match each of
696 # diff --git a/foo.foo b/foo.py
697 # @@ -12,2 +14,3 @@
698 # @@ -12,2 +17 @@
699 # running re.findall on the above string with pattern will give
700 # [('foo.py', ''), ('', '14,3'), ('', '17')]
701
702 curr_file = None
703 line_diffs = {}
704 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
705 if match[0] != '':
706 # Will match the second filename in diff --git a/a.py b/b.py.
707 curr_file = match[0]
708 line_diffs[curr_file] = []
709 else:
710 # Matches +14,3
711 if ',' in match[1]:
712 diff_start, diff_count = match[1].split(',')
713 else:
714 # Single line changes are of the form +12 instead of +12,1.
715 diff_start = match[1]
716 diff_count = 1
717
718 diff_start = int(diff_start)
719 diff_count = int(diff_count)
720
721 # If diff_count == 0 this is a removal we can ignore.
722 line_diffs[curr_file].append((diff_start, diff_count))
723
724 return line_diffs
725
726
727def _FindYapfConfigFile(fpath,
728 yapf_config_cache,
729 top_dir=None,
730 default_style=None):
731 """Checks if a yapf file is in any parent directory of fpath until top_dir.
732
733 Recursively checks parent directories to find yapf file
734 and if no yapf file is found returns default_style.
735 Uses yapf_config_cache as a cache for previously found files.
736 """
737 # Return result if we've already computed it.
738 if fpath in yapf_config_cache:
739 return yapf_config_cache[fpath]
740
741 # Check if there is a style file in the current directory.
742 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
743 dirname = os.path.dirname(fpath)
744 if os.path.isfile(yapf_file):
745 ret = yapf_file
746 elif fpath == top_dir or dirname == fpath:
747 # If we're at the top level directory, or if we're at root
748 # use the chromium default yapf style.
749 ret = default_style
750 else:
751 # Otherwise recurse on the current directory.
752 ret = _FindYapfConfigFile(dirname, yapf_config_cache, top_dir,
753 default_style)
754 yapf_config_cache[fpath] = ret
755 return ret
756
757
qyearsley53f48a12016-09-01 10:45:13 -0700758def write_try_results_json(output_file, builds):
759 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
760
761 The input |builds| dict is assumed to be generated by Buildbucket.
762 Buildbucket documentation: http://goo.gl/G0s101
763 """
764
765 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800766 """Extracts some of the information from one build dict."""
767 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700768 return {
769 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700770 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800771 'builder_name': parameters.get('builder_name'),
772 'created_ts': build.get('created_ts'),
773 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700774 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800775 'result': build.get('result'),
776 'status': build.get('status'),
777 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700778 'url': build.get('url'),
779 }
780
781 converted = []
782 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000783 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700784 write_json(output_file, converted)
785
786
Aaron Gable13101a62018-02-09 13:20:41 -0800787def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000788 """Prints statistics about the change to the user."""
789 # --no-ext-diff is broken in some versions of Git, so try to work around
790 # this by overriding the environment (but there is still a problem if the
791 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000792 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000793 if 'GIT_EXTERNAL_DIFF' in env:
794 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000795
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000796 try:
797 stdout = sys.stdout.fileno()
798 except AttributeError:
799 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000800 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800801 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000802 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000803
804
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000805class BuildbucketResponseException(Exception):
806 pass
807
808
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000809class Settings(object):
810 def __init__(self):
811 self.default_server = None
812 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000813 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814 self.tree_status_url = None
815 self.viewvc_url = None
816 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000817 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000818 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000819 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000820 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000821 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000822 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000823
824 def LazyUpdateIfNeeded(self):
825 """Updates the settings from a codereview.settings file, if available."""
826 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000827 # The only value that actually changes the behavior is
828 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000829 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000830 error_ok=True
831 ).strip().lower()
832
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000834 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835 LoadCodereviewSettingsFromFile(cr_settings_file)
836 self.updated = True
837
838 def GetDefaultServerUrl(self, error_ok=False):
839 if not self.default_server:
840 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000841 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000842 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000843 if error_ok:
844 return self.default_server
845 if not self.default_server:
846 error_message = ('Could not find settings file. You must configure '
847 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000848 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000849 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000850 return self.default_server
851
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000852 @staticmethod
853 def GetRelativeRoot():
854 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000856 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000857 if self.root is None:
858 self.root = os.path.abspath(self.GetRelativeRoot())
859 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000860
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000861 def GetGitMirror(self, remote='origin'):
862 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000863 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000864 if not os.path.isdir(local_url):
865 return None
866 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
867 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100868 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100869 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000870 if mirror.exists():
871 return mirror
872 return None
873
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000874 def GetTreeStatusUrl(self, error_ok=False):
875 if not self.tree_status_url:
876 error_message = ('You must configure your tree status URL by running '
877 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000878 self.tree_status_url = self._GetRietveldConfig(
879 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000880 return self.tree_status_url
881
882 def GetViewVCUrl(self):
883 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000884 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000885 return self.viewvc_url
886
rmistry@google.com90752582014-01-14 21:04:50 +0000887 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000888 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000889
rmistry@google.com78948ed2015-07-08 23:09:57 +0000890 def GetIsSkipDependencyUpload(self, branch_name):
891 """Returns true if specified branch should skip dep uploads."""
892 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
893 error_ok=True)
894
rmistry@google.com5626a922015-02-26 14:03:30 +0000895 def GetRunPostUploadHook(self):
896 run_post_upload_hook = self._GetRietveldConfig(
897 'run-post-upload-hook', error_ok=True)
898 return run_post_upload_hook == "True"
899
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000900 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000901 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000902
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000903 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000904 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000905
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700907 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000908 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700909 self.is_gerrit = (
910 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000911 return self.is_gerrit
912
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000913 def GetSquashGerritUploads(self):
914 """Return true if uploads to Gerrit should be squashed by default."""
915 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700916 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
917 if self.squash_gerrit_uploads is None:
918 # Default is squash now (http://crbug.com/611892#c23).
919 self.squash_gerrit_uploads = not (
920 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
921 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000922 return self.squash_gerrit_uploads
923
tandriia60502f2016-06-20 02:01:53 -0700924 def GetSquashGerritUploadsOverride(self):
925 """Return True or False if codereview.settings should be overridden.
926
927 Returns None if no override has been defined.
928 """
929 # See also http://crbug.com/611892#c23
930 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
931 error_ok=True).strip()
932 if result == 'true':
933 return True
934 if result == 'false':
935 return False
936 return None
937
tandrii@chromium.org28253532016-04-14 13:46:56 +0000938 def GetGerritSkipEnsureAuthenticated(self):
939 """Return True if EnsureAuthenticated should not be done for Gerrit
940 uploads."""
941 if self.gerrit_skip_ensure_authenticated is None:
942 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000943 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000944 error_ok=True).strip() == 'true')
945 return self.gerrit_skip_ensure_authenticated
946
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000947 def GetGitEditor(self):
948 """Return the editor specified in the git config, or None if none is."""
949 if self.git_editor is None:
950 self.git_editor = self._GetConfig('core.editor', error_ok=True)
951 return self.git_editor or None
952
thestig@chromium.org44202a22014-03-11 19:22:18 +0000953 def GetLintRegex(self):
954 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
955 DEFAULT_LINT_REGEX)
956
957 def GetLintIgnoreRegex(self):
958 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
959 DEFAULT_LINT_IGNORE_REGEX)
960
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000961 def GetProject(self):
962 if not self.project:
963 self.project = self._GetRietveldConfig('project', error_ok=True)
964 return self.project
965
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000966 def _GetRietveldConfig(self, param, **kwargs):
967 return self._GetConfig('rietveld.' + param, **kwargs)
968
rmistry@google.com78948ed2015-07-08 23:09:57 +0000969 def _GetBranchConfig(self, branch_name, param, **kwargs):
970 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
971
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000972 def _GetConfig(self, param, **kwargs):
973 self.LazyUpdateIfNeeded()
974 return RunGit(['config', param], **kwargs).strip()
975
976
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100977@contextlib.contextmanager
978def _get_gerrit_project_config_file(remote_url):
979 """Context manager to fetch and store Gerrit's project.config from
980 refs/meta/config branch and store it in temp file.
981
982 Provides a temporary filename or None if there was error.
983 """
984 error, _ = RunGitWithCode([
985 'fetch', remote_url,
986 '+refs/meta/config:refs/git_cl/meta/config'])
987 if error:
988 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700989 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100990 (remote_url, error))
991 yield None
992 return
993
994 error, project_config_data = RunGitWithCode(
995 ['show', 'refs/git_cl/meta/config:project.config'])
996 if error:
997 print('WARNING: project.config file not found')
998 yield None
999 return
1000
1001 with gclient_utils.temporary_directory() as tempdir:
1002 project_config_file = os.path.join(tempdir, 'project.config')
1003 gclient_utils.FileWrite(project_config_file, project_config_data)
1004 yield project_config_file
1005
1006
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001007def ShortBranchName(branch):
1008 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001009 return branch.replace('refs/heads/', '', 1)
1010
1011
1012def GetCurrentBranchRef():
1013 """Returns branch ref (e.g., refs/heads/master) or None."""
1014 return RunGit(['symbolic-ref', 'HEAD'],
1015 stderr=subprocess2.VOID, error_ok=True).strip() or None
1016
1017
1018def GetCurrentBranch():
1019 """Returns current branch or None.
1020
1021 For refs/heads/* branches, returns just last part. For others, full ref.
1022 """
1023 branchref = GetCurrentBranchRef()
1024 if branchref:
1025 return ShortBranchName(branchref)
1026 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001027
1028
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001029class _CQState(object):
1030 """Enum for states of CL with respect to Commit Queue."""
1031 NONE = 'none'
1032 DRY_RUN = 'dry_run'
1033 COMMIT = 'commit'
1034
1035 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1036
1037
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001038class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001039 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040 self.issue = issue
1041 self.patchset = patchset
1042 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001043 assert codereview in (None, 'rietveld', 'gerrit')
1044 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001045
1046 @property
1047 def valid(self):
1048 return self.issue is not None
1049
1050
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001051def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001052 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1053 fail_result = _ParsedIssueNumberArgument()
1054
1055 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001056 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001057 if not arg.startswith('http'):
1058 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001059
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001060 url = gclient_utils.UpgradeToHttps(arg)
1061 try:
1062 parsed_url = urlparse.urlparse(url)
1063 except ValueError:
1064 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001065
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001066 if codereview is not None:
1067 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1068 return parsed or fail_result
1069
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001070 results = {}
1071 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1072 parsed = cls.ParseIssueURL(parsed_url)
1073 if parsed is not None:
1074 results[name] = parsed
1075
1076 if not results:
1077 return fail_result
1078 if len(results) == 1:
1079 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001080
1081 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1082 # This is likely Gerrit.
1083 return results['gerrit']
1084 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001085 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001086
1087
Aaron Gablea45ee112016-11-22 15:14:38 -08001088class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001089 def __init__(self, issue, url):
1090 self.issue = issue
1091 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001092 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001093
1094 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001095 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001096 self.issue, self.url)
1097
1098
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001099_CommentSummary = collections.namedtuple(
1100 '_CommentSummary', ['date', 'message', 'sender',
1101 # TODO(tandrii): these two aren't known in Gerrit.
1102 'approval', 'disapproval'])
1103
1104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001106 """Changelist works with one changelist in local branch.
1107
1108 Supports two codereview backends: Rietveld or Gerrit, selected at object
1109 creation.
1110
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001111 Notes:
1112 * Not safe for concurrent multi-{thread,process} use.
1113 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001114 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001115 """
1116
1117 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1118 """Create a new ChangeList instance.
1119
1120 If issue is given, the codereview must be given too.
1121
1122 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1123 Otherwise, it's decided based on current configuration of the local branch,
1124 with default being 'rietveld' for backwards compatibility.
1125 See _load_codereview_impl for more details.
1126
1127 **kwargs will be passed directly to codereview implementation.
1128 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001130 global settings
1131 if not settings:
1132 # Happens when git_cl.py is used as a utility library.
1133 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001134
1135 if issue:
1136 assert codereview, 'codereview must be known, if issue is known'
1137
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.branchref = branchref
1139 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001140 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.branch = ShortBranchName(self.branchref)
1142 else:
1143 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001145 self.lookedup_issue = False
1146 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.has_description = False
1148 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001149 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001151 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001152 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001153 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001154 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001155
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001156 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001157 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001159 assert self._codereview_impl
1160 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161
1162 def _load_codereview_impl(self, codereview=None, **kwargs):
1163 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001164 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1165 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1166 self._codereview = codereview
1167 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001168 return
1169
1170 # Automatic selection based on issue number set for a current branch.
1171 # Rietveld takes precedence over Gerrit.
1172 assert not self.issue
1173 # Whether we find issue or not, we are doing the lookup.
1174 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001175 if self.GetBranch():
1176 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1177 issue = _git_get_branch_config_value(
1178 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1179 if issue:
1180 self._codereview = codereview
1181 self._codereview_impl = cls(self, **kwargs)
1182 self.issue = int(issue)
1183 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001184
1185 # No issue is set for this branch, so decide based on repo-wide settings.
1186 return self._load_codereview_impl(
1187 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1188 **kwargs)
1189
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001190 def IsGerrit(self):
1191 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001192
1193 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001194 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001195
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001196 The return value is a string suitable for passing to git cl with the --cc
1197 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001198 """
1199 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001200 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001201 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001202 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1203 return self.cc
1204
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001205 def GetCCListWithoutDefault(self):
1206 """Return the users cc'd on this CL excluding default ones."""
1207 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001208 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001209 return self.cc
1210
Daniel Cheng7227d212017-11-17 08:12:37 -08001211 def ExtendCC(self, more_cc):
1212 """Extends the list of users to cc on this CL based on the changed files."""
1213 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001214
1215 def GetBranch(self):
1216 """Returns the short branch name, e.g. 'master'."""
1217 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001218 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001219 if not branchref:
1220 return None
1221 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 self.branch = ShortBranchName(self.branchref)
1223 return self.branch
1224
1225 def GetBranchRef(self):
1226 """Returns the full branch name, e.g. 'refs/heads/master'."""
1227 self.GetBranch() # Poke the lazy loader.
1228 return self.branchref
1229
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001230 def ClearBranch(self):
1231 """Clears cached branch data of this object."""
1232 self.branch = self.branchref = None
1233
tandrii5d48c322016-08-18 16:19:37 -07001234 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1235 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1236 kwargs['branch'] = self.GetBranch()
1237 return _git_get_branch_config_value(key, default, **kwargs)
1238
1239 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1240 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1241 assert self.GetBranch(), (
1242 'this CL must have an associated branch to %sset %s%s' %
1243 ('un' if value is None else '',
1244 key,
1245 '' if value is None else ' to %r' % value))
1246 kwargs['branch'] = self.GetBranch()
1247 return _git_set_branch_config_value(key, value, **kwargs)
1248
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 @staticmethod
1250 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001251 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 e.g. 'origin', 'refs/heads/master'
1253 """
1254 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001255 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1256
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001258 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001260 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1261 error_ok=True).strip()
1262 if upstream_branch:
1263 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001265 # Else, try to guess the origin remote.
1266 remote_branches = RunGit(['branch', '-r']).split()
1267 if 'origin/master' in remote_branches:
1268 # Fall back on origin/master if it exits.
1269 remote = 'origin'
1270 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001271 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001272 DieWithError(
1273 'Unable to determine default branch to diff against.\n'
1274 'Either pass complete "git diff"-style arguments, like\n'
1275 ' git cl upload origin/master\n'
1276 'or verify this branch is set up to track another \n'
1277 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001278
1279 return remote, upstream_branch
1280
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001281 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001282 upstream_branch = self.GetUpstreamBranch()
1283 if not BranchExists(upstream_branch):
1284 DieWithError('The upstream for the current branch (%s) does not exist '
1285 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001286 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001287 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289 def GetUpstreamBranch(self):
1290 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001293 upstream_branch = upstream_branch.replace('refs/heads/',
1294 'refs/remotes/%s/' % remote)
1295 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1296 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 self.upstream_branch = upstream_branch
1298 return self.upstream_branch
1299
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001300 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001301 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001302 remote, branch = None, self.GetBranch()
1303 seen_branches = set()
1304 while branch not in seen_branches:
1305 seen_branches.add(branch)
1306 remote, branch = self.FetchUpstreamTuple(branch)
1307 branch = ShortBranchName(branch)
1308 if remote != '.' or branch.startswith('refs/remotes'):
1309 break
1310 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001311 remotes = RunGit(['remote'], error_ok=True).split()
1312 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001313 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001314 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001315 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001316 logging.warn('Could not determine which remote this change is '
1317 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001318 else:
1319 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001320 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001321 branch = 'HEAD'
1322 if branch.startswith('refs/remotes'):
1323 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001324 elif branch.startswith('refs/branch-heads/'):
1325 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001326 else:
1327 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001328 return self._remote
1329
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 def GitSanityChecks(self, upstream_git_obj):
1331 """Checks git repo status and ensures diff is from local commits."""
1332
sbc@chromium.org79706062015-01-14 21:18:12 +00001333 if upstream_git_obj is None:
1334 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001335 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001336 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001337 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001338 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001339 return False
1340
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001341 # Verify the commit we're diffing against is in our current branch.
1342 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1343 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1344 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001345 print('ERROR: %s is not in the current branch. You may need to rebase '
1346 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001347 return False
1348
1349 # List the commits inside the diff, and verify they are all local.
1350 commits_in_diff = RunGit(
1351 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1352 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1353 remote_branch = remote_branch.strip()
1354 if code != 0:
1355 _, remote_branch = self.GetRemoteBranch()
1356
1357 commits_in_remote = RunGit(
1358 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1359
1360 common_commits = set(commits_in_diff) & set(commits_in_remote)
1361 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001362 print('ERROR: Your diff contains %d commits already in %s.\n'
1363 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1364 'the diff. If you are using a custom git flow, you can override'
1365 ' the reference used for this check with "git config '
1366 'gitcl.remotebranch <git-ref>".' % (
1367 len(common_commits), remote_branch, upstream_git_obj),
1368 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001369 return False
1370 return True
1371
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001372 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001373 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001374
1375 Returns None if it is not set.
1376 """
tandrii5d48c322016-08-18 16:19:37 -07001377 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 def GetRemoteUrl(self):
1380 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1381
1382 Returns None if there is no remote.
1383 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001384 is_cached, value = self._cached_remote_url
1385 if is_cached:
1386 return value
1387
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001388 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001389 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1390
1391 # If URL is pointing to a local directory, it is probably a git cache.
1392 if os.path.isdir(url):
1393 url = RunGit(['config', 'remote.%s.url' % remote],
1394 error_ok=True,
1395 cwd=url).strip()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001396 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001397 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001398
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001399 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001400 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001401 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001402 self.issue = self._GitGetBranchConfigValue(
1403 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001404 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001405 return self.issue
1406
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407 def GetIssueURL(self):
1408 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001409 issue = self.GetIssue()
1410 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001411 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001412 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001414 def GetDescription(self, pretty=False, force=False):
1415 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001417 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 self.has_description = True
1419 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001420 # Set width to 72 columns + 2 space indent.
1421 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001423 lines = self.description.splitlines()
1424 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001425 return self.description
1426
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001427 def GetDescriptionFooters(self):
1428 """Returns (non_footer_lines, footers) for the commit message.
1429
1430 Returns:
1431 non_footer_lines (list(str)) - Simple list of description lines without
1432 any footer. The lines do not contain newlines, nor does the list contain
1433 the empty line between the message and the footers.
1434 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1435 [("Change-Id", "Ideadbeef...."), ...]
1436 """
1437 raw_description = self.GetDescription()
1438 msg_lines, _, footers = git_footers.split_footers(raw_description)
1439 if footers:
1440 msg_lines = msg_lines[:len(msg_lines)-1]
1441 return msg_lines, footers
1442
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001443 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001444 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001445 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001446 self.patchset = self._GitGetBranchConfigValue(
1447 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001448 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001449 return self.patchset
1450
1451 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001452 """Set this branch's patchset. If patchset=0, clears the patchset."""
1453 assert self.GetBranch()
1454 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001455 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001456 else:
1457 self.patchset = int(patchset)
1458 self._GitSetBranchConfigValue(
1459 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001461 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001462 """Set this branch's issue. If issue isn't given, clears the issue."""
1463 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001464 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001465 issue = int(issue)
1466 self._GitSetBranchConfigValue(
1467 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001468 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001469 codereview_server = self._codereview_impl.GetCodereviewServer()
1470 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001471 self._GitSetBranchConfigValue(
1472 self._codereview_impl.CodereviewServerConfigKey(),
1473 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001474 else:
tandrii5d48c322016-08-18 16:19:37 -07001475 # Reset all of these just to be clean.
1476 reset_suffixes = [
1477 'last-upload-hash',
1478 self._codereview_impl.IssueConfigKey(),
1479 self._codereview_impl.PatchsetConfigKey(),
1480 self._codereview_impl.CodereviewServerConfigKey(),
1481 ] + self._PostUnsetIssueProperties()
1482 for prop in reset_suffixes:
1483 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001484 msg = RunGit(['log', '-1', '--format=%B']).strip()
1485 if msg and git_footers.get_footer_change_id(msg):
1486 print('WARNING: The change patched into this branch has a Change-Id. '
1487 'Removing it.')
1488 RunGit(['commit', '--amend', '-m',
1489 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001490 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001491 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001492
dnjba1b0f32016-09-02 12:37:42 -07001493 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001494 if not self.GitSanityChecks(upstream_branch):
1495 DieWithError('\nGit sanity check failure')
1496
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001497 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001498 if not root:
1499 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001500 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001501
1502 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001503 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001504 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001505 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001506 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001507 except subprocess2.CalledProcessError:
1508 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001509 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001510 'This branch probably doesn\'t exist anymore. To reset the\n'
1511 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001512 ' git branch --set-upstream-to origin/master %s\n'
1513 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001514 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001515
maruel@chromium.org52424302012-08-29 15:14:30 +00001516 issue = self.GetIssue()
1517 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001518 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001519 description = self.GetDescription()
1520 else:
1521 # If the change was never uploaded, use the log messages of all commits
1522 # up to the branch point, as git cl upload will prefill the description
1523 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001524 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1525 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001526
1527 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001528 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001529 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001530 name,
1531 description,
1532 absroot,
1533 files,
1534 issue,
1535 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001536 author,
1537 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001538
dsansomee2d6fd92016-09-08 00:10:47 -07001539 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001540 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001541 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001542 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001543
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001544 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1545 """Sets the description for this CL remotely.
1546
1547 You can get description_lines and footers with GetDescriptionFooters.
1548
1549 Args:
1550 description_lines (list(str)) - List of CL description lines without
1551 newline characters.
1552 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1553 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1554 `List-Of-Tokens`). It will be case-normalized so that each token is
1555 title-cased.
1556 """
1557 new_description = '\n'.join(description_lines)
1558 if footers:
1559 new_description += '\n'
1560 for k, v in footers:
1561 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1562 if not git_footers.FOOTER_PATTERN.match(foot):
1563 raise ValueError('Invalid footer %r' % foot)
1564 new_description += foot + '\n'
1565 self.UpdateDescription(new_description, force)
1566
Edward Lesmes8e282792018-04-03 18:50:29 -04001567 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001568 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1569 try:
1570 return presubmit_support.DoPresubmitChecks(change, committing,
1571 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1572 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001573 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1574 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001575 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001576 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001577
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001578 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1579 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001580 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1581 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001582 else:
1583 # Assume url.
1584 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1585 urlparse.urlparse(issue_arg))
1586 if not parsed_issue_arg or not parsed_issue_arg.valid:
1587 DieWithError('Failed to parse issue argument "%s". '
1588 'Must be an issue number or a valid URL.' % issue_arg)
1589 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001590 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001591
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001592 def CMDUpload(self, options, git_diff_args, orig_args):
1593 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001594 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001595 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001596 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001597 else:
1598 if self.GetBranch() is None:
1599 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1600
1601 # Default to diffing against common ancestor of upstream branch
1602 base_branch = self.GetCommonAncestorWithUpstream()
1603 git_diff_args = [base_branch, 'HEAD']
1604
Aaron Gablec4c40d12017-05-22 11:49:53 -07001605 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1606 if not self.IsGerrit() and not self.GetIssue():
1607 print('=====================================')
1608 print('NOTICE: Rietveld is being deprecated. '
1609 'You can upload changes to Gerrit with')
1610 print(' git cl upload --gerrit')
1611 print('or set Gerrit to be your default code review tool with')
1612 print(' git config gerrit.host true')
1613 print('=====================================')
1614
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001615 # Fast best-effort checks to abort before running potentially
1616 # expensive hooks if uploading is likely to fail anyway. Passing these
1617 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001618 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001619 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001620
1621 # Apply watchlists on upload.
1622 change = self.GetChange(base_branch, None)
1623 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1624 files = [f.LocalPath() for f in change.AffectedFiles()]
1625 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001626 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001627
1628 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001629 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001630 # Set the reviewer list now so that presubmit checks can access it.
1631 change_description = ChangeDescription(change.FullDescriptionText())
1632 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001633 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001634 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001635 change)
1636 change.SetDescriptionText(change_description.description)
1637 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001638 may_prompt=not options.force,
1639 verbose=options.verbose,
1640 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001641 if not hook_results.should_continue():
1642 return 1
1643 if not options.reviewers and hook_results.reviewers:
1644 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001645 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001646
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001647 # TODO(tandrii): Checking local patchset against remote patchset is only
1648 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1649 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001650 latest_patchset = self.GetMostRecentPatchset()
1651 local_patchset = self.GetPatchset()
1652 if (latest_patchset and local_patchset and
1653 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001654 print('The last upload made from this repository was patchset #%d but '
1655 'the most recent patchset on the server is #%d.'
1656 % (local_patchset, latest_patchset))
1657 print('Uploading will still work, but if you\'ve uploaded to this '
1658 'issue from another machine or branch the patch you\'re '
1659 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001660 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001661
Aaron Gable13101a62018-02-09 13:20:41 -08001662 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001663 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001664 if not ret:
Andrii Shyshkalovdd788442018-10-13 17:55:29 +00001665 if not self.IsGerrit():
Ravi Mistry31e7d562018-04-02 12:53:57 -04001666 if options.use_commit_queue:
1667 self.SetCQState(_CQState.COMMIT)
1668 elif options.cq_dry_run:
1669 self.SetCQState(_CQState.DRY_RUN)
tandrii4d0545a2016-07-06 03:56:49 -07001670
tandrii5d48c322016-08-18 16:19:37 -07001671 _git_set_branch_config_value('last-upload-hash',
1672 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001673 # Run post upload hooks, if specified.
1674 if settings.GetRunPostUploadHook():
1675 presubmit_support.DoPostUploadExecuter(
1676 change,
1677 self,
1678 settings.GetRoot(),
1679 options.verbose,
1680 sys.stdout)
1681
1682 # Upload all dependencies if specified.
1683 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001684 print()
1685 print('--dependencies has been specified.')
1686 print('All dependent local branches will be re-uploaded.')
1687 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001688 # Remove the dependencies flag from args so that we do not end up in a
1689 # loop.
1690 orig_args.remove('--dependencies')
1691 ret = upload_branch_deps(self, orig_args)
1692 return ret
1693
Ravi Mistry31e7d562018-04-02 12:53:57 -04001694 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1695 """Sets labels on the change based on the provided flags.
1696
1697 Sets labels if issue is already uploaded and known, else returns without
1698 doing anything.
1699
1700 Args:
1701 enable_auto_submit: Sets Auto-Submit+1 on the change.
1702 use_commit_queue: Sets Commit-Queue+2 on the change.
1703 cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
1704 both use_commit_queue and cq_dry_run are true.
1705 """
1706 if not self.GetIssue():
1707 return
1708 try:
1709 self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
1710 cq_dry_run)
1711 return 0
1712 except KeyboardInterrupt:
1713 raise
1714 except:
1715 labels = []
1716 if enable_auto_submit:
1717 labels.append('Auto-Submit')
1718 if use_commit_queue or cq_dry_run:
1719 labels.append('Commit-Queue')
1720 print('WARNING: Failed to set label(s) on your change: %s\n'
1721 'Either:\n'
1722 ' * Your project does not have the above label(s),\n'
1723 ' * You don\'t have permission to set the above label(s),\n'
1724 ' * There\'s a bug in this code (see stack trace below).\n' %
1725 (', '.join(labels)))
1726 # Still raise exception so that stack trace is printed.
1727 raise
1728
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001729 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001730 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001731
1732 Issue must have been already uploaded and known.
1733 """
1734 assert new_state in _CQState.ALL_STATES
1735 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001736 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001737 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001738 return 0
1739 except KeyboardInterrupt:
1740 raise
1741 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001742 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001743 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001744 ' * Your project has no CQ,\n'
1745 ' * You don\'t have permission to change the CQ state,\n'
1746 ' * There\'s a bug in this code (see stack trace below).\n'
1747 'Consider specifying which bots to trigger manually or asking your '
1748 'project owners for permissions or contacting Chrome Infra at:\n'
1749 'https://www.chromium.org/infra\n\n' %
1750 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001751 # Still raise exception so that stack trace is printed.
1752 raise
1753
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754 # Forward methods to codereview specific implementation.
1755
Aaron Gable636b13f2017-07-14 10:42:48 -07001756 def AddComment(self, message, publish=None):
1757 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001758
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001759 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001760 """Returns list of _CommentSummary for each comment.
1761
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001762 args:
1763 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001764 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001765 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001766
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001767 def CloseIssue(self):
1768 return self._codereview_impl.CloseIssue()
1769
1770 def GetStatus(self):
1771 return self._codereview_impl.GetStatus()
1772
1773 def GetCodereviewServer(self):
1774 return self._codereview_impl.GetCodereviewServer()
1775
tandriide281ae2016-10-12 06:02:30 -07001776 def GetIssueOwner(self):
1777 """Get owner from codereview, which may differ from this checkout."""
1778 return self._codereview_impl.GetIssueOwner()
1779
Edward Lemur707d70b2018-02-07 00:50:14 +01001780 def GetReviewers(self):
1781 return self._codereview_impl.GetReviewers()
1782
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001783 def GetMostRecentPatchset(self):
1784 return self._codereview_impl.GetMostRecentPatchset()
1785
tandriide281ae2016-10-12 06:02:30 -07001786 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001787 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001788 return self._codereview_impl.CannotTriggerTryJobReason()
1789
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001790 def GetTryJobProperties(self, patchset=None):
1791 """Returns dictionary of properties to launch try job."""
1792 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001793
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001794 def __getattr__(self, attr):
1795 # This is because lots of untested code accesses Rietveld-specific stuff
1796 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001797 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001798 # Note that child method defines __getattr__ as well, and forwards it here,
1799 # because _RietveldChangelistImpl is not cleaned up yet, and given
1800 # deprecation of Rietveld, it should probably be just removed.
1801 # Until that time, avoid infinite recursion by bypassing __getattr__
1802 # of implementation class.
1803 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001804
1805
1806class _ChangelistCodereviewBase(object):
1807 """Abstract base class encapsulating codereview specifics of a changelist."""
1808 def __init__(self, changelist):
1809 self._changelist = changelist # instance of Changelist
1810
1811 def __getattr__(self, attr):
1812 # Forward methods to changelist.
1813 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1814 # _RietveldChangelistImpl to avoid this hack?
1815 return getattr(self._changelist, attr)
1816
1817 def GetStatus(self):
1818 """Apply a rough heuristic to give a simple summary of an issue's review
1819 or CQ status, assuming adherence to a common workflow.
1820
1821 Returns None if no issue for this branch, or specific string keywords.
1822 """
1823 raise NotImplementedError()
1824
1825 def GetCodereviewServer(self):
1826 """Returns server URL without end slash, like "https://codereview.com"."""
1827 raise NotImplementedError()
1828
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001829 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001830 """Fetches and returns description from the codereview server."""
1831 raise NotImplementedError()
1832
tandrii5d48c322016-08-18 16:19:37 -07001833 @classmethod
1834 def IssueConfigKey(cls):
1835 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 raise NotImplementedError()
1837
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001838 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001839 def PatchsetConfigKey(cls):
1840 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001841 raise NotImplementedError()
1842
tandrii5d48c322016-08-18 16:19:37 -07001843 @classmethod
1844 def CodereviewServerConfigKey(cls):
1845 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001846 raise NotImplementedError()
1847
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001848 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001849 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001850 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001851
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001852 def GetGerritObjForPresubmit(self):
1853 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1854 return None
1855
dsansomee2d6fd92016-09-08 00:10:47 -07001856 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001857 """Update the description on codereview site."""
1858 raise NotImplementedError()
1859
Aaron Gable636b13f2017-07-14 10:42:48 -07001860 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001861 """Posts a comment to the codereview site."""
1862 raise NotImplementedError()
1863
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001864 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001865 raise NotImplementedError()
1866
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001867 def CloseIssue(self):
1868 """Closes the issue."""
1869 raise NotImplementedError()
1870
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001871 def GetMostRecentPatchset(self):
1872 """Returns the most recent patchset number from the codereview site."""
1873 raise NotImplementedError()
1874
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001875 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001876 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001877 """Fetches and applies the issue.
1878
1879 Arguments:
1880 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1881 reject: if True, reject the failed patch instead of switching to 3-way
1882 merge. Rietveld only.
1883 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1884 only.
1885 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001886 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001887 """
1888 raise NotImplementedError()
1889
1890 @staticmethod
1891 def ParseIssueURL(parsed_url):
1892 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1893 failed."""
1894 raise NotImplementedError()
1895
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001896 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001897 """Best effort check that user is authenticated with codereview server.
1898
1899 Arguments:
1900 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001901 refresh: whether to attempt to refresh credentials. Ignored if not
1902 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001903 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001904 raise NotImplementedError()
1905
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001906 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001907 """Best effort check that uploading isn't supposed to fail for predictable
1908 reasons.
1909
1910 This method should raise informative exception if uploading shouldn't
1911 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001912
1913 Arguments:
1914 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001915 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001916 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001917
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001918 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001919 """Uploads a change to codereview."""
1920 raise NotImplementedError()
1921
Ravi Mistry31e7d562018-04-02 12:53:57 -04001922 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1923 """Sets labels on the change based on the provided flags.
1924
1925 Issue must have been already uploaded and known.
1926 """
1927 raise NotImplementedError()
1928
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001929 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001930 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001931
1932 Issue must have been already uploaded and known.
1933 """
1934 raise NotImplementedError()
1935
tandriie113dfd2016-10-11 10:20:12 -07001936 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001937 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001938 raise NotImplementedError()
1939
tandriide281ae2016-10-12 06:02:30 -07001940 def GetIssueOwner(self):
1941 raise NotImplementedError()
1942
Edward Lemur707d70b2018-02-07 00:50:14 +01001943 def GetReviewers(self):
1944 raise NotImplementedError()
1945
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001946 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001947 raise NotImplementedError()
1948
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001949
1950class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001951
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001952 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001953 super(_RietveldChangelistImpl, self).__init__(changelist)
1954 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001955 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001956 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001957
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001958 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001959 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001960 self._props = None
1961 self._rpc_server = None
1962
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 def GetCodereviewServer(self):
1964 if not self._rietveld_server:
1965 # If we're on a branch then get the server potentially associated
1966 # with that branch.
1967 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001968 self._rietveld_server = gclient_utils.UpgradeToHttps(
1969 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001970 if not self._rietveld_server:
1971 self._rietveld_server = settings.GetDefaultServerUrl()
1972 return self._rietveld_server
1973
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001974 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001975 """Best effort check that user is authenticated with Rietveld server."""
1976 if self._auth_config.use_oauth2:
1977 authenticator = auth.get_authenticator_for_host(
1978 self.GetCodereviewServer(), self._auth_config)
1979 if not authenticator.has_cached_credentials():
1980 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001981 if refresh:
1982 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001983
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001984 def EnsureCanUploadPatchset(self, force):
1985 # No checks for Rietveld because we are deprecating Rietveld.
1986 pass
1987
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001988 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001989 issue = self.GetIssue()
1990 assert issue
1991 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001992 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001993 except urllib2.HTTPError as e:
1994 if e.code == 404:
1995 DieWithError(
1996 ('\nWhile fetching the description for issue %d, received a '
1997 '404 (not found)\n'
1998 'error. It is likely that you deleted this '
1999 'issue on the server. If this is the\n'
2000 'case, please run\n\n'
2001 ' git cl issue 0\n\n'
2002 'to clear the association with the deleted issue. Then run '
2003 'this command again.') % issue)
2004 else:
2005 DieWithError(
2006 '\nFailed to fetch issue description. HTTP error %d' % e.code)
2007 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07002008 print('Warning: Failed to retrieve CL description due to network '
2009 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002010 return ''
2011
2012 def GetMostRecentPatchset(self):
2013 return self.GetIssueProperties()['patchsets'][-1]
2014
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002015 def GetIssueProperties(self):
2016 if self._props is None:
2017 issue = self.GetIssue()
2018 if not issue:
2019 self._props = {}
2020 else:
2021 self._props = self.RpcServer().get_issue_properties(issue, True)
2022 return self._props
2023
tandriie113dfd2016-10-11 10:20:12 -07002024 def CannotTriggerTryJobReason(self):
2025 props = self.GetIssueProperties()
2026 if not props:
2027 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
2028 if props.get('closed'):
2029 return 'CL %s is closed' % self.GetIssue()
2030 if props.get('private'):
2031 return 'CL %s is private' % self.GetIssue()
2032 return None
2033
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002034 def GetTryJobProperties(self, patchset=None):
2035 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07002036 project = (self.GetIssueProperties() or {}).get('project')
2037 return {
2038 'issue': self.GetIssue(),
2039 'patch_project': project,
2040 'patch_storage': 'rietveld',
2041 'patchset': patchset or self.GetPatchset(),
2042 'rietveld': self.GetCodereviewServer(),
2043 }
2044
tandriide281ae2016-10-12 06:02:30 -07002045 def GetIssueOwner(self):
2046 return (self.GetIssueProperties() or {}).get('owner_email')
2047
Edward Lemur707d70b2018-02-07 00:50:14 +01002048 def GetReviewers(self):
2049 return (self.GetIssueProperties() or {}).get('reviewers')
2050
Aaron Gable636b13f2017-07-14 10:42:48 -07002051 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002052 return self.RpcServer().add_comment(self.GetIssue(), message)
2053
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002054 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002055 summary = []
2056 for message in self.GetIssueProperties().get('messages', []):
2057 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2058 summary.append(_CommentSummary(
2059 date=date,
2060 disapproval=bool(message['disapproval']),
2061 approval=bool(message['approval']),
2062 sender=message['sender'],
2063 message=message['text'],
2064 ))
2065 return summary
2066
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002067 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002068 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002069 or CQ status, assuming adherence to a common workflow.
2070
2071 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002072 * 'error' - error from review tool (including deleted issues)
2073 * 'unsent' - not sent for review
2074 * 'waiting' - waiting for review
2075 * 'reply' - waiting for owner to reply to review
2076 * 'not lgtm' - Code-Review label has been set negatively
2077 * 'lgtm' - LGTM from at least one approved reviewer
2078 * 'commit' - in the commit queue
2079 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002080 """
2081 if not self.GetIssue():
2082 return None
2083
2084 try:
2085 props = self.GetIssueProperties()
2086 except urllib2.HTTPError:
2087 return 'error'
2088
2089 if props.get('closed'):
2090 # Issue is closed.
2091 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002092 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002093 # Issue is in the commit queue.
2094 return 'commit'
2095
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002096 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002097 if not messages:
2098 # No message was sent.
2099 return 'unsent'
2100
2101 if get_approving_reviewers(props):
2102 return 'lgtm'
2103 elif get_approving_reviewers(props, disapproval=True):
2104 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002105
tandrii9d2c7a32016-06-22 03:42:45 -07002106 # Skip CQ messages that don't require owner's action.
2107 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2108 if 'Dry run:' in messages[-1]['text']:
2109 messages.pop()
2110 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2111 # This message always follows prior messages from CQ,
2112 # so skip this too.
2113 messages.pop()
2114 else:
2115 # This is probably a CQ messages warranting user attention.
2116 break
2117
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002118 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002119 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002120 return 'reply'
2121 return 'waiting'
2122
dsansomee2d6fd92016-09-08 00:10:47 -07002123 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002124 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002125
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002126 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002127 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002128
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002129 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002130 return self.SetFlags({flag: value})
2131
2132 def SetFlags(self, flags):
2133 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002134 """
phajdan.jr68598232016-08-10 03:28:28 -07002135 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002136 try:
tandrii4b233bd2016-07-06 03:50:29 -07002137 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002138 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002139 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002140 if e.code == 404:
2141 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2142 if e.code == 403:
2143 DieWithError(
2144 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002145 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002146 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002147
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002148 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002149 """Returns an upload.RpcServer() to access this review's rietveld instance.
2150 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002151 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002152 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002153 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002154 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002155 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002156
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002157 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002158 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002159 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002160
tandrii5d48c322016-08-18 16:19:37 -07002161 @classmethod
2162 def PatchsetConfigKey(cls):
2163 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002164
tandrii5d48c322016-08-18 16:19:37 -07002165 @classmethod
2166 def CodereviewServerConfigKey(cls):
2167 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002168
Ravi Mistry31e7d562018-04-02 12:53:57 -04002169 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
2170 raise NotImplementedError()
2171
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002172 def SetCQState(self, new_state):
2173 props = self.GetIssueProperties()
2174 if props.get('private'):
2175 DieWithError('Cannot set-commit on private issue')
2176
2177 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002178 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002179 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002180 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002181 else:
tandrii4b233bd2016-07-06 03:50:29 -07002182 assert new_state == _CQState.DRY_RUN
2183 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002184
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002185 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002186 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 # PatchIssue should never be called with a dirty tree. It is up to the
2188 # caller to check this, but just in case we assert here since the
2189 # consequences of the caller not checking this could be dire.
2190 assert(not git_common.is_dirty_git_tree('apply'))
2191 assert(parsed_issue_arg.valid)
2192 self._changelist.issue = parsed_issue_arg.issue
2193 if parsed_issue_arg.hostname:
2194 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2195
skobes6468b902016-10-24 08:45:10 -07002196 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2197 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2198 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002199 try:
skobes6468b902016-10-24 08:45:10 -07002200 scm_obj.apply_patch(patchset_object)
2201 except Exception as e:
2202 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002203 return 1
2204
2205 # If we had an issue, commit the current state and register the issue.
2206 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002207 self.SetIssue(self.GetIssue())
2208 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002209 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2210 'patch from issue %(i)s at patchset '
2211 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2212 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002213 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002214 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002215 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002216 return 0
2217
2218 @staticmethod
2219 def ParseIssueURL(parsed_url):
2220 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2221 return None
wychen3c1c1722016-08-04 11:46:36 -07002222 # Rietveld patch: https://domain/<number>/#ps<patchset>
2223 match = re.match(r'/(\d+)/$', parsed_url.path)
2224 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2225 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002226 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002227 issue=int(match.group(1)),
2228 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002229 hostname=parsed_url.netloc,
2230 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002231 # Typical url: https://domain/<issue_number>[/[other]]
2232 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2233 if match:
skobes6468b902016-10-24 08:45:10 -07002234 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002235 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002236 hostname=parsed_url.netloc,
2237 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002238 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2239 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2240 if match:
skobes6468b902016-10-24 08:45:10 -07002241 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002242 issue=int(match.group(1)),
2243 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002244 hostname=parsed_url.netloc,
2245 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002246 return None
2247
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002248 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002249 """Upload the patch to Rietveld."""
2250 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2251 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002252 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2253 if options.emulate_svn_auto_props:
2254 upload_args.append('--emulate_svn_auto_props')
2255
2256 change_desc = None
2257
2258 if options.email is not None:
2259 upload_args.extend(['--email', options.email])
2260
2261 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002262 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002263 upload_args.extend(['--title', options.title])
2264 if options.message:
2265 upload_args.extend(['--message', options.message])
2266 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002267 print('This branch is associated with issue %s. '
2268 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 else:
nodirca166002016-06-27 10:59:51 -07002270 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002271 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002272 if options.message:
2273 message = options.message
2274 else:
2275 message = CreateDescriptionFromLog(args)
2276 if options.title:
2277 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002279 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002280 change_desc.update_reviewers(options.reviewers, options.tbrs,
2281 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002282 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002283 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284
2285 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002286 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002287 return 1
2288
2289 upload_args.extend(['--message', change_desc.description])
2290 if change_desc.get_reviewers():
2291 upload_args.append('--reviewers=%s' % ','.join(
2292 change_desc.get_reviewers()))
2293 if options.send_mail:
2294 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002295 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002296 upload_args.append('--send_mail')
2297
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00002298 # We only skip auto-CC-ing addresses from rietveld.cc when --private or
2299 # --no-autocc is explicitly specified on the command line. Should private
2300 # CL be created due to rietveld.private value, we assume that rietveld.cc
2301 # only contains addresses where private CLs are allowed to be sent.
2302 if options.private or options.no_autocc:
2303 logging.warn('rietveld.cc is ignored since private/no-autocc flag is '
2304 'specified. You need to review and add them manually if '
2305 'necessary.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002306 cc = self.GetCCListWithoutDefault()
2307 else:
2308 cc = self.GetCCList()
2309 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002310 if change_desc.get_cced():
2311 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 if cc:
2313 upload_args.extend(['--cc', cc])
2314
2315 if options.private or settings.GetDefaultPrivateFlag() == "True":
2316 upload_args.append('--private')
2317
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002318 # Include the upstream repo's URL in the change -- this is useful for
2319 # projects that have their source spread across multiple repos.
2320 remote_url = self.GetGitBaseUrlFromConfig()
2321 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002322 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2323 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2324 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002327 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328 if target_ref:
2329 upload_args.extend(['--target_ref', target_ref])
2330
2331 # Look for dependent patchsets. See crbug.com/480453 for more details.
2332 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2333 upstream_branch = ShortBranchName(upstream_branch)
2334 if remote is '.':
2335 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002336 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002337 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002338 print()
2339 print('Skipping dependency patchset upload because git config '
2340 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2341 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 else:
2343 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002344 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002345 auth_config=auth_config)
2346 branch_cl_issue_url = branch_cl.GetIssueURL()
2347 branch_cl_issue = branch_cl.GetIssue()
2348 branch_cl_patchset = branch_cl.GetPatchset()
2349 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2350 upload_args.extend(
2351 ['--depends_on_patchset', '%s:%s' % (
2352 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002353 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002354 '\n'
2355 'The current branch (%s) is tracking a local branch (%s) with '
2356 'an associated CL.\n'
2357 'Adding %s/#ps%s as a dependency patchset.\n'
2358 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2359 branch_cl_patchset))
2360
2361 project = settings.GetProject()
2362 if project:
2363 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002364 else:
2365 print()
2366 print('WARNING: Uploading without a project specified. Please ensure '
2367 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2368 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002369
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002370 try:
2371 upload_args = ['upload'] + upload_args + args
2372 logging.info('upload.RealMain(%s)', upload_args)
2373 issue, patchset = upload.RealMain(upload_args)
2374 issue = int(issue)
2375 patchset = int(patchset)
2376 except KeyboardInterrupt:
2377 sys.exit(1)
2378 except:
2379 # If we got an exception after the user typed a description for their
2380 # change, back up the description before re-raising.
2381 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002382 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002383 raise
2384
2385 if not self.GetIssue():
2386 self.SetIssue(issue)
2387 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002388 return 0
2389
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002390
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002391class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002392 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002393 # auth_config is Rietveld thing, kept here to preserve interface only.
2394 super(_GerritChangelistImpl, self).__init__(changelist)
2395 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002396 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002397 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002398 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002399 # Map from change number (issue) to its detail cache.
2400 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002401
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002402 if codereview_host is not None:
2403 assert not codereview_host.startswith('https://'), codereview_host
2404 self._gerrit_host = codereview_host
2405 self._gerrit_server = 'https://%s' % codereview_host
2406
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002407 def _GetGerritHost(self):
2408 # Lazy load of configs.
2409 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002410 if self._gerrit_host and '.' not in self._gerrit_host:
2411 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2412 # This happens for internal stuff http://crbug.com/614312.
2413 parsed = urlparse.urlparse(self.GetRemoteUrl())
2414 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002415 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002416 ' Your current remote is: %s' % self.GetRemoteUrl())
2417 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2418 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002419 return self._gerrit_host
2420
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002421 def _GetGitHost(self):
2422 """Returns git host to be used when uploading change to Gerrit."""
2423 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2424
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002425 def GetCodereviewServer(self):
2426 if not self._gerrit_server:
2427 # If we're on a branch then get the server potentially associated
2428 # with that branch.
2429 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002430 self._gerrit_server = self._GitGetBranchConfigValue(
2431 self.CodereviewServerConfigKey())
2432 if self._gerrit_server:
2433 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002434 if not self._gerrit_server:
2435 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2436 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002437 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002438 parts[0] = parts[0] + '-review'
2439 self._gerrit_host = '.'.join(parts)
2440 self._gerrit_server = 'https://%s' % self._gerrit_host
2441 return self._gerrit_server
2442
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002443 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002444 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002445 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002446 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002447 logging.warn('can\'t detect Gerrit project.')
2448 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002449 project = urlparse.urlparse(remote_url).path.strip('/')
2450 if project.endswith('.git'):
2451 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002452 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2453 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2454 # gitiles/git-over-https protocol. E.g.,
2455 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2456 # as
2457 # https://chromium.googlesource.com/v8/v8
2458 if project.startswith('a/'):
2459 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002460 return project
2461
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002462 def _GerritChangeIdentifier(self):
2463 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2464
2465 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002466 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002467 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002468 project = self._GetGerritProject()
2469 if project:
2470 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2471 # Fall back on still unique, but less efficient change number.
2472 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002473
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002474 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002475 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002476 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002477
tandrii5d48c322016-08-18 16:19:37 -07002478 @classmethod
2479 def PatchsetConfigKey(cls):
2480 return 'gerritpatchset'
2481
2482 @classmethod
2483 def CodereviewServerConfigKey(cls):
2484 return 'gerritserver'
2485
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002486 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002487 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002488 if settings.GetGerritSkipEnsureAuthenticated():
2489 # For projects with unusual authentication schemes.
2490 # See http://crbug.com/603378.
2491 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002492
2493 # Check presence of cookies only if using cookies-based auth method.
2494 cookie_auth = gerrit_util.Authenticator.get()
2495 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002496 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002497
2498 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002499 self.GetCodereviewServer()
2500 git_host = self._GetGitHost()
2501 assert self._gerrit_server and self._gerrit_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002502
2503 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2504 git_auth = cookie_auth.get_auth_header(git_host)
2505 if gerrit_auth and git_auth:
2506 if gerrit_auth == git_auth:
2507 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002508 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002509 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002510 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002511 ' %s\n'
2512 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002513 ' Consider running the following command:\n'
2514 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002515 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002516 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002517 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002518 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002519 cookie_auth.get_new_password_message(git_host)))
2520 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002521 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002522 return
2523 else:
2524 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002525 ([] if gerrit_auth else [self._gerrit_host]) +
2526 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002527 DieWithError('Credentials for the following hosts are required:\n'
2528 ' %s\n'
2529 'These are read from %s (or legacy %s)\n'
2530 '%s' % (
2531 '\n '.join(missing),
2532 cookie_auth.get_gitcookies_path(),
2533 cookie_auth.get_netrc_path(),
2534 cookie_auth.get_new_password_message(git_host)))
2535
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002536 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002537 if not self.GetIssue():
2538 return
2539
2540 # Warm change details cache now to avoid RPCs later, reducing latency for
2541 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002542 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002543 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002544
2545 status = self._GetChangeDetail()['status']
2546 if status in ('MERGED', 'ABANDONED'):
2547 DieWithError('Change %s has been %s, new uploads are not allowed' %
2548 (self.GetIssueURL(),
2549 'submitted' if status == 'MERGED' else 'abandoned'))
2550
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002551 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2552 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2553 # Apparently this check is not very important? Otherwise get_auth_email
2554 # could have been added to other implementations of Authenticator.
2555 cookies_auth = gerrit_util.Authenticator.get()
2556 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002557 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002558
2559 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002560 if self.GetIssueOwner() == cookies_user:
2561 return
2562 logging.debug('change %s owner is %s, cookies user is %s',
2563 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002564 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002565 # so ask what Gerrit thinks of this user.
2566 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2567 if details['email'] == self.GetIssueOwner():
2568 return
2569 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002570 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002571 'as %s.\n'
2572 'Uploading may fail due to lack of permissions.' %
2573 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2574 confirm_or_exit(action='upload')
2575
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002576 def _PostUnsetIssueProperties(self):
2577 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002578 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002579
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002580 def GetGerritObjForPresubmit(self):
2581 return presubmit_support.GerritAccessor(self._GetGerritHost())
2582
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002583 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002584 """Apply a rough heuristic to give a simple summary of an issue's review
2585 or CQ status, assuming adherence to a common workflow.
2586
2587 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002588 * 'error' - error from review tool (including deleted issues)
2589 * 'unsent' - no reviewers added
2590 * 'waiting' - waiting for review
2591 * 'reply' - waiting for uploader to reply to review
2592 * 'lgtm' - Code-Review label has been set
2593 * 'commit' - in the commit queue
2594 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002595 """
2596 if not self.GetIssue():
2597 return None
2598
2599 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002600 data = self._GetChangeDetail([
2601 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002602 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002603 return 'error'
2604
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002605 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002606 return 'closed'
2607
Aaron Gable9ab38c62017-04-06 14:36:33 -07002608 if data['labels'].get('Commit-Queue', {}).get('approved'):
2609 # The section will have an "approved" subsection if anyone has voted
2610 # the maximum value on the label.
2611 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002612
Aaron Gable9ab38c62017-04-06 14:36:33 -07002613 if data['labels'].get('Code-Review', {}).get('approved'):
2614 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002615
2616 if not data.get('reviewers', {}).get('REVIEWER', []):
2617 return 'unsent'
2618
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002619 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002620 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2621 last_message_author = messages.pop().get('author', {})
2622 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002623 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2624 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002625 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002626 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002627 if last_message_author.get('_account_id') == owner:
2628 # Most recent message was by owner.
2629 return 'waiting'
2630 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002631 # Some reply from non-owner.
2632 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002633
2634 # Somehow there are no messages even though there are reviewers.
2635 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002636
2637 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002638 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002639 patchset = data['revisions'][data['current_revision']]['_number']
2640 self.SetPatchset(patchset)
2641 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002642
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002643 def FetchDescription(self, force=False):
2644 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2645 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002646 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002647 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002648
dsansomee2d6fd92016-09-08 00:10:47 -07002649 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002650 if gerrit_util.HasPendingChangeEdit(
2651 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002652 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002653 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002654 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002655 'unpublished edit. Either publish the edit in the Gerrit web UI '
2656 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002657
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002658 gerrit_util.DeletePendingChangeEdit(
2659 self._GetGerritHost(), self._GerritChangeIdentifier())
2660 gerrit_util.SetCommitMessage(
2661 self._GetGerritHost(), self._GerritChangeIdentifier(),
2662 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002663
Aaron Gable636b13f2017-07-14 10:42:48 -07002664 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002665 gerrit_util.SetReview(
2666 self._GetGerritHost(), self._GerritChangeIdentifier(),
2667 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002668
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002669 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002670 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002671 messages = self._GetChangeDetail(
2672 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2673 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002674 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002675
2676 # Build dictionary of file comments for easy access and sorting later.
2677 # {author+date: {path: {patchset: {line: url+message}}}}
2678 comments = collections.defaultdict(
2679 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2680 for path, line_comments in file_comments.iteritems():
2681 for comment in line_comments:
2682 if comment.get('tag', '').startswith('autogenerated'):
2683 continue
2684 key = (comment['author']['email'], comment['updated'])
2685 if comment.get('side', 'REVISION') == 'PARENT':
2686 patchset = 'Base'
2687 else:
2688 patchset = 'PS%d' % comment['patch_set']
2689 line = comment.get('line', 0)
2690 url = ('https://%s/c/%s/%s/%s#%s%s' %
2691 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2692 'b' if comment.get('side') == 'PARENT' else '',
2693 str(line) if line else ''))
2694 comments[key][path][patchset][line] = (url, comment['message'])
2695
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002696 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002697 for msg in messages:
2698 # Don't bother showing autogenerated messages.
2699 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2700 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002701 # Gerrit spits out nanoseconds.
2702 assert len(msg['date'].split('.')[-1]) == 9
2703 date = datetime.datetime.strptime(msg['date'][:-3],
2704 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002705 message = msg['message']
2706 key = (msg['author']['email'], msg['date'])
2707 if key in comments:
2708 message += '\n'
2709 for path, patchsets in sorted(comments.get(key, {}).items()):
2710 if readable:
2711 message += '\n%s' % path
2712 for patchset, lines in sorted(patchsets.items()):
2713 for line, (url, content) in sorted(lines.items()):
2714 if line:
2715 line_str = 'Line %d' % line
2716 path_str = '%s:%d:' % (path, line)
2717 else:
2718 line_str = 'File comment'
2719 path_str = '%s:0:' % path
2720 if readable:
2721 message += '\n %s, %s: %s' % (patchset, line_str, url)
2722 message += '\n %s\n' % content
2723 else:
2724 message += '\n%s ' % path_str
2725 message += '\n%s\n' % content
2726
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002727 summary.append(_CommentSummary(
2728 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002729 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002730 sender=msg['author']['email'],
2731 # These could be inferred from the text messages and correlated with
2732 # Code-Review label maximum, however this is not reliable.
2733 # Leaving as is until the need arises.
2734 approval=False,
2735 disapproval=False,
2736 ))
2737 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002738
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002739 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002740 gerrit_util.AbandonChange(
2741 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002742
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002743 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002744 gerrit_util.SubmitChange(
2745 self._GetGerritHost(), self._GerritChangeIdentifier(),
2746 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002747
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002748 def _GetChangeDetail(self, options=None, no_cache=False):
2749 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002750
2751 If fresh data is needed, set no_cache=True which will clear cache and
2752 thus new data will be fetched from Gerrit.
2753 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002754 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002755 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002756
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002757 # Optimization to avoid multiple RPCs:
2758 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2759 'CURRENT_COMMIT' not in options):
2760 options.append('CURRENT_COMMIT')
2761
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002762 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002763 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002764 options = [o.upper() for o in options]
2765
2766 # Check in cache first unless no_cache is True.
2767 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002768 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002769 else:
2770 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002771 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002772 # Assumption: data fetched before with extra options is suitable
2773 # for return for a smaller set of options.
2774 # For example, if we cached data for
2775 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2776 # and request is for options=[CURRENT_REVISION],
2777 # THEN we can return prior cached data.
2778 if options_set.issubset(cached_options_set):
2779 return data
2780
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002781 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002782 data = gerrit_util.GetChangeDetail(
2783 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002784 except gerrit_util.GerritError as e:
2785 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002786 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002787 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002788
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002789 self._detail_cache.setdefault(cache_key, []).append(
2790 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002791 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002792
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002793 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002794 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002795 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002796 data = gerrit_util.GetChangeCommit(
2797 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002798 except gerrit_util.GerritError as e:
2799 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002800 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002801 raise
agable32978d92016-11-01 12:55:02 -07002802 return data
2803
Olivier Robin75ee7252018-04-13 10:02:56 +02002804 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002805 if git_common.is_dirty_git_tree('land'):
2806 return 1
tandriid60367b2016-06-22 05:25:12 -07002807 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2808 if u'Commit-Queue' in detail.get('labels', {}):
2809 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002810 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2811 'which can test and land changes for you. '
2812 'Are you sure you wish to bypass it?\n',
2813 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002814
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002815 differs = True
tandriic4344b52016-08-29 06:04:54 -07002816 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002817 # Note: git diff outputs nothing if there is no diff.
2818 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002819 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002820 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002821 if detail['current_revision'] == last_upload:
2822 differs = False
2823 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002824 print('WARNING: Local branch contents differ from latest uploaded '
2825 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002826 if differs:
2827 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002828 confirm_or_exit(
2829 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2830 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002831 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002832 elif not bypass_hooks:
2833 hook_results = self.RunHook(
2834 committing=True,
2835 may_prompt=not force,
2836 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002837 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2838 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002839 if not hook_results.should_continue():
2840 return 1
2841
2842 self.SubmitIssue(wait_for_merge=True)
2843 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002844 links = self._GetChangeCommit().get('web_links', [])
2845 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002846 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002847 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002848 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002849 return 0
2850
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002851 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002852 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002853 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002854 assert not directory
2855 assert parsed_issue_arg.valid
2856
2857 self._changelist.issue = parsed_issue_arg.issue
2858
2859 if parsed_issue_arg.hostname:
2860 self._gerrit_host = parsed_issue_arg.hostname
2861 self._gerrit_server = 'https://%s' % self._gerrit_host
2862
tandriic2405f52016-10-10 08:13:15 -07002863 try:
2864 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002865 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002866 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002867
2868 if not parsed_issue_arg.patchset:
2869 # Use current revision by default.
2870 revision_info = detail['revisions'][detail['current_revision']]
2871 patchset = int(revision_info['_number'])
2872 else:
2873 patchset = parsed_issue_arg.patchset
2874 for revision_info in detail['revisions'].itervalues():
2875 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2876 break
2877 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002878 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002879 (parsed_issue_arg.patchset, self.GetIssue()))
2880
Aaron Gable697a91b2018-01-19 15:20:15 -08002881 remote_url = self._changelist.GetRemoteUrl()
2882 if remote_url.endswith('.git'):
2883 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002884 remote_url = remote_url.rstrip('/')
2885
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002886 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002887 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002888
2889 if remote_url != fetch_info['url']:
2890 DieWithError('Trying to patch a change from %s but this repo appears '
2891 'to be %s.' % (fetch_info['url'], remote_url))
2892
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002893 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002894
Aaron Gable62619a32017-06-16 08:22:09 -07002895 if force:
2896 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2897 print('Checked out commit for change %i patchset %i locally' %
2898 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002899 elif nocommit:
2900 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2901 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002902 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002903 RunGit(['cherry-pick', 'FETCH_HEAD'])
2904 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002905 (parsed_issue_arg.issue, patchset))
2906 print('Note: this created a local commit which does not have '
2907 'the same hash as the one uploaded for review. This will make '
2908 'uploading changes based on top of this branch difficult.\n'
2909 'If you want to do that, use "git cl patch --force" instead.')
2910
Stefan Zagerd08043c2017-10-12 12:07:02 -07002911 if self.GetBranch():
2912 self.SetIssue(parsed_issue_arg.issue)
2913 self.SetPatchset(patchset)
2914 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2915 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2916 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2917 else:
2918 print('WARNING: You are in detached HEAD state.\n'
2919 'The patch has been applied to your checkout, but you will not be '
2920 'able to upload a new patch set to the gerrit issue.\n'
2921 'Try using the \'-b\' option if you would like to work on a '
2922 'branch and/or upload a new patch set.')
2923
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002924 return 0
2925
2926 @staticmethod
2927 def ParseIssueURL(parsed_url):
2928 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2929 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002930 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2931 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002932 # Short urls like https://domain/<issue_number> can be used, but don't allow
2933 # specifying the patchset (you'd 404), but we allow that here.
2934 if parsed_url.path == '/':
2935 part = parsed_url.fragment
2936 else:
2937 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002938 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002939 if match:
2940 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002941 issue=int(match.group(3)),
2942 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002943 hostname=parsed_url.netloc,
2944 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002945 return None
2946
tandrii16e0b4e2016-06-07 10:34:28 -07002947 def _GerritCommitMsgHookCheck(self, offer_removal):
2948 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2949 if not os.path.exists(hook):
2950 return
2951 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2952 # custom developer made one.
2953 data = gclient_utils.FileRead(hook)
2954 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2955 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002956 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002957 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002958 'and may interfere with it in subtle ways.\n'
2959 'We recommend you remove the commit-msg hook.')
2960 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002961 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002962 gclient_utils.rm_file_or_tree(hook)
2963 print('Gerrit commit-msg hook removed.')
2964 else:
2965 print('OK, will keep Gerrit commit-msg hook in place.')
2966
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002967 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002968 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002969 if options.squash and options.no_squash:
2970 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002971
2972 if not options.squash and not options.no_squash:
2973 # Load default for user, repo, squash=true, in this order.
2974 options.squash = settings.GetSquashGerritUploads()
2975 elif options.no_squash:
2976 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002977
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002978 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002979 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002980
Aaron Gableb56ad332017-01-06 15:24:31 -08002981 # This may be None; default fallback value is determined in logic below.
2982 title = options.title
2983
Dominic Battre7d1c4842017-10-27 09:17:28 +02002984 # Extract bug number from branch name.
2985 bug = options.bug
2986 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2987 if not bug and match:
2988 bug = match.group(1)
2989
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002990 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002991 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002992 if self.GetIssue():
2993 # Try to get the message from a previous upload.
2994 message = self.GetDescription()
2995 if not message:
2996 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002997 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002998 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002999 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003000 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07003001 # When uploading a subsequent patchset, -m|--message is taken
3002 # as the patchset title if --title was not provided.
3003 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003004 else:
3005 default_title = RunGit(
3006 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07003007 if options.force:
3008 title = default_title
3009 else:
3010 title = ask_for_data(
3011 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003012 change_id = self._GetChangeDetail()['change_id']
3013 while True:
3014 footer_change_ids = git_footers.get_footer_change_id(message)
3015 if footer_change_ids == [change_id]:
3016 break
3017 if not footer_change_ids:
3018 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003019 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003020 continue
3021 # There is already a valid footer but with different or several ids.
3022 # Doing this automatically is non-trivial as we don't want to lose
3023 # existing other footers, yet we want to append just 1 desired
3024 # Change-Id. Thus, just create a new footer, but let user verify the
3025 # new description.
3026 message = '%s\n\nChange-Id: %s' % (message, change_id)
3027 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08003028 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003029 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08003030 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003031 'Please, check the proposed correction to the description, '
3032 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
3033 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
3034 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003035 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003036 if not options.force:
3037 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02003038 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003039 message = change_desc.description
3040 if not message:
3041 DieWithError("Description is empty. Aborting...")
3042 # Continue the while loop.
3043 # Sanity check of this code - we should end up with proper message
3044 # footer.
3045 assert [change_id] == git_footers.get_footer_change_id(message)
3046 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08003047 else: # if not self.GetIssue()
3048 if options.message:
3049 message = options.message
3050 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003051 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08003052 if options.title:
3053 message = options.title + '\n\n' + message
3054 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02003055
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003056 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02003057 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08003058 # On first upload, patchset title is always this string, while
3059 # --title flag gets converted to first line of message.
3060 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003061 if not change_desc.description:
3062 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02003063 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003064 if len(change_ids) > 1:
3065 DieWithError('too many Change-Id footers, at most 1 allowed.')
3066 if not change_ids:
3067 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02003068 change_desc.set_description(git_footers.add_footer_change_id(
3069 change_desc.description,
3070 GenerateGerritChangeId(change_desc.description)))
3071 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003072 assert len(change_ids) == 1
3073 change_id = change_ids[0]
3074
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003075 if options.reviewers or options.tbrs or options.add_owners_to:
3076 change_desc.update_reviewers(options.reviewers, options.tbrs,
3077 options.add_owners_to, change)
3078
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003079 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003080 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
3081 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003082 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07003083 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
3084 desc_tempfile.write(change_desc.description)
3085 desc_tempfile.close()
3086 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
3087 '-F', desc_tempfile.name]).strip()
3088 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003089 else:
3090 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003091 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003092 if not change_desc.description:
3093 DieWithError("Description is empty. Aborting...")
3094
3095 if not git_footers.get_footer_change_id(change_desc.description):
3096 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003097 change_desc.set_description(
3098 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003099 if options.reviewers or options.tbrs or options.add_owners_to:
3100 change_desc.update_reviewers(options.reviewers, options.tbrs,
3101 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003102 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003103 # For no-squash mode, we assume the remote called "origin" is the one we
3104 # want. It is not worthwhile to support different workflows for
3105 # no-squash mode.
3106 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003107 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3108
3109 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00003110 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003111 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3112 ref_to_push)]).splitlines()
3113 if len(commits) > 1:
3114 print('WARNING: This will upload %d commits. Run the following command '
3115 'to see which commits will be uploaded: ' % len(commits))
3116 print('git log %s..%s' % (parent, ref_to_push))
3117 print('You can also use `git squash-branch` to squash these into a '
3118 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003119 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003120
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003121 if options.reviewers or options.tbrs or options.add_owners_to:
3122 change_desc.update_reviewers(options.reviewers, options.tbrs,
3123 options.add_owners_to, change)
3124
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00003125 # TODO(tandrii): process reviewers and ccs into refspec.
3126 reviewers = sorted(change_desc.get_reviewers())
3127 # Add cc's from the CC_LIST and --cc flag (if any).
3128 if not options.private and not options.no_autocc:
3129 cc = self.GetCCList().split(',')
3130 else:
3131 cc = []
3132 if options.cc:
3133 cc.extend(options.cc)
3134 cc = filter(None, [email.strip() for email in cc])
3135 if change_desc.get_cced():
3136 cc.extend(change_desc.get_cced())
3137
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003138 # Extra options that can be specified at push time. Doc:
3139 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003140 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003141
Aaron Gable844cf292017-06-28 11:32:59 -07003142 # By default, new changes are started in WIP mode, and subsequent patchsets
3143 # don't send email. At any time, passing --send-mail will mark the change
3144 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003145 if options.send_mail:
3146 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003147 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04003148 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003149 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07003150 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003151 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003152
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003153 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003154 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003155
Aaron Gable9b713dd2016-12-14 16:04:21 -08003156 if title:
Nick Carter8692b182017-11-06 16:30:38 -08003157 # Punctuation and whitespace in |title| must be percent-encoded.
3158 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003159
agablec6787972016-09-09 16:13:34 -07003160 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003161 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003162
rmistry9eadede2016-09-19 11:22:43 -07003163 if options.topic:
3164 # Documentation on Gerrit topics is here:
3165 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003166 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003167
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003168 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08003169 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003170 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08003171 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08003172 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
3173
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003174 refspec_suffix = ''
3175 if refspec_opts:
3176 refspec_suffix = '%' + ','.join(refspec_opts)
3177 assert ' ' not in refspec_suffix, (
3178 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3179 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3180
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003181 try:
Edward Lemur83bd7f42018-10-10 00:14:21 +00003182 # TODO(crbug.com/881860): Remove.
Edward Lemur47faa062018-10-11 19:46:02 +00003183 # Clear the log after each git-cl upload run by setting mode='w'.
3184 handler = logging.FileHandler(gerrit_util.GERRIT_ERR_LOG_FILE, mode='w')
3185 handler.setFormatter(logging.Formatter('%(asctime)s %(message)s'))
3186
3187 GERRIT_ERR_LOGGER.addHandler(handler)
3188 GERRIT_ERR_LOGGER.setLevel(logging.INFO)
3189 # Don't propagate to root logger, so that logs are not printed.
3190 GERRIT_ERR_LOGGER.propagate = 0
3191
Edward Lemur83bd7f42018-10-10 00:14:21 +00003192 # Get interesting headers from git push, to be displayed to the user if
3193 # subsequent Gerrit RPC calls fail.
3194 env = os.environ.copy()
3195 env['GIT_CURL_VERBOSE'] = '1'
3196 class FilterHeaders(object):
3197 """Filter git push headers and store them in a file.
3198
3199 Regular git push output is printed directly.
3200 """
3201
3202 def __init__(self):
3203 # The output from git push that we want to store in a file.
3204 self._output = ''
3205 # Keeps track of whether the current line is part of a request header.
3206 self._on_header = False
3207 # Keeps track of repeated empty lines, which mark the end of a request
3208 # header.
3209 self._last_line_empty = False
3210
3211 def __call__(self, line):
3212 """Handle a single line of git push output."""
3213 if not line:
3214 # Two consecutive empty lines mark the end of a header.
3215 if self._last_line_empty:
3216 self._on_header = False
3217 self._last_line_empty = True
3218 return
3219
3220 self._last_line_empty = False
3221 # A line starting with '>' marks the beggining of a request header.
3222 if line[0] == '>':
3223 self._on_header = True
3224 GERRIT_ERR_LOGGER.info(line)
3225 # Lines not starting with '*' or '<', and not part of a request header
3226 # should be displayed to the user.
3227 elif line[0] not in '*<' and not self._on_header:
3228 print(line)
3229 # Flush after every line: useful for seeing progress when running as
3230 # recipe.
3231 sys.stdout.flush()
3232 # Filter out the cookie and authorization headers.
3233 elif ('cookie: ' not in line.lower()
3234 and 'authorization: ' not in line.lower()):
3235 GERRIT_ERR_LOGGER.info(line)
3236
3237 filter_fn = FilterHeaders()
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003238 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003239 ['git', 'push', self.GetRemoteUrl(), refspec],
Edward Lemur83bd7f42018-10-10 00:14:21 +00003240 print_stdout=False,
3241 filter_fn=filter_fn,
3242 env=env)
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003243 except subprocess2.CalledProcessError:
3244 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003245 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003246 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003247 'credential problems:\n'
3248 ' git cl creds-check\n',
3249 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003250
3251 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003252 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003253 change_numbers = [m.group(1)
3254 for m in map(regex.match, push_stdout.splitlines())
3255 if m]
3256 if len(change_numbers) != 1:
3257 DieWithError(
3258 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003259 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003260 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003261 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003262
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003263 if self.GetIssue():
3264 # GetIssue() is not set in case of non-squash uploads according to tests.
3265 # TODO(agable): non-squash uploads in git cl should be removed.
3266 gerrit_util.AddReviewers(
3267 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003268 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003269 reviewers, cc,
3270 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003271
Aaron Gablefd238082017-06-07 13:42:34 -07003272 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003273 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3274 score = 1
3275 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3276 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3277 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003278 gerrit_util.SetReview(
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003279 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003280 self._GerritChangeIdentifier(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003281 msg='Self-approving for TBR',
3282 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003283
Andrii Shyshkalovdd788442018-10-13 17:55:29 +00003284 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
3285 options.cq_dry_run)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003286 return 0
3287
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003288 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3289 change_desc):
3290 """Computes parent of the generated commit to be uploaded to Gerrit.
3291
3292 Returns revision or a ref name.
3293 """
3294 if custom_cl_base:
3295 # Try to avoid creating additional unintended CLs when uploading, unless
3296 # user wants to take this risk.
3297 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3298 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3299 local_ref_of_target_remote])
3300 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003301 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003302 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3303 'If you proceed with upload, more than 1 CL may be created by '
3304 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3305 'If you are certain that specified base `%s` has already been '
3306 'uploaded to Gerrit as another CL, you may proceed.\n' %
3307 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3308 if not force:
3309 confirm_or_exit(
3310 'Do you take responsibility for cleaning up potential mess '
3311 'resulting from proceeding with upload?',
3312 action='upload')
3313 return custom_cl_base
3314
Aaron Gablef97e33d2017-03-30 15:44:27 -07003315 if remote != '.':
3316 return self.GetCommonAncestorWithUpstream()
3317
3318 # If our upstream branch is local, we base our squashed commit on its
3319 # squashed version.
3320 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3321
Aaron Gablef97e33d2017-03-30 15:44:27 -07003322 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003323 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003324
3325 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003326 # TODO(tandrii): consider checking parent change in Gerrit and using its
3327 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3328 # the tree hash of the parent branch. The upside is less likely bogus
3329 # requests to reupload parent change just because it's uploadhash is
3330 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003331 parent = RunGit(['config',
3332 'branch.%s.gerritsquashhash' % upstream_branch_name],
3333 error_ok=True).strip()
3334 # Verify that the upstream branch has been uploaded too, otherwise
3335 # Gerrit will create additional CLs when uploading.
3336 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3337 RunGitSilent(['rev-parse', parent + ':'])):
3338 DieWithError(
3339 '\nUpload upstream branch %s first.\n'
3340 'It is likely that this branch has been rebased since its last '
3341 'upload, so you just need to upload it again.\n'
3342 '(If you uploaded it with --no-squash, then branch dependencies '
3343 'are not supported, and you should reupload with --squash.)'
3344 % upstream_branch_name,
3345 change_desc)
3346 return parent
3347
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003348 def _AddChangeIdToCommitMessage(self, options, args):
3349 """Re-commits using the current message, assumes the commit hook is in
3350 place.
3351 """
3352 log_desc = options.message or CreateDescriptionFromLog(args)
3353 git_command = ['commit', '--amend', '-m', log_desc]
3354 RunGit(git_command)
3355 new_log_desc = CreateDescriptionFromLog(args)
3356 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003357 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003358 return new_log_desc
3359 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003360 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003361
Ravi Mistry31e7d562018-04-02 12:53:57 -04003362 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3363 """Sets labels on the change based on the provided flags."""
3364 labels = {}
3365 notify = None;
3366 if enable_auto_submit:
3367 labels['Auto-Submit'] = 1
3368 if use_commit_queue:
3369 labels['Commit-Queue'] = 2
3370 elif cq_dry_run:
3371 labels['Commit-Queue'] = 1
3372 notify = False
3373 if labels:
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003374 gerrit_util.SetReview(
3375 self._GetGerritHost(),
3376 self._GerritChangeIdentifier(),
3377 labels=labels, notify=notify)
Ravi Mistry31e7d562018-04-02 12:53:57 -04003378
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003379 def SetCQState(self, new_state):
3380 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003381 vote_map = {
3382 _CQState.NONE: 0,
3383 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003384 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003385 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003386 labels = {'Commit-Queue': vote_map[new_state]}
3387 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003388 gerrit_util.SetReview(
3389 self._GetGerritHost(), self._GerritChangeIdentifier(),
3390 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003391
tandriie113dfd2016-10-11 10:20:12 -07003392 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003393 try:
3394 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003395 except GerritChangeNotExists:
3396 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003397
3398 if data['status'] in ('ABANDONED', 'MERGED'):
3399 return 'CL %s is closed' % self.GetIssue()
3400
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003401 def GetTryJobProperties(self, patchset=None):
3402 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003403 data = self._GetChangeDetail(['ALL_REVISIONS'])
3404 patchset = int(patchset or self.GetPatchset())
3405 assert patchset
3406 revision_data = None # Pylint wants it to be defined.
3407 for revision_data in data['revisions'].itervalues():
3408 if int(revision_data['_number']) == patchset:
3409 break
3410 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003411 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003412 (patchset, self.GetIssue()))
3413 return {
3414 'patch_issue': self.GetIssue(),
3415 'patch_set': patchset or self.GetPatchset(),
3416 'patch_project': data['project'],
3417 'patch_storage': 'gerrit',
3418 'patch_ref': revision_data['fetch']['http']['ref'],
3419 'patch_repository_url': revision_data['fetch']['http']['url'],
3420 'patch_gerrit_url': self.GetCodereviewServer(),
3421 }
tandriie113dfd2016-10-11 10:20:12 -07003422
tandriide281ae2016-10-12 06:02:30 -07003423 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003424 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003425
Edward Lemur707d70b2018-02-07 00:50:14 +01003426 def GetReviewers(self):
3427 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3428 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3429
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003430
3431_CODEREVIEW_IMPLEMENTATIONS = {
3432 'rietveld': _RietveldChangelistImpl,
3433 'gerrit': _GerritChangelistImpl,
3434}
3435
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003436
iannuccie53c9352016-08-17 14:40:40 -07003437def _add_codereview_issue_select_options(parser, extra=""):
3438 _add_codereview_select_options(parser)
3439
3440 text = ('Operate on this issue number instead of the current branch\'s '
3441 'implicit issue.')
3442 if extra:
3443 text += ' '+extra
3444 parser.add_option('-i', '--issue', type=int, help=text)
3445
3446
3447def _process_codereview_issue_select_options(parser, options):
3448 _process_codereview_select_options(parser, options)
3449 if options.issue is not None and not options.forced_codereview:
3450 parser.error('--issue must be specified with either --rietveld or --gerrit')
3451
3452
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003453def _add_codereview_select_options(parser):
3454 """Appends --gerrit and --rietveld options to force specific codereview."""
3455 parser.codereview_group = optparse.OptionGroup(
3456 parser, 'EXPERIMENTAL! Codereview override options')
3457 parser.add_option_group(parser.codereview_group)
3458 parser.codereview_group.add_option(
3459 '--gerrit', action='store_true',
3460 help='Force the use of Gerrit for codereview')
3461 parser.codereview_group.add_option(
3462 '--rietveld', action='store_true',
3463 help='Force the use of Rietveld for codereview')
3464
3465
3466def _process_codereview_select_options(parser, options):
3467 if options.gerrit and options.rietveld:
3468 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3469 options.forced_codereview = None
3470 if options.gerrit:
3471 options.forced_codereview = 'gerrit'
3472 elif options.rietveld:
3473 options.forced_codereview = 'rietveld'
3474
3475
tandriif9aefb72016-07-01 09:06:51 -07003476def _get_bug_line_values(default_project, bugs):
3477 """Given default_project and comma separated list of bugs, yields bug line
3478 values.
3479
3480 Each bug can be either:
3481 * a number, which is combined with default_project
3482 * string, which is left as is.
3483
3484 This function may produce more than one line, because bugdroid expects one
3485 project per line.
3486
3487 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3488 ['v8:123', 'chromium:789']
3489 """
3490 default_bugs = []
3491 others = []
3492 for bug in bugs.split(','):
3493 bug = bug.strip()
3494 if bug:
3495 try:
3496 default_bugs.append(int(bug))
3497 except ValueError:
3498 others.append(bug)
3499
3500 if default_bugs:
3501 default_bugs = ','.join(map(str, default_bugs))
3502 if default_project:
3503 yield '%s:%s' % (default_project, default_bugs)
3504 else:
3505 yield default_bugs
3506 for other in sorted(others):
3507 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3508 yield other
3509
3510
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003511class ChangeDescription(object):
3512 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003513 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003514 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003515 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003516 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003517 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3518 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3519 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3520 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003521
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003522 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003523 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003524
agable@chromium.org42c20792013-09-12 17:34:49 +00003525 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003526 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003527 return '\n'.join(self._description_lines)
3528
3529 def set_description(self, desc):
3530 if isinstance(desc, basestring):
3531 lines = desc.splitlines()
3532 else:
3533 lines = [line.rstrip() for line in desc]
3534 while lines and not lines[0]:
3535 lines.pop(0)
3536 while lines and not lines[-1]:
3537 lines.pop(-1)
3538 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003539
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003540 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3541 """Rewrites the R=/TBR= line(s) as a single line each.
3542
3543 Args:
3544 reviewers (list(str)) - list of additional emails to use for reviewers.
3545 tbrs (list(str)) - list of additional emails to use for TBRs.
3546 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3547 the change that are missing OWNER coverage. If this is not None, you
3548 must also pass a value for `change`.
3549 change (Change) - The Change that should be used for OWNERS lookups.
3550 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003551 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003552 assert isinstance(tbrs, list), tbrs
3553
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003554 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003555 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003556
3557 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003558 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003559
3560 reviewers = set(reviewers)
3561 tbrs = set(tbrs)
3562 LOOKUP = {
3563 'TBR': tbrs,
3564 'R': reviewers,
3565 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003566
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003567 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003568 regexp = re.compile(self.R_LINE)
3569 matches = [regexp.match(line) for line in self._description_lines]
3570 new_desc = [l for i, l in enumerate(self._description_lines)
3571 if not matches[i]]
3572 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003573
agable@chromium.org42c20792013-09-12 17:34:49 +00003574 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003575
3576 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003577 for match in matches:
3578 if not match:
3579 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003580 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3581
3582 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003583 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003584 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003585 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003586 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003587 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003588 LOOKUP[add_owners_to].update(
3589 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003590
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003591 # If any folks ended up in both groups, remove them from tbrs.
3592 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003593
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003594 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3595 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003596
3597 # Put the new lines in the description where the old first R= line was.
3598 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3599 if 0 <= line_loc < len(self._description_lines):
3600 if new_tbr_line:
3601 self._description_lines.insert(line_loc, new_tbr_line)
3602 if new_r_line:
3603 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003604 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003605 if new_r_line:
3606 self.append_footer(new_r_line)
3607 if new_tbr_line:
3608 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003609
Aaron Gable3a16ed12017-03-23 10:51:55 -07003610 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003611 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003612 self.set_description([
3613 '# Enter a description of the change.',
3614 '# This will be displayed on the codereview site.',
3615 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003616 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003617 '--------------------',
3618 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003619
agable@chromium.org42c20792013-09-12 17:34:49 +00003620 regexp = re.compile(self.BUG_LINE)
3621 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003622 prefix = settings.GetBugPrefix()
3623 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003624 if git_footer:
3625 self.append_footer('Bug: %s' % ', '.join(values))
3626 else:
3627 for value in values:
3628 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003629
agable@chromium.org42c20792013-09-12 17:34:49 +00003630 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003631 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003632 if not content:
3633 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003634 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003635
Bruce Dawson2377b012018-01-11 16:46:49 -08003636 # Strip off comments and default inserted "Bug:" line.
3637 clean_lines = [line.rstrip() for line in lines if not
3638 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003639 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003640 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003641 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003642
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003643 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003644 """Adds a footer line to the description.
3645
3646 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3647 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3648 that Gerrit footers are always at the end.
3649 """
3650 parsed_footer_line = git_footers.parse_footer(line)
3651 if parsed_footer_line:
3652 # Line is a gerrit footer in the form: Footer-Key: any value.
3653 # Thus, must be appended observing Gerrit footer rules.
3654 self.set_description(
3655 git_footers.add_footer(self.description,
3656 key=parsed_footer_line[0],
3657 value=parsed_footer_line[1]))
3658 return
3659
3660 if not self._description_lines:
3661 self._description_lines.append(line)
3662 return
3663
3664 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3665 if gerrit_footers:
3666 # git_footers.split_footers ensures that there is an empty line before
3667 # actual (gerrit) footers, if any. We have to keep it that way.
3668 assert top_lines and top_lines[-1] == ''
3669 top_lines, separator = top_lines[:-1], top_lines[-1:]
3670 else:
3671 separator = [] # No need for separator if there are no gerrit_footers.
3672
3673 prev_line = top_lines[-1] if top_lines else ''
3674 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3675 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3676 top_lines.append('')
3677 top_lines.append(line)
3678 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003679
tandrii99a72f22016-08-17 14:33:24 -07003680 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003681 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003682 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003683 reviewers = [match.group(2).strip()
3684 for match in matches
3685 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003686 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003687
bradnelsond975b302016-10-23 12:20:23 -07003688 def get_cced(self):
3689 """Retrieves the list of reviewers."""
3690 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3691 cced = [match.group(2).strip() for match in matches if match]
3692 return cleanup_list(cced)
3693
Nodir Turakulov23b82142017-11-16 11:04:25 -08003694 def get_hash_tags(self):
3695 """Extracts and sanitizes a list of Gerrit hashtags."""
3696 subject = (self._description_lines or ('',))[0]
3697 subject = re.sub(
3698 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3699
3700 tags = []
3701 start = 0
3702 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3703 while True:
3704 m = bracket_exp.match(subject, start)
3705 if not m:
3706 break
3707 tags.append(self.sanitize_hash_tag(m.group(1)))
3708 start = m.end()
3709
3710 if not tags:
3711 # Try "Tag: " prefix.
3712 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3713 if m:
3714 tags.append(self.sanitize_hash_tag(m.group(1)))
3715 return tags
3716
3717 @classmethod
3718 def sanitize_hash_tag(cls, tag):
3719 """Returns a sanitized Gerrit hash tag.
3720
3721 A sanitized hashtag can be used as a git push refspec parameter value.
3722 """
3723 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3724
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003725 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3726 """Updates this commit description given the parent.
3727
3728 This is essentially what Gnumbd used to do.
3729 Consult https://goo.gl/WMmpDe for more details.
3730 """
3731 assert parent_msg # No, orphan branch creation isn't supported.
3732 assert parent_hash
3733 assert dest_ref
3734 parent_footer_map = git_footers.parse_footers(parent_msg)
3735 # This will also happily parse svn-position, which GnumbD is no longer
3736 # supporting. While we'd generate correct footers, the verifier plugin
3737 # installed in Gerrit will block such commit (ie git push below will fail).
3738 parent_position = git_footers.get_position(parent_footer_map)
3739
3740 # Cherry-picks may have last line obscuring their prior footers,
3741 # from git_footers perspective. This is also what Gnumbd did.
3742 cp_line = None
3743 if (self._description_lines and
3744 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3745 cp_line = self._description_lines.pop()
3746
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003747 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003748
3749 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3750 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003751 for i, line in enumerate(footer_lines):
3752 k, v = git_footers.parse_footer(line) or (None, None)
3753 if k and k.startswith('Cr-'):
3754 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003755
3756 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003757 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003758 if parent_position[0] == dest_ref:
3759 # Same branch as parent.
3760 number = int(parent_position[1]) + 1
3761 else:
3762 number = 1 # New branch, and extra lineage.
3763 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3764 int(parent_position[1])))
3765
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003766 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3767 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003768
3769 self._description_lines = top_lines
3770 if cp_line:
3771 self._description_lines.append(cp_line)
3772 if self._description_lines[-1] != '':
3773 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003774 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003775
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003776
Aaron Gablea1bab272017-04-11 16:38:18 -07003777def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003778 """Retrieves the reviewers that approved a CL from the issue properties with
3779 messages.
3780
3781 Note that the list may contain reviewers that are not committer, thus are not
3782 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003783
3784 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003785 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003786 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003787 return sorted(
3788 set(
3789 message['sender']
3790 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003791 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003792 )
3793 )
3794
3795
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003796def FindCodereviewSettingsFile(filename='codereview.settings'):
3797 """Finds the given file starting in the cwd and going up.
3798
3799 Only looks up to the top of the repository unless an
3800 'inherit-review-settings-ok' file exists in the root of the repository.
3801 """
3802 inherit_ok_file = 'inherit-review-settings-ok'
3803 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003804 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003805 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3806 root = '/'
3807 while True:
3808 if filename in os.listdir(cwd):
3809 if os.path.isfile(os.path.join(cwd, filename)):
3810 return open(os.path.join(cwd, filename))
3811 if cwd == root:
3812 break
3813 cwd = os.path.dirname(cwd)
3814
3815
3816def LoadCodereviewSettingsFromFile(fileobj):
3817 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003818 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003819
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003820 def SetProperty(name, setting, unset_error_ok=False):
3821 fullname = 'rietveld.' + name
3822 if setting in keyvals:
3823 RunGit(['config', fullname, keyvals[setting]])
3824 else:
3825 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3826
tandrii48df5812016-10-17 03:55:37 -07003827 if not keyvals.get('GERRIT_HOST', False):
3828 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003829 # Only server setting is required. Other settings can be absent.
3830 # In that case, we ignore errors raised during option deletion attempt.
3831 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003832 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003833 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3834 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003835 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003836 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3837 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003838 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003839 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3840 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003841
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003842 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003843 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003844
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003845 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003846 RunGit(['config', 'gerrit.squash-uploads',
3847 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003848
tandrii@chromium.org28253532016-04-14 13:46:56 +00003849 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003850 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003851 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3852
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003853 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003854 # should be of the form
3855 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3856 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003857 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3858 keyvals['ORIGIN_URL_CONFIG']])
3859
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003860
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003861def urlretrieve(source, destination):
3862 """urllib is broken for SSL connections via a proxy therefore we
3863 can't use urllib.urlretrieve()."""
3864 with open(destination, 'w') as f:
3865 f.write(urllib2.urlopen(source).read())
3866
3867
ukai@chromium.org712d6102013-11-27 00:52:58 +00003868def hasSheBang(fname):
3869 """Checks fname is a #! script."""
3870 with open(fname) as f:
3871 return f.read(2).startswith('#!')
3872
3873
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003874# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3875def DownloadHooks(*args, **kwargs):
3876 pass
3877
3878
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003879def DownloadGerritHook(force):
3880 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003881
3882 Args:
3883 force: True to update hooks. False to install hooks if not present.
3884 """
3885 if not settings.GetIsGerrit():
3886 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003887 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003888 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3889 if not os.access(dst, os.X_OK):
3890 if os.path.exists(dst):
3891 if not force:
3892 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003893 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003894 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003895 if not hasSheBang(dst):
3896 DieWithError('Not a script: %s\n'
3897 'You need to download from\n%s\n'
3898 'into .git/hooks/commit-msg and '
3899 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003900 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3901 except Exception:
3902 if os.path.exists(dst):
3903 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003904 DieWithError('\nFailed to download hooks.\n'
3905 'You need to download from\n%s\n'
3906 'into .git/hooks/commit-msg and '
3907 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003908
3909
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003910def GetRietveldCodereviewSettingsInteractively():
3911 """Prompt the user for settings."""
3912 server = settings.GetDefaultServerUrl(error_ok=True)
3913 prompt = 'Rietveld server (host[:port])'
3914 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3915 newserver = ask_for_data(prompt + ':')
3916 if not server and not newserver:
3917 newserver = DEFAULT_SERVER
3918 if newserver:
3919 newserver = gclient_utils.UpgradeToHttps(newserver)
3920 if newserver != server:
3921 RunGit(['config', 'rietveld.server', newserver])
3922
3923 def SetProperty(initial, caption, name, is_url):
3924 prompt = caption
3925 if initial:
3926 prompt += ' ("x" to clear) [%s]' % initial
3927 new_val = ask_for_data(prompt + ':')
3928 if new_val == 'x':
3929 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3930 elif new_val:
3931 if is_url:
3932 new_val = gclient_utils.UpgradeToHttps(new_val)
3933 if new_val != initial:
3934 RunGit(['config', 'rietveld.' + name, new_val])
3935
3936 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3937 SetProperty(settings.GetDefaultPrivateFlag(),
3938 'Private flag (rietveld only)', 'private', False)
3939 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3940 'tree-status-url', False)
3941 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3942 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3943 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3944 'run-post-upload-hook', False)
3945
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003946
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003947class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003948 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003949
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003950 _GOOGLESOURCE = 'googlesource.com'
3951
3952 def __init__(self):
3953 # Cached list of [host, identity, source], where source is either
3954 # .gitcookies or .netrc.
3955 self._all_hosts = None
3956
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003957 def ensure_configured_gitcookies(self):
3958 """Runs checks and suggests fixes to make git use .gitcookies from default
3959 path."""
3960 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3961 configured_path = RunGitSilent(
3962 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003963 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003964 if configured_path:
3965 self._ensure_default_gitcookies_path(configured_path, default)
3966 else:
3967 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003968
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003969 @staticmethod
3970 def _ensure_default_gitcookies_path(configured_path, default_path):
3971 assert configured_path
3972 if configured_path == default_path:
3973 print('git is already configured to use your .gitcookies from %s' %
3974 configured_path)
3975 return
3976
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003977 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003978 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3979 (configured_path, default_path))
3980
3981 if not os.path.exists(configured_path):
3982 print('However, your configured .gitcookies file is missing.')
3983 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3984 action='reconfigure')
3985 RunGit(['config', '--global', 'http.cookiefile', default_path])
3986 return
3987
3988 if os.path.exists(default_path):
3989 print('WARNING: default .gitcookies file already exists %s' %
3990 default_path)
3991 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3992 default_path)
3993
3994 confirm_or_exit('Move existing .gitcookies to default location?',
3995 action='move')
3996 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003997 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003998 print('Moved and reconfigured git to use .gitcookies from %s' %
3999 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004000
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004001 @staticmethod
4002 def _configure_gitcookies_path(default_path):
4003 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
4004 if os.path.exists(netrc_path):
4005 print('You seem to be using outdated .netrc for git credentials: %s' %
4006 netrc_path)
4007 print('This tool will guide you through setting up recommended '
4008 '.gitcookies store for git credentials.\n'
4009 '\n'
4010 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
4011 ' git config --global --unset http.cookiefile\n'
4012 ' mv %s %s.backup\n\n' % (default_path, default_path))
4013 confirm_or_exit(action='setup .gitcookies')
4014 RunGit(['config', '--global', 'http.cookiefile', default_path])
4015 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004016
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004017 def get_hosts_with_creds(self, include_netrc=False):
4018 if self._all_hosts is None:
4019 a = gerrit_util.CookiesAuthenticator()
4020 self._all_hosts = [
4021 (h, u, s)
4022 for h, u, s in itertools.chain(
4023 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
4024 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
4025 )
4026 if h.endswith(self._GOOGLESOURCE)
4027 ]
4028
4029 if include_netrc:
4030 return self._all_hosts
4031 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
4032
4033 def print_current_creds(self, include_netrc=False):
4034 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
4035 if not hosts:
4036 print('No Git/Gerrit credentials found')
4037 return
4038 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
4039 header = [('Host', 'User', 'Which file'),
4040 ['=' * l for l in lengths]]
4041 for row in (header + hosts):
4042 print('\t'.join((('%%+%ds' % l) % s)
4043 for l, s in zip(lengths, row)))
4044
Andrii Shyshkalov97800502017-03-16 16:04:32 +01004045 @staticmethod
4046 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08004047 """Parses identity "git-<username>.domain" into <username> and domain."""
4048 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02004049 # distinguishable from sub-domains. But we do know typical domains:
4050 if identity.endswith('.chromium.org'):
4051 domain = 'chromium.org'
4052 username = identity[:-len('.chromium.org')]
4053 else:
4054 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01004055 if username.startswith('git-'):
4056 username = username[len('git-'):]
4057 return username, domain
4058
4059 def _get_usernames_of_domain(self, domain):
4060 """Returns list of usernames referenced by .gitcookies in a given domain."""
4061 identities_by_domain = {}
4062 for _, identity, _ in self.get_hosts_with_creds():
4063 username, domain = self._parse_identity(identity)
4064 identities_by_domain.setdefault(domain, []).append(username)
4065 return identities_by_domain.get(domain)
4066
4067 def _canonical_git_googlesource_host(self, host):
4068 """Normalizes Gerrit hosts (with '-review') to Git host."""
4069 assert host.endswith(self._GOOGLESOURCE)
4070 # Prefix doesn't include '.' at the end.
4071 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
4072 if prefix.endswith('-review'):
4073 prefix = prefix[:-len('-review')]
4074 return prefix + '.' + self._GOOGLESOURCE
4075
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004076 def _canonical_gerrit_googlesource_host(self, host):
4077 git_host = self._canonical_git_googlesource_host(host)
4078 prefix = git_host.split('.', 1)[0]
4079 return prefix + '-review.' + self._GOOGLESOURCE
4080
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004081 def _get_counterpart_host(self, host):
4082 assert host.endswith(self._GOOGLESOURCE)
4083 git = self._canonical_git_googlesource_host(host)
4084 gerrit = self._canonical_gerrit_googlesource_host(git)
4085 return git if gerrit == host else gerrit
4086
Andrii Shyshkalov97800502017-03-16 16:04:32 +01004087 def has_generic_host(self):
4088 """Returns whether generic .googlesource.com has been configured.
4089
4090 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
4091 """
4092 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
4093 if host == '.' + self._GOOGLESOURCE:
4094 return True
4095 return False
4096
4097 def _get_git_gerrit_identity_pairs(self):
4098 """Returns map from canonic host to pair of identities (Git, Gerrit).
4099
4100 One of identities might be None, meaning not configured.
4101 """
4102 host_to_identity_pairs = {}
4103 for host, identity, _ in self.get_hosts_with_creds():
4104 canonical = self._canonical_git_googlesource_host(host)
4105 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
4106 idx = 0 if canonical == host else 1
4107 pair[idx] = identity
4108 return host_to_identity_pairs
4109
4110 def get_partially_configured_hosts(self):
4111 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004112 (host if i1 else self._canonical_gerrit_googlesource_host(host))
4113 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
4114 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01004115
4116 def get_conflicting_hosts(self):
4117 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004118 host
4119 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01004120 if None not in (i1, i2) and i1 != i2)
4121
4122 def get_duplicated_hosts(self):
4123 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
4124 return set(host for host, count in counters.iteritems() if count > 1)
4125
4126 _EXPECTED_HOST_IDENTITY_DOMAINS = {
4127 'chromium.googlesource.com': 'chromium.org',
4128 'chrome-internal.googlesource.com': 'google.com',
4129 }
4130
4131 def get_hosts_with_wrong_identities(self):
4132 """Finds hosts which **likely** reference wrong identities.
4133
4134 Note: skips hosts which have conflicting identities for Git and Gerrit.
4135 """
4136 hosts = set()
4137 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
4138 pair = self._get_git_gerrit_identity_pairs().get(host)
4139 if pair and pair[0] == pair[1]:
4140 _, domain = self._parse_identity(pair[0])
4141 if domain != expected:
4142 hosts.add(host)
4143 return hosts
4144
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004145 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004146 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004147 hosts = sorted(hosts)
4148 assert hosts
4149 if extra_column_func is None:
4150 extras = [''] * len(hosts)
4151 else:
4152 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004153 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
4154 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004155 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004156 lines.append(tmpl % he)
4157 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004158
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004159 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004160 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004161 yield ('.googlesource.com wildcard record detected',
4162 ['Chrome Infrastructure team recommends to list full host names '
4163 'explicitly.'],
4164 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004165
4166 dups = self.get_duplicated_hosts()
4167 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004168 yield ('The following hosts were defined twice',
4169 self._format_hosts(dups),
4170 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004171
4172 partial = self.get_partially_configured_hosts()
4173 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004174 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
4175 'These hosts are missing',
4176 self._format_hosts(partial, lambda host: 'but %s defined' %
4177 self._get_counterpart_host(host)),
4178 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004179
4180 conflicting = self.get_conflicting_hosts()
4181 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004182 yield ('The following Git hosts have differing credentials from their '
4183 'Gerrit counterparts',
4184 self._format_hosts(conflicting, lambda host: '%s vs %s' %
4185 tuple(self._get_git_gerrit_identity_pairs()[host])),
4186 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004187
4188 wrong = self.get_hosts_with_wrong_identities()
4189 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02004190 yield ('These hosts likely use wrong identity',
4191 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
4192 (self._get_git_gerrit_identity_pairs()[host][0],
4193 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
4194 wrong)
4195
4196 def find_and_report_problems(self):
4197 """Returns True if there was at least one problem, else False."""
4198 found = False
4199 bad_hosts = set()
4200 for title, sublines, hosts in self._find_problems():
4201 if not found:
4202 found = True
4203 print('\n\n.gitcookies problem report:\n')
4204 bad_hosts.update(hosts or [])
4205 print(' %s%s' % (title , (':' if sublines else '')))
4206 if sublines:
4207 print()
4208 print(' %s' % '\n '.join(sublines))
4209 print()
4210
4211 if bad_hosts:
4212 assert found
4213 print(' You can manually remove corresponding lines in your %s file and '
4214 'visit the following URLs with correct account to generate '
4215 'correct credential lines:\n' %
4216 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4217 print(' %s' % '\n '.join(sorted(set(
4218 gerrit_util.CookiesAuthenticator().get_new_password_url(
4219 self._canonical_git_googlesource_host(host))
4220 for host in bad_hosts
4221 ))))
4222 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004223
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004224
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004225@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004226def CMDcreds_check(parser, args):
4227 """Checks credentials and suggests changes."""
4228 _, _ = parser.parse_args(args)
4229
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004230 # Code below checks .gitcookies. Abort if using something else.
4231 authn = gerrit_util.Authenticator.get()
4232 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
4233 if isinstance(authn, gerrit_util.GceAuthenticator):
4234 DieWithError(
4235 'This command is not designed for GCE, are you on a bot?\n'
4236 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
4237 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004238 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004239 'This command is not designed for bot environment. It checks '
4240 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004241
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004242 checker = _GitCookiesChecker()
4243 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004244
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004245 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004246 checker.print_current_creds(include_netrc=True)
4247
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004248 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004249 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004250 return 0
4251 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004252
4253
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004254@subcommand.usage('[repo root containing codereview.settings]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004255@metrics.collector.collect_metrics('git cl config')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004257 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004258
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004259 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004260 # TODO(tandrii): remove this once we switch to Gerrit.
4261 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004262 parser.add_option('--activate-update', action='store_true',
4263 help='activate auto-updating [rietveld] section in '
4264 '.git/config')
4265 parser.add_option('--deactivate-update', action='store_true',
4266 help='deactivate auto-updating [rietveld] section in '
4267 '.git/config')
4268 options, args = parser.parse_args(args)
4269
4270 if options.deactivate_update:
4271 RunGit(['config', 'rietveld.autoupdate', 'false'])
4272 return
4273
4274 if options.activate_update:
4275 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4276 return
4277
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004278 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004279 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004280 return 0
4281
4282 url = args[0]
4283 if not url.endswith('codereview.settings'):
4284 url = os.path.join(url, 'codereview.settings')
4285
4286 # Load code review settings and download hooks (if available).
4287 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4288 return 0
4289
4290
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004291@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004292def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004293 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004294 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4295 branch = ShortBranchName(branchref)
4296 _, args = parser.parse_args(args)
4297 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004298 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004299 return RunGit(['config', 'branch.%s.base-url' % branch],
4300 error_ok=False).strip()
4301 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004302 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004303 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4304 error_ok=False).strip()
4305
4306
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004307def color_for_status(status):
4308 """Maps a Changelist status to color, for CMDstatus and other tools."""
4309 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004310 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004311 'waiting': Fore.BLUE,
4312 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004313 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004314 'lgtm': Fore.GREEN,
4315 'commit': Fore.MAGENTA,
4316 'closed': Fore.CYAN,
4317 'error': Fore.WHITE,
4318 }.get(status, Fore.WHITE)
4319
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004320
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004321def get_cl_statuses(changes, fine_grained, max_processes=None):
4322 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004323
4324 If fine_grained is true, this will fetch CL statuses from the server.
4325 Otherwise, simply indicate if there's a matching url for the given branches.
4326
4327 If max_processes is specified, it is used as the maximum number of processes
4328 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4329 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004330
4331 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004332 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004333 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004334 upload.verbosity = 0
4335
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004336 if not changes:
4337 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004338
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004339 if not fine_grained:
4340 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004341 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004342 for cl in changes:
4343 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004344 return
4345
4346 # First, sort out authentication issues.
4347 logging.debug('ensuring credentials exist')
4348 for cl in changes:
4349 cl.EnsureAuthenticated(force=False, refresh=True)
4350
4351 def fetch(cl):
4352 try:
4353 return (cl, cl.GetStatus())
4354 except:
4355 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07004356 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004357 raise
4358
4359 threads_count = len(changes)
4360 if max_processes:
4361 threads_count = max(1, min(threads_count, max_processes))
4362 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4363
4364 pool = ThreadPool(threads_count)
4365 fetched_cls = set()
4366 try:
4367 it = pool.imap_unordered(fetch, changes).__iter__()
4368 while True:
4369 try:
4370 cl, status = it.next(timeout=5)
4371 except multiprocessing.TimeoutError:
4372 break
4373 fetched_cls.add(cl)
4374 yield cl, status
4375 finally:
4376 pool.close()
4377
4378 # Add any branches that failed to fetch.
4379 for cl in set(changes) - fetched_cls:
4380 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004381
rmistry@google.com2dd99862015-06-22 12:22:18 +00004382
4383def upload_branch_deps(cl, args):
4384 """Uploads CLs of local branches that are dependents of the current branch.
4385
4386 If the local branch dependency tree looks like:
4387 test1 -> test2.1 -> test3.1
4388 -> test3.2
4389 -> test2.2 -> test3.3
4390
4391 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4392 run on the dependent branches in this order:
4393 test2.1, test3.1, test3.2, test2.2, test3.3
4394
4395 Note: This function does not rebase your local dependent branches. Use it when
4396 you make a change to the parent branch that will not conflict with its
4397 dependent branches, and you would like their dependencies updated in
4398 Rietveld.
4399 """
4400 if git_common.is_dirty_git_tree('upload-branch-deps'):
4401 return 1
4402
4403 root_branch = cl.GetBranch()
4404 if root_branch is None:
4405 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4406 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004407 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004408 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4409 'patchset dependencies without an uploaded CL.')
4410
4411 branches = RunGit(['for-each-ref',
4412 '--format=%(refname:short) %(upstream:short)',
4413 'refs/heads'])
4414 if not branches:
4415 print('No local branches found.')
4416 return 0
4417
4418 # Create a dictionary of all local branches to the branches that are dependent
4419 # on it.
4420 tracked_to_dependents = collections.defaultdict(list)
4421 for b in branches.splitlines():
4422 tokens = b.split()
4423 if len(tokens) == 2:
4424 branch_name, tracked = tokens
4425 tracked_to_dependents[tracked].append(branch_name)
4426
vapiera7fbd5a2016-06-16 09:17:49 -07004427 print()
4428 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004429 dependents = []
4430 def traverse_dependents_preorder(branch, padding=''):
4431 dependents_to_process = tracked_to_dependents.get(branch, [])
4432 padding += ' '
4433 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004435 dependents.append(dependent)
4436 traverse_dependents_preorder(dependent, padding)
4437 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004438 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004439
4440 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004442 return 0
4443
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004444 confirm_or_exit('This command will checkout all dependent branches and run '
4445 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004446
andybons@chromium.org962f9462016-02-03 20:00:42 +00004447 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004448 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004449 args.extend(['-t', 'Updated patchset dependency'])
4450
rmistry@google.com2dd99862015-06-22 12:22:18 +00004451 # Record all dependents that failed to upload.
4452 failures = {}
4453 # Go through all dependents, checkout the branch and upload.
4454 try:
4455 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004456 print()
4457 print('--------------------------------------')
4458 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004459 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004460 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004461 try:
4462 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004463 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004464 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004465 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004466 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004467 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004468 finally:
4469 # Swap back to the original root branch.
4470 RunGit(['checkout', '-q', root_branch])
4471
vapiera7fbd5a2016-06-16 09:17:49 -07004472 print()
4473 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004474 for dependent_branch in dependents:
4475 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004476 print(' %s : %s' % (dependent_branch, upload_status))
4477 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004478
4479 return 0
4480
4481
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004482@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004483def CMDarchive(parser, args):
4484 """Archives and deletes branches associated with closed changelists."""
4485 parser.add_option(
4486 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004487 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004488 parser.add_option(
4489 '-f', '--force', action='store_true',
4490 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004491 parser.add_option(
4492 '-d', '--dry-run', action='store_true',
4493 help='Skip the branch tagging and removal steps.')
4494 parser.add_option(
4495 '-t', '--notags', action='store_true',
4496 help='Do not tag archived branches. '
4497 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004498
4499 auth.add_auth_options(parser)
4500 options, args = parser.parse_args(args)
4501 if args:
4502 parser.error('Unsupported args: %s' % ' '.join(args))
4503 auth_config = auth.extract_auth_config_from_options(options)
4504
4505 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4506 if not branches:
4507 return 0
4508
vapiera7fbd5a2016-06-16 09:17:49 -07004509 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004510 changes = [Changelist(branchref=b, auth_config=auth_config)
4511 for b in branches.splitlines()]
4512 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4513 statuses = get_cl_statuses(changes,
4514 fine_grained=True,
4515 max_processes=options.maxjobs)
4516 proposal = [(cl.GetBranch(),
4517 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4518 for cl, status in statuses
4519 if status == 'closed']
4520 proposal.sort()
4521
4522 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004523 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004524 return 0
4525
4526 current_branch = GetCurrentBranch()
4527
vapiera7fbd5a2016-06-16 09:17:49 -07004528 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004529 if options.notags:
4530 for next_item in proposal:
4531 print(' ' + next_item[0])
4532 else:
4533 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4534 for next_item in proposal:
4535 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004536
kmarshall9249e012016-08-23 12:02:16 -07004537 # Quit now on precondition failure or if instructed by the user, either
4538 # via an interactive prompt or by command line flags.
4539 if options.dry_run:
4540 print('\nNo changes were made (dry run).\n')
4541 return 0
4542 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004543 print('You are currently on a branch \'%s\' which is associated with a '
4544 'closed codereview issue, so archive cannot proceed. Please '
4545 'checkout another branch and run this command again.' %
4546 current_branch)
4547 return 1
kmarshall9249e012016-08-23 12:02:16 -07004548 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004549 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4550 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004551 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004552 return 1
4553
4554 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004555 if not options.notags:
4556 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004557 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004558
vapiera7fbd5a2016-06-16 09:17:49 -07004559 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004560
4561 return 0
4562
4563
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004564@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004565def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004566 """Show status of changelists.
4567
4568 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004569 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004570 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004571 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004572 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004573 - Magenta in the commit queue
4574 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004575 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004576
4577 Also see 'git cl comments'.
4578 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004579 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004580 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004581 parser.add_option('-f', '--fast', action='store_true',
4582 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004583 parser.add_option(
4584 '-j', '--maxjobs', action='store', type=int,
4585 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004586
4587 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004588 _add_codereview_issue_select_options(
4589 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004590 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004591 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004592 if args:
4593 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004594 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004595
iannuccie53c9352016-08-17 14:40:40 -07004596 if options.issue is not None and not options.field:
4597 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004598
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004600 cl = Changelist(auth_config=auth_config, issue=options.issue,
4601 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004602 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004603 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004604 elif options.field == 'id':
4605 issueid = cl.GetIssue()
4606 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004607 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004609 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004611 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004612 elif options.field == 'status':
4613 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004614 elif options.field == 'url':
4615 url = cl.GetIssueURL()
4616 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004617 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004618 return 0
4619
4620 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4621 if not branches:
4622 print('No local branch found.')
4623 return 0
4624
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004625 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004626 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004627 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004628 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004629 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004630 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004631 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004632
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004633 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004634 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4635 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4636 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004637 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004638 c, status = output.next()
4639 branch_statuses[c.GetBranch()] = status
4640 status = branch_statuses.pop(branch)
4641 url = cl.GetIssueURL()
4642 if url and (not status or status == 'error'):
4643 # The issue probably doesn't exist anymore.
4644 url += ' (broken)'
4645
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004646 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004647 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004648 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004649 color = ''
4650 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004651 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004652 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004653 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004654 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004655
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004656
4657 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004658 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004659 print('Current branch: %s' % branch)
4660 for cl in changes:
4661 if cl.GetBranch() == branch:
4662 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004663 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004664 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004665 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004666 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004667 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004668 print('Issue description:')
4669 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004670 return 0
4671
4672
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004673def colorize_CMDstatus_doc():
4674 """To be called once in main() to add colors to git cl status help."""
4675 colors = [i for i in dir(Fore) if i[0].isupper()]
4676
4677 def colorize_line(line):
4678 for color in colors:
4679 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004680 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004681 indent = len(line) - len(line.lstrip(' ')) + 1
4682 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4683 return line
4684
4685 lines = CMDstatus.__doc__.splitlines()
4686 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4687
4688
phajdan.jre328cf92016-08-22 04:12:17 -07004689def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004690 if path == '-':
4691 json.dump(contents, sys.stdout)
4692 else:
4693 with open(path, 'w') as f:
4694 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004695
4696
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004697@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004698@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004699def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004700 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004701
4702 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004703 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004704 parser.add_option('-r', '--reverse', action='store_true',
4705 help='Lookup the branch(es) for the specified issues. If '
4706 'no issues are specified, all branches with mapped '
4707 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004708 parser.add_option('--json',
4709 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004710 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004711 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004712 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004713
dnj@chromium.org406c4402015-03-03 17:22:28 +00004714 if options.reverse:
4715 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004716 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004717 # Reverse issue lookup.
4718 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004719
4720 git_config = {}
4721 for config in RunGit(['config', '--get-regexp',
4722 r'branch\..*issue']).splitlines():
4723 name, _space, val = config.partition(' ')
4724 git_config[name] = val
4725
dnj@chromium.org406c4402015-03-03 17:22:28 +00004726 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004727 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4728 config_key = _git_branch_config_key(ShortBranchName(branch),
4729 cls.IssueConfigKey())
4730 issue = git_config.get(config_key)
4731 if issue:
4732 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004733 if not args:
4734 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004735 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004736 for issue in args:
4737 if not issue:
4738 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004739 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004740 print('Branch for issue number %s: %s' % (
4741 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004742 if options.json:
4743 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004744 return 0
4745
4746 if len(args) > 0:
4747 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4748 if not issue.valid:
4749 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4750 'or no argument to list it.\n'
4751 'Maybe you want to run git cl status?')
4752 cl = Changelist(codereview=issue.codereview)
4753 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004754 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004755 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004756 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4757 if options.json:
4758 write_json(options.json, {
4759 'issue': cl.GetIssue(),
4760 'issue_url': cl.GetIssueURL(),
4761 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004762 return 0
4763
4764
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004765@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004766def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004767 """Shows or posts review comments for any changelist."""
4768 parser.add_option('-a', '--add-comment', dest='comment',
4769 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004770 parser.add_option('-i', '--issue', dest='issue',
4771 help='review issue id (defaults to current issue). '
4772 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004773 parser.add_option('-m', '--machine-readable', dest='readable',
4774 action='store_false', default=True,
4775 help='output comments in a format compatible with '
4776 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004777 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004778 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004779 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004780 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004781 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004782 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004783 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004784
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004785 issue = None
4786 if options.issue:
4787 try:
4788 issue = int(options.issue)
4789 except ValueError:
4790 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004791 if not options.forced_codereview:
4792 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004793
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004794 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004795 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004796 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004797
4798 if options.comment:
4799 cl.AddComment(options.comment)
4800 return 0
4801
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004802 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4803 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004804 for comment in summary:
4805 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004806 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004807 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004808 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004809 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004810 color = Fore.MAGENTA
4811 else:
4812 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004813 print('\n%s%s %s%s\n%s' % (
4814 color,
4815 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4816 comment.sender,
4817 Fore.RESET,
4818 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4819
smut@google.comc85ac942015-09-15 16:34:43 +00004820 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004821 def pre_serialize(c):
4822 dct = c.__dict__.copy()
4823 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4824 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004825 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004826 return 0
4827
4828
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004829@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004830@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004831def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004832 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004833 parser.add_option('-d', '--display', action='store_true',
4834 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004835 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004836 help='New description to set for this issue (- for stdin, '
4837 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004838 parser.add_option('-f', '--force', action='store_true',
4839 help='Delete any unpublished Gerrit edits for this issue '
4840 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004841
4842 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004843 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004844 options, args = parser.parse_args(args)
4845 _process_codereview_select_options(parser, options)
4846
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004847 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004848 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004849 target_issue_arg = ParseIssueNumberArgument(args[0],
4850 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004851 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004852 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004853
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004854 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004855
martiniss6eda05f2016-06-30 10:18:35 -07004856 kwargs = {
4857 'auth_config': auth_config,
4858 'codereview': options.forced_codereview,
4859 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004860 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004861 if target_issue_arg:
4862 kwargs['issue'] = target_issue_arg.issue
4863 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004864 if target_issue_arg.codereview and not options.forced_codereview:
4865 detected_codereview_from_url = True
4866 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004867
4868 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004869 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004870 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004871 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004872
4873 if detected_codereview_from_url:
4874 logging.info('canonical issue/change URL: %s (type: %s)\n',
4875 cl.GetIssueURL(), target_issue_arg.codereview)
4876
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004877 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004878
smut@google.com34fb6b12015-07-13 20:03:26 +00004879 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004880 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004881 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004882
4883 if options.new_description:
4884 text = options.new_description
4885 if text == '-':
4886 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004887 elif text == '+':
4888 base_branch = cl.GetCommonAncestorWithUpstream()
4889 change = cl.GetChange(base_branch, None, local_description=True)
4890 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004891
4892 description.set_description(text)
4893 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004894 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004895
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004896 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004897 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004898 return 0
4899
4900
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004901def CreateDescriptionFromLog(args):
4902 """Pulls out the commit log to use as a base for the CL description."""
4903 log_args = []
4904 if len(args) == 1 and not args[0].endswith('.'):
4905 log_args = [args[0] + '..']
4906 elif len(args) == 1 and args[0].endswith('...'):
4907 log_args = [args[0][:-1]]
4908 elif len(args) == 2:
4909 log_args = [args[0] + '..' + args[1]]
4910 else:
4911 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004912 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004913
4914
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004915@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004916def CMDlint(parser, args):
4917 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004918 parser.add_option('--filter', action='append', metavar='-x,+y',
4919 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004920 auth.add_auth_options(parser)
4921 options, args = parser.parse_args(args)
4922 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004923
4924 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004925 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004926 try:
4927 import cpplint
4928 import cpplint_chromium
4929 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004930 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004931 return 1
4932
4933 # Change the current working directory before calling lint so that it
4934 # shows the correct base.
4935 previous_cwd = os.getcwd()
4936 os.chdir(settings.GetRoot())
4937 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004938 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004939 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4940 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004941 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004942 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004943 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004944
4945 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004946 command = args + files
4947 if options.filter:
4948 command = ['--filter=' + ','.join(options.filter)] + command
4949 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004950
4951 white_regex = re.compile(settings.GetLintRegex())
4952 black_regex = re.compile(settings.GetLintIgnoreRegex())
4953 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4954 for filename in filenames:
4955 if white_regex.match(filename):
4956 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004957 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004958 else:
4959 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4960 extra_check_functions)
4961 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004962 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004963 finally:
4964 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004965 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004966 if cpplint._cpplint_state.error_count != 0:
4967 return 1
4968 return 0
4969
4970
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004971@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004972def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004973 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004974 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004975 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004976 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004977 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004978 parser.add_option('--all', action='store_true',
4979 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004980 parser.add_option('--parallel', action='store_true',
4981 help='Run all tests specified by input_api.RunTests in all '
4982 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004983 auth.add_auth_options(parser)
4984 options, args = parser.parse_args(args)
4985 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004986
sbc@chromium.org71437c02015-04-09 19:29:40 +00004987 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004988 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004989 return 1
4990
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004991 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004992 if args:
4993 base_branch = args[0]
4994 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004995 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004996 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004997
Aaron Gable8076c282017-11-29 14:39:41 -08004998 if options.all:
4999 base_change = cl.GetChange(base_branch, None)
5000 files = [('M', f) for f in base_change.AllFiles()]
5001 change = presubmit_support.GitChange(
5002 base_change.Name(),
5003 base_change.FullDescriptionText(),
5004 base_change.RepositoryRoot(),
5005 files,
5006 base_change.issue,
5007 base_change.patchset,
5008 base_change.author_email,
5009 base_change._upstream)
5010 else:
5011 change = cl.GetChange(base_branch, None)
5012
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00005013 cl.RunHook(
5014 committing=not options.upload,
5015 may_prompt=False,
5016 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04005017 change=change,
5018 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00005019 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005020
5021
tandrii@chromium.org65874e12016-03-04 12:03:02 +00005022def GenerateGerritChangeId(message):
5023 """Returns Ixxxxxx...xxx change id.
5024
5025 Works the same way as
5026 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
5027 but can be called on demand on all platforms.
5028
5029 The basic idea is to generate git hash of a state of the tree, original commit
5030 message, author/committer info and timestamps.
5031 """
5032 lines = []
5033 tree_hash = RunGitSilent(['write-tree'])
5034 lines.append('tree %s' % tree_hash.strip())
5035 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
5036 if code == 0:
5037 lines.append('parent %s' % parent.strip())
5038 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
5039 lines.append('author %s' % author.strip())
5040 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
5041 lines.append('committer %s' % committer.strip())
5042 lines.append('')
5043 # Note: Gerrit's commit-hook actually cleans message of some lines and
5044 # whitespace. This code is not doing this, but it clearly won't decrease
5045 # entropy.
5046 lines.append(message)
5047 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
5048 stdin='\n'.join(lines))
5049 return 'I%s' % change_hash.strip()
5050
5051
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005052def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00005053 """Computes the remote branch ref to use for the CL.
5054
5055 Args:
5056 remote (str): The git remote for the CL.
5057 remote_branch (str): The git remote branch for the CL.
5058 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00005059 """
5060 if not (remote and remote_branch):
5061 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00005062
wittman@chromium.org455dc922015-01-26 20:15:50 +00005063 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005064 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00005065 # refs, which are then translated into the remote full symbolic refs
5066 # below.
5067 if '/' not in target_branch:
5068 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
5069 else:
5070 prefix_replacements = (
5071 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
5072 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
5073 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
5074 )
5075 match = None
5076 for regex, replacement in prefix_replacements:
5077 match = re.search(regex, target_branch)
5078 if match:
5079 remote_branch = target_branch.replace(match.group(0), replacement)
5080 break
5081 if not match:
5082 # This is a branch path but not one we recognize; use as-is.
5083 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00005084 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
5085 # Handle the refs that need to land in different refs.
5086 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00005087
wittman@chromium.org455dc922015-01-26 20:15:50 +00005088 # Create the true path to the remote branch.
5089 # Does the following translation:
5090 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
5091 # * refs/remotes/origin/master -> refs/heads/master
5092 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
5093 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
5094 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
5095 elif remote_branch.startswith('refs/remotes/%s/' % remote):
5096 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
5097 'refs/heads/')
5098 elif remote_branch.startswith('refs/remotes/branch-heads'):
5099 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01005100
wittman@chromium.org455dc922015-01-26 20:15:50 +00005101 return remote_branch
5102
5103
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005104def cleanup_list(l):
5105 """Fixes a list so that comma separated items are put as individual items.
5106
5107 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
5108 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
5109 """
5110 items = sum((i.split(',') for i in l), [])
5111 stripped_items = (i.strip() for i in items)
5112 return sorted(filter(None, stripped_items))
5113
5114
Aaron Gable4db38df2017-11-03 14:59:07 -07005115@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005116@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00005117def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00005118 """Uploads the current changelist to codereview.
5119
5120 Can skip dependency patchset uploads for a branch by running:
5121 git config branch.branch_name.skip-deps-uploads True
5122 To unset run:
5123 git config --unset branch.branch_name.skip-deps-uploads
5124 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02005125
5126 If the name of the checked out branch starts with "bug-" or "fix-" followed by
5127 a bug number, this bug number is automatically populated in the CL
5128 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005129
5130 If subject contains text in square brackets or has "<text>: " prefix, such
5131 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
5132 [git-cl] add support for hashtags
5133 Foo bar: implement foo
5134 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00005135 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00005136 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5137 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00005138 parser.add_option('--bypass-watchlists', action='store_true',
5139 dest='bypass_watchlists',
5140 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07005141 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00005142 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005143 parser.add_option('--message', '-m', dest='message',
5144 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07005145 parser.add_option('-b', '--bug',
5146 help='pre-populate the bug number(s) for this issue. '
5147 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07005148 parser.add_option('--message-file', dest='message_file',
5149 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005150 parser.add_option('--title', '-t', dest='title',
5151 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00005152 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005153 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00005154 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005155 parser.add_option('--tbrs',
5156 action='append', default=[],
5157 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00005158 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005159 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00005160 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005161 parser.add_option('--hashtag', dest='hashtags',
5162 action='append', default=[],
5163 help=('Gerrit hashtag for new CL; '
5164 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00005165 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08005166 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00005167 parser.add_option('--emulate_svn_auto_props',
5168 '--emulate-svn-auto-props',
5169 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00005170 dest="emulate_svn_auto_props",
5171 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00005172 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07005173 help='tell the commit queue to commit this patchset; '
5174 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00005175 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00005176 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00005177 metavar='TARGET',
5178 help='Apply CL to remote ref TARGET. ' +
5179 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00005180 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005181 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00005182 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005183 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07005184 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005185 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07005186 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
5187 const='TBR', help='add a set of OWNERS to TBR')
5188 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
5189 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00005190 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
5191 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00005192 help='Send the patchset to do a CQ dry run right after '
5193 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00005194 parser.add_option('--dependencies', action='store_true',
5195 help='Uploads CLs of all the local branches that depend on '
5196 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04005197 parser.add_option('-a', '--enable-auto-submit', action='store_true',
5198 help='Sends your change to the CQ after an approval. Only '
5199 'works on repos that have the Auto-Submit label '
5200 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04005201 parser.add_option('--parallel', action='store_true',
5202 help='Run all tests specified by input_api.RunTests in all '
5203 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00005204
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00005205 parser.add_option('--no-autocc', action='store_true',
5206 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005207 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00005208 help='Set the review private. This implies --no-autocc.')
5209
5210 # TODO: remove Rietveld flags
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08005211 parser.add_option('--email', default=None,
5212 help='email address to use to connect to Rietveld')
5213
rmistry@google.com2dd99862015-06-22 12:22:18 +00005214 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005215 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005216 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005217 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005218 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005219 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005220
sbc@chromium.org71437c02015-04-09 19:29:40 +00005221 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00005222 return 1
5223
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005224 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005225 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005226 options.cc = cleanup_list(options.cc)
5227
tandriib80458a2016-06-23 12:20:07 -07005228 if options.message_file:
5229 if options.message:
5230 parser.error('only one of --message and --message-file allowed.')
5231 options.message = gclient_utils.FileRead(options.message_file)
5232 options.message_file = None
5233
tandrii4d0545a2016-07-06 03:56:49 -07005234 if options.cq_dry_run and options.use_commit_queue:
5235 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
5236
Aaron Gableedbc4132017-09-11 13:22:28 -07005237 if options.use_commit_queue:
5238 options.send_mail = True
5239
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00005240 # For sanity of test expectations, do this otherwise lazy-loading *now*.
5241 settings.GetIsGerrit()
5242
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005243 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005244 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005245
5246
Francois Dorayd42c6812017-05-30 15:10:20 -04005247@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005248@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005249def CMDsplit(parser, args):
5250 """Splits a branch into smaller branches and uploads CLs.
5251
5252 Creates a branch and uploads a CL for each group of files modified in the
5253 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005254 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005255 the shared OWNERS file.
5256 """
5257 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005258 help="A text file containing a CL description in which "
5259 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005260 parser.add_option("-c", "--comment", dest="comment_file",
5261 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11005262 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
5263 default=False,
5264 help="List the files and reviewers for each CL that would "
5265 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00005266 parser.add_option("--cq-dry-run", action='store_true',
5267 help="If set, will do a cq dry run for each uploaded CL. "
5268 "Please be careful when doing this; more than ~10 CLs "
5269 "has the potential to overload our build "
5270 "infrastructure. Try to upload these not during high "
5271 "load times (usually 11-3 Mountain View time). Email "
5272 "infra-dev@chromium.org with any questions.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005273 options, _ = parser.parse_args(args)
5274
5275 if not options.description_file:
5276 parser.error('No --description flag specified.')
5277
5278 def WrappedCMDupload(args):
5279 return CMDupload(OptionParser(), args)
5280
5281 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00005282 Changelist, WrappedCMDupload, options.dry_run,
5283 options.cq_dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005284
5285
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005286@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005287@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005288def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005289 """DEPRECATED: Used to commit the current changelist via git-svn."""
5290 message = ('git-cl no longer supports committing to SVN repositories via '
5291 'git-svn. You probably want to use `git cl land` instead.')
5292 print(message)
5293 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005294
5295
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005296# Two special branches used by git cl land.
5297MERGE_BRANCH = 'git-cl-commit'
5298CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5299
5300
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005301@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005302@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005303def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005304 """Commits the current changelist via git.
5305
5306 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5307 upstream and closes the issue automatically and atomically.
5308
5309 Otherwise (in case of Rietveld):
5310 Squashes branch into a single commit.
5311 Updates commit message with metadata (e.g. pointer to review).
5312 Pushes the code upstream.
5313 Updates review and closes.
5314 """
5315 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5316 help='bypass upload presubmit hook')
5317 parser.add_option('-m', dest='message',
5318 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005319 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005320 help="force yes to questions (don't prompt)")
5321 parser.add_option('-c', dest='contributor',
5322 help="external contributor for patch (appended to " +
5323 "description and used as author for git). Should be " +
5324 "formatted as 'First Last <email@example.com>'")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005325 parser.add_option('--parallel', action='store_true',
5326 help='Run all tests specified by input_api.RunTests in all '
5327 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005328 auth.add_auth_options(parser)
5329 (options, args) = parser.parse_args(args)
5330 auth_config = auth.extract_auth_config_from_options(options)
5331
5332 cl = Changelist(auth_config=auth_config)
5333
Robert Iannucci2e73d432018-03-14 01:10:47 -07005334 if not cl.IsGerrit():
5335 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005336
Robert Iannucci2e73d432018-03-14 01:10:47 -07005337 if options.message:
5338 # This could be implemented, but it requires sending a new patch to
5339 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5340 # Besides, Gerrit has the ability to change the commit message on submit
5341 # automatically, thus there is no need to support this option (so far?).
5342 parser.error('-m MESSAGE option is not supported for Gerrit.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005343 if options.contributor:
Robert Iannucci2e73d432018-03-14 01:10:47 -07005344 parser.error(
5345 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5346 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5347 'the contributor\'s "name <email>". If you can\'t upload such a '
5348 'commit for review, contact your repository admin and request'
5349 '"Forge-Author" permission.')
5350 if not cl.GetIssue():
5351 DieWithError('You must upload the change first to Gerrit.\n'
5352 ' If you would rather have `git cl land` upload '
5353 'automatically for you, see http://crbug.com/642759')
5354 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02005355 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005356
5357
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005358def PushToGitWithAutoRebase(remote, branch, original_description,
5359 git_numberer_enabled, max_attempts=3):
5360 """Pushes current HEAD commit on top of remote's branch.
5361
5362 Attempts to fetch and autorebase on push failures.
5363 Adds git number footers on the fly.
5364
5365 Returns integer code from last command.
5366 """
5367 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5368 code = 0
5369 attempts_left = max_attempts
5370 while attempts_left:
5371 attempts_left -= 1
5372 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5373
5374 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5375 # If fetch fails, retry.
5376 print('Fetching %s/%s...' % (remote, branch))
5377 code, out = RunGitWithCode(
5378 ['retry', 'fetch', remote,
5379 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5380 if code:
5381 print('Fetch failed with exit code %d.' % code)
5382 print(out.strip())
5383 continue
5384
5385 print('Cherry-picking commit on top of latest %s' % branch)
5386 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5387 suppress_stderr=True)
5388 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5389 code, out = RunGitWithCode(['cherry-pick', cherry])
5390 if code:
5391 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5392 'the following files have merge conflicts:' %
5393 (branch, parent_hash))
Aaron Gable7817f022017-12-12 09:43:17 -08005394 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5395 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005396 print('Please rebase your patch and try again.')
5397 RunGitWithCode(['cherry-pick', '--abort'])
5398 break
5399
5400 commit_desc = ChangeDescription(original_description)
5401 if git_numberer_enabled:
5402 logging.debug('Adding git number footers')
5403 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5404 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5405 branch)
5406 # Ensure timestamps are monotonically increasing.
5407 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5408 _get_committer_timestamp('HEAD'))
5409 _git_amend_head(commit_desc.description, timestamp)
5410
5411 code, out = RunGitWithCode(
5412 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5413 print(out)
5414 if code == 0:
5415 break
5416 if IsFatalPushFailure(out):
5417 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005418 'user.email are correct and you have push access to the repo.\n'
5419 'Hint: run command below to diangose common Git/Gerrit credential '
5420 'problems:\n'
5421 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005422 break
5423 return code
5424
5425
5426def IsFatalPushFailure(push_stdout):
5427 """True if retrying push won't help."""
5428 return '(prohibited by Gerrit)' in push_stdout
5429
5430
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005431@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005432@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005433def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005434 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005435 parser.add_option('-b', dest='newbranch',
5436 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005437 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005438 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005439 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005440 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005441 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005442 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005443 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005444 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005445 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005446 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005447
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005448
5449 group = optparse.OptionGroup(
5450 parser,
5451 'Options for continuing work on the current issue uploaded from a '
5452 'different clone (e.g. different machine). Must be used independently '
5453 'from the other options. No issue number should be specified, and the '
5454 'branch must have an issue number associated with it')
5455 group.add_option('--reapply', action='store_true', dest='reapply',
5456 help='Reset the branch and reapply the issue.\n'
5457 'CAUTION: This will undo any local changes in this '
5458 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005459
5460 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005461 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005462 parser.add_option_group(group)
5463
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005464 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005465 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005466 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005467 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005468 auth_config = auth.extract_auth_config_from_options(options)
5469
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005470 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005471 if options.newbranch:
5472 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005473 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005474 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005475
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005476 cl = Changelist(auth_config=auth_config,
5477 codereview=options.forced_codereview)
5478 if not cl.GetIssue():
5479 parser.error('current branch must have an associated issue')
5480
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005481 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005482 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005483 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005484
5485 RunGit(['reset', '--hard', upstream])
5486 if options.pull:
5487 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005488
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005489 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5490 options.directory)
5491
5492 if len(args) != 1 or not args[0]:
5493 parser.error('Must specify issue number or url')
5494
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005495 target_issue_arg = ParseIssueNumberArgument(args[0],
5496 options.forced_codereview)
5497 if not target_issue_arg.valid:
5498 parser.error('invalid codereview url or CL id')
5499
5500 cl_kwargs = {
5501 'auth_config': auth_config,
5502 'codereview_host': target_issue_arg.hostname,
5503 'codereview': options.forced_codereview,
5504 }
5505 detected_codereview_from_url = False
5506 if target_issue_arg.codereview and not options.forced_codereview:
5507 detected_codereview_from_url = True
5508 cl_kwargs['codereview'] = target_issue_arg.codereview
5509 cl_kwargs['issue'] = target_issue_arg.issue
5510
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005511 # We don't want uncommitted changes mixed up with the patch.
5512 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005513 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005514
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005515 if options.newbranch:
5516 if options.force:
5517 RunGit(['branch', '-D', options.newbranch],
5518 stderr=subprocess2.PIPE, error_ok=True)
5519 RunGit(['new-branch', options.newbranch])
5520
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005521 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005522
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005523 if cl.IsGerrit():
5524 if options.reject:
5525 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005526 if options.directory:
5527 parser.error('--directory is not supported with Gerrit codereview.')
5528
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005529 if detected_codereview_from_url:
5530 print('canonical issue/change URL: %s (type: %s)\n' %
5531 (cl.GetIssueURL(), target_issue_arg.codereview))
5532
5533 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005534 options.nocommit, options.directory,
5535 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005536
5537
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005538def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005539 """Fetches the tree status and returns either 'open', 'closed',
5540 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005541 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005542 if url:
5543 status = urllib2.urlopen(url).read().lower()
5544 if status.find('closed') != -1 or status == '0':
5545 return 'closed'
5546 elif status.find('open') != -1 or status == '1':
5547 return 'open'
5548 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005549 return 'unset'
5550
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005551
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005552def GetTreeStatusReason():
5553 """Fetches the tree status from a json url and returns the message
5554 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005555 url = settings.GetTreeStatusUrl()
5556 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005557 connection = urllib2.urlopen(json_url)
5558 status = json.loads(connection.read())
5559 connection.close()
5560 return status['message']
5561
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005562
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005563@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005564def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005565 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005566 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005567 status = GetTreeStatus()
5568 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005569 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005570 return 2
5571
vapiera7fbd5a2016-06-16 09:17:49 -07005572 print('The tree is %s' % status)
5573 print()
5574 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005575 if status != 'open':
5576 return 1
5577 return 0
5578
5579
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005580@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005581def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005582 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005583 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005584 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005585 '-b', '--bot', action='append',
5586 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5587 'times to specify multiple builders. ex: '
5588 '"-b win_rel -b win_layout". See '
5589 'the try server waterfall for the builders name and the tests '
5590 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005591 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005592 '-B', '--bucket', default='',
5593 help=('Buildbucket bucket to send the try requests.'))
5594 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005595 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005596 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005597 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005598 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005599 help='Revision to use for the try job; default: the revision will '
5600 'be determined by the try recipe that builder runs, which usually '
5601 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005602 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005603 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005604 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005605 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005606 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005607 '--category', default='git_cl_try', help='Specify custom build category.')
5608 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005609 '--project',
5610 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005611 'in recipe to determine to which repository or directory to '
5612 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005613 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005614 '-p', '--property', dest='properties', action='append', default=[],
5615 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005616 'key2=value2 etc. The value will be treated as '
5617 'json if decodable, or as string otherwise. '
5618 'NOTE: using this may make your try job not usable for CQ, '
5619 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005620 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005621 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5622 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005623 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005624 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005625 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005626 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005627 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005628 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005629
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005630 if options.master and options.master.startswith('luci.'):
5631 parser.error(
5632 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005633 # Make sure that all properties are prop=value pairs.
5634 bad_params = [x for x in options.properties if '=' not in x]
5635 if bad_params:
5636 parser.error('Got properties with missing "=": %s' % bad_params)
5637
maruel@chromium.org15192402012-09-06 12:38:29 +00005638 if args:
5639 parser.error('Unknown arguments: %s' % args)
5640
Koji Ishii31c14782018-01-08 17:17:33 +09005641 cl = Changelist(auth_config=auth_config, issue=options.issue,
5642 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005643 if not cl.GetIssue():
5644 parser.error('Need to upload first')
5645
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005646 if cl.IsGerrit():
5647 # HACK: warm up Gerrit change detail cache to save on RPCs.
5648 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5649
tandriie113dfd2016-10-11 10:20:12 -07005650 error_message = cl.CannotTriggerTryJobReason()
5651 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005652 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005653
borenet6c0efe62016-10-19 08:13:29 -07005654 if options.bucket and options.master:
5655 parser.error('Only one of --bucket and --master may be used.')
5656
qyearsley1fdfcb62016-10-24 13:22:03 -07005657 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005658
qyearsleydd49f942016-10-28 11:57:22 -07005659 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5660 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005661 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005662 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005663 print('git cl try with no bots now defaults to CQ dry run.')
5664 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5665 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005666
borenet6c0efe62016-10-19 08:13:29 -07005667 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005668 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005669 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005670 'of bot requires an initial job from a parent (usually a builder). '
5671 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005672 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005673 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005674
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005675 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005676 # TODO(tandrii): Checking local patchset against remote patchset is only
5677 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5678 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005679 print('Warning: Codereview server has newer patchsets (%s) than most '
5680 'recent upload from local checkout (%s). Did a previous upload '
5681 'fail?\n'
5682 'By default, git cl try uses the latest patchset from '
5683 'codereview, continuing to use patchset %s.\n' %
5684 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005685
tandrii568043b2016-10-11 07:49:18 -07005686 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005687 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005688 except BuildbucketResponseException as ex:
5689 print('ERROR: %s' % ex)
5690 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005691 return 0
5692
5693
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005694@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005695def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005696 """Prints info about try jobs associated with current CL."""
5697 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005698 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005699 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005700 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005701 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005702 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005703 '--color', action='store_true', default=setup_color.IS_TTY,
5704 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005705 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005706 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5707 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005708 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005709 '--json', help=('Path of JSON output file to write try job results to,'
5710 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005711 parser.add_option_group(group)
5712 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005713 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005714 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005715 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005716 if args:
5717 parser.error('Unrecognized args: %s' % ' '.join(args))
5718
5719 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005720 cl = Changelist(
5721 issue=options.issue, codereview=options.forced_codereview,
5722 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005723 if not cl.GetIssue():
5724 parser.error('Need to upload first')
5725
tandrii221ab252016-10-06 08:12:04 -07005726 patchset = options.patchset
5727 if not patchset:
5728 patchset = cl.GetMostRecentPatchset()
5729 if not patchset:
5730 parser.error('Codereview doesn\'t know about issue %s. '
5731 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005732 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005733 cl.GetIssue())
5734
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005735 # TODO(tandrii): Checking local patchset against remote patchset is only
5736 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5737 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005738 print('Warning: Codereview server has newer patchsets (%s) than most '
5739 'recent upload from local checkout (%s). Did a previous upload '
5740 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005741 'By default, git cl try-results uses the latest patchset from '
5742 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005743 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005744 try:
tandrii221ab252016-10-06 08:12:04 -07005745 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005746 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005747 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005748 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005749 if options.json:
5750 write_try_results_json(options.json, jobs)
5751 else:
5752 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005753 return 0
5754
5755
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005756@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005757@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005758def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005759 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005760 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005761 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005762 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005763
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005764 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005765 if args:
5766 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005767 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005768 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005769 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005770 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005771
5772 # Clear configured merge-base, if there is one.
5773 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005774 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005775 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005776 return 0
5777
5778
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005779@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005780def CMDweb(parser, args):
5781 """Opens the current CL in the web browser."""
5782 _, args = parser.parse_args(args)
5783 if args:
5784 parser.error('Unrecognized args: %s' % ' '.join(args))
5785
5786 issue_url = Changelist().GetIssueURL()
5787 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005788 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005789 return 1
5790
5791 webbrowser.open(issue_url)
5792 return 0
5793
5794
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005795@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005796def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005797 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005798 parser.add_option('-d', '--dry-run', action='store_true',
5799 help='trigger in dry run mode')
5800 parser.add_option('-c', '--clear', action='store_true',
5801 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005802 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005803 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005804 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005805 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005806 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005807 if args:
5808 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005809 if options.dry_run and options.clear:
5810 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5811
iannuccie53c9352016-08-17 14:40:40 -07005812 cl = Changelist(auth_config=auth_config, issue=options.issue,
5813 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005814 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005815 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005816 elif options.dry_run:
5817 state = _CQState.DRY_RUN
5818 else:
5819 state = _CQState.COMMIT
5820 if not cl.GetIssue():
5821 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005822 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005823 return 0
5824
5825
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005826@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005827def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005828 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005829 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005830 auth.add_auth_options(parser)
5831 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005832 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005833 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005834 if args:
5835 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005836 cl = Changelist(auth_config=auth_config, issue=options.issue,
5837 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005838 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005839 if not cl.GetIssue():
5840 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005841 cl.CloseIssue()
5842 return 0
5843
5844
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005845@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005846def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005847 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005848 parser.add_option(
5849 '--stat',
5850 action='store_true',
5851 dest='stat',
5852 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005853 auth.add_auth_options(parser)
5854 options, args = parser.parse_args(args)
5855 auth_config = auth.extract_auth_config_from_options(options)
5856 if args:
5857 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005858
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005859 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005860 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005861 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005862 if not issue:
5863 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005864
Aaron Gablea718c3e2017-08-28 17:47:28 -07005865 base = cl._GitGetBranchConfigValue('last-upload-hash')
5866 if not base:
5867 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5868 if not base:
5869 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5870 revision_info = detail['revisions'][detail['current_revision']]
5871 fetch_info = revision_info['fetch']['http']
5872 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5873 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005874
Aaron Gablea718c3e2017-08-28 17:47:28 -07005875 cmd = ['git', 'diff']
5876 if options.stat:
5877 cmd.append('--stat')
5878 cmd.append(base)
5879 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005880
5881 return 0
5882
5883
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005884@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005885def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005886 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005887 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005888 '--ignore-current',
5889 action='store_true',
5890 help='Ignore the CL\'s current reviewers and start from scratch.')
5891 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005892 '--no-color',
5893 action='store_true',
5894 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005895 parser.add_option(
5896 '--batch',
5897 action='store_true',
5898 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005899 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005900 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005901 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005902
5903 author = RunGit(['config', 'user.email']).strip() or None
5904
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005905 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005906
5907 if args:
5908 if len(args) > 1:
5909 parser.error('Unknown args')
5910 base_branch = args[0]
5911 else:
5912 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005913 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005914
5915 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005916 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5917
5918 if options.batch:
5919 db = owners.Database(change.RepositoryRoot(), file, os.path)
5920 print('\n'.join(db.reviewers_for(affected_files, author)))
5921 return 0
5922
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005923 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005924 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005925 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005926 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005927 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005928 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005929 disable_color=options.no_color,
5930 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005931
5932
Aiden Bennerc08566e2018-10-03 17:52:42 +00005933def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005934 """Generates a diff command."""
5935 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005936 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5937
5938 if not allow_prefix:
5939 diff_cmd += ['--no-prefix']
5940
5941 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005942
5943 if args:
5944 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005945 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005946 diff_cmd.append(arg)
5947 else:
5948 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005949
5950 return diff_cmd
5951
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005952
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005953def MatchingFileType(file_name, extensions):
5954 """Returns true if the file name ends with one of the given extensions."""
5955 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005956
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005957
enne@chromium.org555cfe42014-01-29 18:21:39 +00005958@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005959@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005960def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005961 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005962 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005963 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005964 parser.add_option('--full', action='store_true',
5965 help='Reformat the full content of all touched files')
5966 parser.add_option('--dry-run', action='store_true',
5967 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005968 parser.add_option('--python', action='store_true',
5969 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005970 parser.add_option('--js', action='store_true',
5971 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005972 parser.add_option('--diff', action='store_true',
5973 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005974 parser.add_option('--presubmit', action='store_true',
5975 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005976 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005977
Daniel Chengc55eecf2016-12-30 03:11:02 -08005978 # Normalize any remaining args against the current path, so paths relative to
5979 # the current directory are still resolved as expected.
5980 args = [os.path.join(os.getcwd(), arg) for arg in args]
5981
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005982 # git diff generates paths against the root of the repository. Change
5983 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005984 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005985 if rel_base_path:
5986 os.chdir(rel_base_path)
5987
digit@chromium.org29e47272013-05-17 17:01:46 +00005988 # Grab the merge-base commit, i.e. the upstream commit of the current
5989 # branch when it was created or the last time it was rebased. This is
5990 # to cover the case where the user may have called "git fetch origin",
5991 # moving the origin branch to a newer commit, but hasn't rebased yet.
5992 upstream_commit = None
5993 cl = Changelist()
5994 upstream_branch = cl.GetUpstreamBranch()
5995 if upstream_branch:
5996 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5997 upstream_commit = upstream_commit.strip()
5998
5999 if not upstream_commit:
6000 DieWithError('Could not find base commit for this branch. '
6001 'Are you in detached state?')
6002
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006003 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
6004 diff_output = RunGit(changed_files_cmd)
6005 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00006006 # Filter out files deleted by this CL
6007 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006008
Christopher Lamc5ba6922017-01-24 11:19:14 +11006009 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00006010 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11006011
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006012 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
6013 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
6014 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006015 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00006016
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00006017 top_dir = os.path.normpath(
6018 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
6019
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006020 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
6021 # formatted. This is used to block during the presubmit.
6022 return_value = 0
6023
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006024 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00006025 # Locate the clang-format binary in the checkout
6026 try:
6027 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07006028 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00006029 DieWithError(e)
6030
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006031 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006032 cmd = [clang_format_tool]
6033 if not opts.dry_run and not opts.diff:
6034 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006035 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006036 if opts.diff:
6037 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006038 else:
6039 env = os.environ.copy()
6040 env['PATH'] = str(os.path.dirname(clang_format_tool))
6041 try:
6042 script = clang_format.FindClangFormatScriptInChromiumTree(
6043 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07006044 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006045 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00006046
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006047 cmd = [sys.executable, script, '-p0']
6048 if not opts.dry_run and not opts.diff:
6049 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00006050
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006051 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
6052 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006053
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00006054 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
6055 if opts.diff:
6056 sys.stdout.write(stdout)
6057 if opts.dry_run and len(stdout) > 0:
6058 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006059
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006060 # Similar code to above, but using yapf on .py files rather than clang-format
6061 # on C/C++ files
Aiden Bennerc08566e2018-10-03 17:52:42 +00006062 if opts.python and python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006063 yapf_tool = gclient_utils.FindExecutable('yapf')
6064 if yapf_tool is None:
6065 DieWithError('yapf not found in PATH')
6066
Aiden Bennerc08566e2018-10-03 17:52:42 +00006067 # If we couldn't find a yapf file we'll default to the chromium style
6068 # specified in depot_tools.
6069 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
6070 chromium_default_yapf_style = os.path.join(depot_tools_path,
6071 YAPF_CONFIG_FILENAME)
6072
6073 # Note: yapf still seems to fix indentation of the entire file
6074 # even if line ranges are specified.
6075 # See https://github.com/google/yapf/issues/499
6076 if not opts.full:
6077 py_line_diffs = _ComputeDiffLineRanges(python_diff_files, upstream_commit)
6078
6079 # Used for caching.
6080 yapf_configs = {}
6081 for f in python_diff_files:
6082 # Find the yapf style config for the current file, defaults to depot
6083 # tools default.
6084 yapf_config = _FindYapfConfigFile(
6085 os.path.abspath(f), yapf_configs, top_dir,
6086 chromium_default_yapf_style)
6087
6088 cmd = [yapf_tool, '--style', yapf_config, f]
6089
6090 has_formattable_lines = False
6091 if not opts.full:
6092 # Only run yapf over changed line ranges.
6093 for diff_start, diff_len in py_line_diffs[f]:
6094 diff_end = diff_start + diff_len - 1
6095 # Yapf errors out if diff_end < diff_start but this
6096 # is a valid line range diff for a removal.
6097 if diff_end >= diff_start:
6098 has_formattable_lines = True
6099 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
6100 # If all line diffs were removals we have nothing to format.
6101 if not has_formattable_lines:
6102 continue
6103
6104 if opts.diff or opts.dry_run:
6105 cmd += ['--diff']
6106 # Will return non-zero exit code if non-empty diff.
6107 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
6108 if opts.diff:
6109 sys.stdout.write(stdout)
6110 elif len(stdout) > 0:
6111 return_value = 2
6112 else:
6113 cmd += ['-i']
6114 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00006115
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006116 # Dart's formatter does not have the nice property of only operating on
6117 # modified chunks, so hard code full.
6118 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006119 try:
6120 command = [dart_format.FindDartFmtToolInChromiumTree()]
6121 if not opts.dry_run and not opts.diff:
6122 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00006123 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006124
ppi@chromium.org6593d932016-03-03 15:41:15 +00006125 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006126 if opts.dry_run and stdout:
6127 return_value = 2
6128 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07006129 print('Warning: Unable to check Dart code formatting. Dart SDK not '
6130 'found in this checkout. Files in other languages are still '
6131 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006132
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006133 # Format GN build files. Always run on full build files for canonical form.
6134 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01006135 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07006136 if opts.dry_run or opts.diff:
6137 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006138 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07006139 gn_ret = subprocess2.call(cmd + [gn_diff_file],
6140 shell=sys.platform == 'win32',
6141 cwd=top_dir)
6142 if opts.dry_run and gn_ret == 2:
6143 return_value = 2 # Not formatted.
6144 elif opts.diff and gn_ret == 2:
6145 # TODO this should compute and print the actual diff.
6146 print("This change has GN build file diff for " + gn_diff_file)
6147 elif gn_ret != 0:
6148 # For non-dry run cases (and non-2 return values for dry-run), a
6149 # nonzero error code indicates a failure, probably because the file
6150 # doesn't parse.
6151 DieWithError("gn format failed on " + gn_diff_file +
6152 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00006153
Ilya Shermane081cbe2017-08-15 17:51:04 -07006154 # Skip the metrics formatting from the global presubmit hook. These files have
6155 # a separate presubmit hook that issues an error if the files need formatting,
6156 # whereas the top-level presubmit script merely issues a warning. Formatting
6157 # these files is somewhat slow, so it's important not to duplicate the work.
6158 if not opts.presubmit:
6159 for xml_dir in GetDirtyMetricsDirs(diff_files):
6160 tool_dir = os.path.join(top_dir, xml_dir)
6161 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
6162 if opts.dry_run or opts.diff:
6163 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07006164 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07006165 if opts.diff:
6166 sys.stdout.write(stdout)
6167 if opts.dry_run and stdout:
6168 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006169
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006170 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006171
Steven Holte2e664bf2017-04-21 13:10:47 -07006172def GetDirtyMetricsDirs(diff_files):
6173 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6174 metrics_xml_dirs = [
6175 os.path.join('tools', 'metrics', 'actions'),
6176 os.path.join('tools', 'metrics', 'histograms'),
6177 os.path.join('tools', 'metrics', 'rappor'),
6178 os.path.join('tools', 'metrics', 'ukm')]
6179 for xml_dir in metrics_xml_dirs:
6180 if any(file.startswith(xml_dir) for file in xml_diff_files):
6181 yield xml_dir
6182
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006183
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006184@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006185@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006186def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006187 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006188 _, args = parser.parse_args(args)
6189
6190 if len(args) != 1:
6191 parser.print_help()
6192 return 1
6193
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006194 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006195 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006196 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006197
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006198 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006199
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006200 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006201 output = RunGit(['config', '--local', '--get-regexp',
6202 r'branch\..*\.%s' % issueprefix],
6203 error_ok=True)
6204 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006205 if issue == target_issue:
6206 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006207
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006208 branches = []
6209 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006210 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006211 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006212 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006213 return 1
6214 if len(branches) == 1:
6215 RunGit(['checkout', branches[0]])
6216 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006217 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006218 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006219 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006220 which = raw_input('Choose by index: ')
6221 try:
6222 RunGit(['checkout', branches[int(which)]])
6223 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006224 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006225 return 1
6226
6227 return 0
6228
6229
maruel@chromium.org29404b52014-09-08 22:58:00 +00006230def CMDlol(parser, args):
6231 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006232 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006233 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6234 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6235 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006236 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006237 return 0
6238
6239
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006240class OptionParser(optparse.OptionParser):
6241 """Creates the option parse and add --verbose support."""
6242 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006243 optparse.OptionParser.__init__(
6244 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006245 self.add_option(
6246 '-v', '--verbose', action='count', default=0,
6247 help='Use 2 times for more debugging info')
6248
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006249 def parse_args(self, args=None, _values=None):
6250 # Create an optparse.Values object that will store only the actual passed
6251 # options, without the defaults.
6252 actual_options = optparse.Values()
6253 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6254 # Create an optparse.Values object with the default options.
6255 options = optparse.Values(self.get_default_values().__dict__)
6256 # Update it with the options passed by the user.
6257 options._update_careful(actual_options.__dict__)
6258 # Store the options passed by the user in an _actual_options attribute.
6259 # We store only the keys, and not the values, since the values can contain
6260 # arbitrary information, which might be PII.
6261 metrics.collector.add('arguments', actual_options.__dict__.keys())
6262
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006263 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006264 logging.basicConfig(
6265 level=levels[min(options.verbose, len(levels) - 1)],
6266 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6267 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006268
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006269 return options, args
6270
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006271
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006272def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006273 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006274 print('\nYour python version %s is unsupported, please upgrade.\n' %
6275 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006276 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006277
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006278 # Reload settings.
6279 global settings
6280 settings = Settings()
6281
Edward Lemurad463c92018-07-25 21:31:23 +00006282 if not metrics.DISABLE_METRICS_COLLECTION:
6283 metrics.collector.add('project_urls', [settings.GetViewVCUrl().strip('/+')])
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006284 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006285 dispatcher = subcommand.CommandDispatcher(__name__)
6286 try:
6287 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006288 except auth.AuthenticationError as e:
6289 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006290 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006291 if e.code != 500:
6292 raise
6293 DieWithError(
6294 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6295 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006296 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006297
6298
6299if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006300 # These affect sys.stdout so do it outside of main() to simplify mocks in
6301 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006302 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006303 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006304 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006305 sys.exit(main(sys.argv[1:]))