blob: e4a99259a50c3ecc40930c8269c83691c43a116e [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00008"""A git-command for integrating reviews on Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
39try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080040 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000041except ImportError:
42 pass
43
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000044from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000045from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000046from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000047import auth
skobes6468b902016-10-24 08:45:10 -070048import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000049import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000050import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000051import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000052import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000053import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000054import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000055import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000056import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000057import git_footers
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000058import metrics
piman@chromium.org336f9122014-09-04 02:16:55 +000059import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000060import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000062import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000063import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040064import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000065import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000066import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067import watchlists
68
tandrii7400cf02016-06-21 08:48:07 -070069__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000070
tandrii9d2c7a32016-06-22 03:42:45 -070071COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070072DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080073POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000075REFS_THAT_ALIAS_TO_OTHER_REFS = {
76 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
77 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
78}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000079
thestig@chromium.org44202a22014-03-11 19:22:18 +000080# Valid extensions for files we want to lint.
81DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
82DEFAULT_LINT_IGNORE_REGEX = r"$^"
83
Aiden Bennerc08566e2018-10-03 17:52:42 +000084# File name for yapf style config files.
85YAPF_CONFIG_FILENAME = '.style.yapf'
86
borenet6c0efe62016-10-19 08:13:29 -070087# Buildbucket master name prefix.
88MASTER_PREFIX = 'master.'
89
Edward Lemur83bd7f42018-10-10 00:14:21 +000090# TODO(crbug.com/881860): Remove
91# Log gerrit failures to a gerrit_util.GERRIT_ERR_LOG_FILE.
92GERRIT_ERR_LOGGER = logging.getLogger('GerritErrorLogs')
93
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000094# Shortcut since it quickly becomes redundant.
95Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000096
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097# Initialized in main()
98settings = None
99
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100100# Used by tests/git_cl_test.py to add extra logging.
101# Inside the weirdly failing test, add this:
102# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700103# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100104_IS_BEING_TESTED = False
105
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000106
Christopher Lamf732cd52017-01-24 12:40:11 +1100107def DieWithError(message, change_desc=None):
108 if change_desc:
109 SaveDescriptionBackup(change_desc)
110
vapiera7fbd5a2016-06-16 09:17:49 -0700111 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112 sys.exit(1)
113
114
Christopher Lamf732cd52017-01-24 12:40:11 +1100115def SaveDescriptionBackup(change_desc):
116 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000117 print('\nsaving CL description to %s\n' % backup_path)
Christopher Lamf732cd52017-01-24 12:40:11 +1100118 backup_file = open(backup_path, 'w')
119 backup_file.write(change_desc.description)
120 backup_file.close()
121
122
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000123def GetNoGitPagerEnv():
124 env = os.environ.copy()
125 # 'cat' is a magical git string that disables pagers on all platforms.
126 env['GIT_PAGER'] = 'cat'
127 return env
128
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000129
bsep@chromium.org627d9002016-04-29 00:00:52 +0000130def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000132 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000133 except subprocess2.CalledProcessError as e:
134 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000135 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000137 'Command "%s" failed.\n%s' % (
138 ' '.join(args), error_message or e.stdout or ''))
139 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000140
141
142def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000143 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000144 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000145
146
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000147def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000148 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700149 if suppress_stderr:
150 stderr = subprocess2.VOID
151 else:
152 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000153 try:
tandrii5d48c322016-08-18 16:19:37 -0700154 (out, _), code = subprocess2.communicate(['git'] + args,
155 env=GetNoGitPagerEnv(),
156 stdout=subprocess2.PIPE,
157 stderr=stderr)
158 return code, out
159 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900160 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700161 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000162
163
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000164def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000165 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000166 return RunGitWithCode(args, suppress_stderr=True)[1]
167
168
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000169def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000170 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000171 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000172 return (version.startswith(prefix) and
173 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000174
175
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000176def BranchExists(branch):
177 """Return True if specified branch exists."""
178 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
179 suppress_stderr=True)
180 return not code
181
182
tandrii2a16b952016-10-19 07:09:44 -0700183def time_sleep(seconds):
184 # Use this so that it can be mocked in tests without interfering with python
185 # system machinery.
186 import time # Local import to discourage others from importing time globally.
187 return time.sleep(seconds)
188
189
maruel@chromium.org90541732011-04-01 17:54:18 +0000190def ask_for_data(prompt):
191 try:
192 return raw_input(prompt)
193 except KeyboardInterrupt:
194 # Hide the exception.
195 sys.exit(1)
196
197
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100198def confirm_or_exit(prefix='', action='confirm'):
199 """Asks user to press enter to continue or press Ctrl+C to abort."""
200 if not prefix or prefix.endswith('\n'):
201 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100202 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100203 mid = ' Press'
204 elif prefix.endswith(' '):
205 mid = 'press'
206 else:
207 mid = ' press'
208 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
209
210
211def ask_for_explicit_yes(prompt):
212 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
213 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
214 while True:
215 if 'yes'.startswith(result):
216 return True
217 if 'no'.startswith(result):
218 return False
219 result = ask_for_data('Please, type yes or no: ').lower()
220
221
tandrii5d48c322016-08-18 16:19:37 -0700222def _git_branch_config_key(branch, key):
223 """Helper method to return Git config key for a branch."""
224 assert branch, 'branch name is required to set git config for it'
225 return 'branch.%s.%s' % (branch, key)
226
227
228def _git_get_branch_config_value(key, default=None, value_type=str,
229 branch=False):
230 """Returns git config value of given or current branch if any.
231
232 Returns default in all other cases.
233 """
234 assert value_type in (int, str, bool)
235 if branch is False: # Distinguishing default arg value from None.
236 branch = GetCurrentBranch()
237
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000238 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700239 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000240
tandrii5d48c322016-08-18 16:19:37 -0700241 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700242 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700243 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700244 # git config also has --int, but apparently git config suffers from integer
245 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700246 args.append(_git_branch_config_key(branch, key))
247 code, out = RunGitWithCode(args)
248 if code == 0:
249 value = out.strip()
250 if value_type == int:
251 return int(value)
252 if value_type == bool:
253 return bool(value.lower() == 'true')
254 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000255 return default
256
257
tandrii5d48c322016-08-18 16:19:37 -0700258def _git_set_branch_config_value(key, value, branch=None, **kwargs):
259 """Sets the value or unsets if it's None of a git branch config.
260
261 Valid, though not necessarily existing, branch must be provided,
262 otherwise currently checked out branch is used.
263 """
264 if not branch:
265 branch = GetCurrentBranch()
266 assert branch, 'a branch name OR currently checked out branch is required'
267 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700268 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700269 if value is None:
270 args.append('--unset')
271 elif isinstance(value, bool):
272 args.append('--bool')
273 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700274 else:
tandrii33a46ff2016-08-23 05:53:40 -0700275 # git config also has --int, but apparently git config suffers from integer
276 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700277 value = str(value)
278 args.append(_git_branch_config_key(branch, key))
279 if value is not None:
280 args.append(value)
281 RunGit(args, **kwargs)
282
283
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100284def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700285 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100286
287 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
288 """
289 # Git also stores timezone offset, but it only affects visual display,
290 # actual point in time is defined by this timestamp only.
291 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
292
293
294def _git_amend_head(message, committer_timestamp):
295 """Amends commit with new message and desired committer_timestamp.
296
297 Sets committer timezone to UTC.
298 """
299 env = os.environ.copy()
300 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
301 return RunGit(['commit', '--amend', '-m', message], env=env)
302
303
machenbach@chromium.org45453142015-09-15 08:45:22 +0000304def _get_properties_from_options(options):
305 properties = dict(x.split('=', 1) for x in options.properties)
306 for key, val in properties.iteritems():
307 try:
308 properties[key] = json.loads(val)
309 except ValueError:
310 pass # If a value couldn't be evaluated, treat it as a string.
311 return properties
312
313
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000314def _prefix_master(master):
315 """Convert user-specified master name to full master name.
316
317 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
318 name, while the developers always use shortened master name
319 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
320 function does the conversion for buildbucket migration.
321 """
borenet6c0efe62016-10-19 08:13:29 -0700322 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000323 return master
borenet6c0efe62016-10-19 08:13:29 -0700324 return '%s%s' % (MASTER_PREFIX, master)
325
326
327def _unprefix_master(bucket):
328 """Convert bucket name to shortened master name.
329
330 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
331 name, while the developers always use shortened master name
332 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
333 function does the conversion for buildbucket migration.
334 """
335 if bucket.startswith(MASTER_PREFIX):
336 return bucket[len(MASTER_PREFIX):]
337 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000338
339
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000340def _buildbucket_retry(operation_name, http, *args, **kwargs):
341 """Retries requests to buildbucket service and returns parsed json content."""
342 try_count = 0
343 while True:
344 response, content = http.request(*args, **kwargs)
345 try:
346 content_json = json.loads(content)
347 except ValueError:
348 content_json = None
349
350 # Buildbucket could return an error even if status==200.
351 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000352 error = content_json.get('error')
353 if error.get('code') == 403:
354 raise BuildbucketResponseException(
355 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000356 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000357 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000358 raise BuildbucketResponseException(msg)
359
360 if response.status == 200:
Nodir Turakulov23d75d22018-06-04 12:37:32 -0700361 if content_json is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000362 raise BuildbucketResponseException(
363 'Buildbucket returns invalid json content: %s.\n'
Nodir Turakulov9ac59792018-06-04 12:34:14 -0700364 'Please file bugs at http://crbug.com, '
365 'component "Infra>Platform>BuildBucket".' %
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000366 content)
367 return content_json
368 if response.status < 500 or try_count >= 2:
369 raise httplib2.HttpLib2Error(content)
370
371 # status >= 500 means transient failures.
372 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700373 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000374 try_count += 1
375 assert False, 'unreachable'
376
377
qyearsley1fdfcb62016-10-24 13:22:03 -0700378def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700379 """Returns a dict mapping bucket names to builders and tests,
380 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700381 """
qyearsleydd49f942016-10-28 11:57:22 -0700382 # If no bots are listed, we try to get a set of builders and tests based
383 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700384 if not options.bot:
385 change = changelist.GetChange(
386 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700387 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700388 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700389 change=change,
390 changed_files=change.LocalPaths(),
391 repository_root=settings.GetRoot(),
392 default_presubmit=None,
393 project=None,
394 verbose=options.verbose,
395 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700396 if masters is None:
397 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100398 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700399
qyearsley1fdfcb62016-10-24 13:22:03 -0700400 if options.bucket:
401 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700402 if options.master:
403 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700404
qyearsleydd49f942016-10-28 11:57:22 -0700405 # If bots are listed but no master or bucket, then we need to find out
406 # the corresponding master for each bot.
407 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
408 if error_message:
409 option_parser.error(
410 'Tryserver master cannot be found because: %s\n'
411 'Please manually specify the tryserver master, e.g. '
412 '"-m tryserver.chromium.linux".' % error_message)
413 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700414
415
qyearsley123a4682016-10-26 09:12:17 -0700416def _get_bucket_map_for_builders(builders):
417 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 map_url = 'https://builders-map.appspot.com/'
419 try:
qyearsley123a4682016-10-26 09:12:17 -0700420 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700421 except urllib2.URLError as e:
422 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
423 (map_url, e))
424 except ValueError as e:
425 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700426 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700427 return None, 'Failed to build master map.'
428
qyearsley123a4682016-10-26 09:12:17 -0700429 bucket_map = {}
430 for builder in builders:
Nodir Turakulovb422e682018-02-20 22:51:30 -0800431 bucket = builders_map.get(builder, {}).get('bucket')
432 if bucket:
433 bucket_map.setdefault(bucket, {})[builder] = []
qyearsley123a4682016-10-26 09:12:17 -0700434 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700435
436
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800437def _trigger_try_jobs(auth_config, changelist, buckets, options, patchset):
qyearsley1fdfcb62016-10-24 13:22:03 -0700438 """Sends a request to Buildbucket to trigger try jobs for a changelist.
439
440 Args:
Aaron Gablefb28d482018-04-02 13:08:06 -0700441 auth_config: AuthConfig for Buildbucket.
qyearsley1fdfcb62016-10-24 13:22:03 -0700442 changelist: Changelist that the try jobs are associated with.
443 buckets: A nested dict mapping bucket names to builders to tests.
444 options: Command-line options.
445 """
tandriide281ae2016-10-12 06:02:30 -0700446 assert changelist.GetIssue(), 'CL must be uploaded first'
447 codereview_url = changelist.GetCodereviewServer()
448 assert codereview_url, 'CL must be uploaded first'
449 patchset = patchset or changelist.GetMostRecentPatchset()
450 assert patchset, 'CL must be uploaded first'
451
452 codereview_host = urlparse.urlparse(codereview_url).hostname
Aaron Gablefb28d482018-04-02 13:08:06 -0700453 # Cache the buildbucket credentials under the codereview host key, so that
454 # users can use different credentials for different buckets.
tandriide281ae2016-10-12 06:02:30 -0700455 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000456 http = authenticator.authorize(httplib2.Http())
457 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700458
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000459 buildbucket_put_url = (
460 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000461 hostname=options.buildbucket_host))
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000462 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandriide281ae2016-10-12 06:02:30 -0700463 hostname=codereview_host,
464 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000465 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700466
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700467 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -0800468 shared_parameters_properties['category'] = options.category
tandrii8c5a3532016-11-04 07:52:02 -0700469 if options.clobber:
470 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700471 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700472 if extra_properties:
473 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000474
475 batch_req_body = {'builds': []}
476 print_text = []
477 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700478 for bucket, builders_and_tests in sorted(buckets.iteritems()):
479 print_text.append('Bucket: %s' % bucket)
480 master = None
481 if bucket.startswith(MASTER_PREFIX):
482 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000483 for builder, tests in sorted(builders_and_tests.iteritems()):
484 print_text.append(' %s: %s' % (builder, tests))
485 parameters = {
486 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000487 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100488 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000489 'revision': options.revision,
490 }],
tandrii8c5a3532016-11-04 07:52:02 -0700491 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000492 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000493 if 'presubmit' in builder.lower():
494 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000495 if tests:
496 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700497
498 tags = [
499 'builder:%s' % builder,
500 'buildset:%s' % buildset,
501 'user_agent:git_cl_try',
502 ]
503 if master:
504 parameters['properties']['master'] = master
505 tags.append('master:%s' % master)
506
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000507 batch_req_body['builds'].append(
508 {
509 'bucket': bucket,
510 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000511 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700512 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000513 }
514 )
515
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000516 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700517 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000518 http,
519 buildbucket_put_url,
520 'PUT',
521 body=json.dumps(batch_req_body),
522 headers={'Content-Type': 'application/json'}
523 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000524 print_text.append('To see results here, run: git cl try-results')
525 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700526 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000527
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528
tandrii221ab252016-10-06 08:12:04 -0700529def fetch_try_jobs(auth_config, changelist, buildbucket_host,
530 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700531 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000532
qyearsley53f48a12016-09-01 10:45:13 -0700533 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534 """
tandrii221ab252016-10-06 08:12:04 -0700535 assert buildbucket_host
536 assert changelist.GetIssue(), 'CL must be uploaded first'
537 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
538 patchset = patchset or changelist.GetMostRecentPatchset()
539 assert patchset, 'CL must be uploaded first'
540
541 codereview_url = changelist.GetCodereviewServer()
542 codereview_host = urlparse.urlparse(codereview_url).hostname
543 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 if authenticator.has_cached_credentials():
545 http = authenticator.authorize(httplib2.Http())
546 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700547 print('Warning: Some results might be missing because %s' %
548 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700549 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000550 http = httplib2.Http()
551
552 http.force_exception_to_status_code = True
553
Andrii Shyshkalov03da1502018-10-15 03:42:34 +0000554 buildset = 'patch/gerrit/{hostname}/{issue}/{patch}'.format(
tandrii221ab252016-10-06 08:12:04 -0700555 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700557 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000558 params = {'tag': 'buildset:%s' % buildset}
559
560 builds = {}
561 while True:
562 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700563 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000564 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700565 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000566 for build in content.get('builds', []):
567 builds[build['id']] = build
568 if 'next_cursor' in content:
569 params['start_cursor'] = content['next_cursor']
570 else:
571 break
572 return builds
573
574
qyearsleyeab3c042016-08-24 09:18:28 -0700575def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000576 """Prints nicely result of fetch_try_jobs."""
577 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700578 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 return
580
581 # Make a copy, because we'll be modifying builds dictionary.
582 builds = builds.copy()
583 builder_names_cache = {}
584
585 def get_builder(b):
586 try:
587 return builder_names_cache[b['id']]
588 except KeyError:
589 try:
590 parameters = json.loads(b['parameters_json'])
591 name = parameters['builder_name']
592 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700593 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700594 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595 name = None
596 builder_names_cache[b['id']] = name
597 return name
598
599 def get_bucket(b):
600 bucket = b['bucket']
601 if bucket.startswith('master.'):
602 return bucket[len('master.'):]
603 return bucket
604
605 if options.print_master:
606 name_fmt = '%%-%ds %%-%ds' % (
607 max(len(str(get_bucket(b))) for b in builds.itervalues()),
608 max(len(str(get_builder(b))) for b in builds.itervalues()))
609 def get_name(b):
610 return name_fmt % (get_bucket(b), get_builder(b))
611 else:
612 name_fmt = '%%-%ds' % (
613 max(len(str(get_builder(b))) for b in builds.itervalues()))
614 def get_name(b):
615 return name_fmt % get_builder(b)
616
617 def sort_key(b):
618 return b['status'], b.get('result'), get_name(b), b.get('url')
619
620 def pop(title, f, color=None, **kwargs):
621 """Pop matching builds from `builds` dict and print them."""
622
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000623 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000624 colorize = str
625 else:
626 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
627
628 result = []
629 for b in builds.values():
630 if all(b.get(k) == v for k, v in kwargs.iteritems()):
631 builds.pop(b['id'])
632 result.append(b)
633 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700634 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000635 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700636 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000637
638 total = len(builds)
639 pop(status='COMPLETED', result='SUCCESS',
640 title='Successes:', color=Fore.GREEN,
641 f=lambda b: (get_name(b), b.get('url')))
642 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
643 title='Infra Failures:', color=Fore.MAGENTA,
644 f=lambda b: (get_name(b), b.get('url')))
645 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
646 title='Failures:', color=Fore.RED,
647 f=lambda b: (get_name(b), b.get('url')))
648 pop(status='COMPLETED', result='CANCELED',
649 title='Canceled:', color=Fore.MAGENTA,
650 f=lambda b: (get_name(b),))
651 pop(status='COMPLETED', result='FAILURE',
652 failure_reason='INVALID_BUILD_DEFINITION',
653 title='Wrong master/builder name:', color=Fore.MAGENTA,
654 f=lambda b: (get_name(b),))
655 pop(status='COMPLETED', result='FAILURE',
656 title='Other failures:',
657 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
658 pop(status='COMPLETED',
659 title='Other finished:',
660 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
661 pop(status='STARTED',
662 title='Started:', color=Fore.YELLOW,
663 f=lambda b: (get_name(b), b.get('url')))
664 pop(status='SCHEDULED',
665 title='Scheduled:',
666 f=lambda b: (get_name(b), 'id=%s' % b['id']))
667 # The last section is just in case buildbucket API changes OR there is a bug.
668 pop(title='Other:',
669 f=lambda b: (get_name(b), 'id=%s' % b['id']))
670 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700671 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000672
673
Aiden Bennerc08566e2018-10-03 17:52:42 +0000674def _ComputeDiffLineRanges(files, upstream_commit):
675 """Gets the changed line ranges for each file since upstream_commit.
676
677 Parses a git diff on provided files and returns a dict that maps a file name
678 to an ordered list of range tuples in the form (start_line, count).
679 Ranges are in the same format as a git diff.
680 """
681 # If files is empty then diff_output will be a full diff.
682 if len(files) == 0:
683 return {}
684
685 # Take diff and find the line ranges where there are changes.
686 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, files, allow_prefix=True)
687 diff_output = RunGit(diff_cmd)
688
689 pattern = r'(?:^diff --git a/(?:.*) b/(.*))|(?:^@@.*\+(.*) @@)'
690 # 2 capture groups
691 # 0 == fname of diff file
692 # 1 == 'diff_start,diff_count' or 'diff_start'
693 # will match each of
694 # diff --git a/foo.foo b/foo.py
695 # @@ -12,2 +14,3 @@
696 # @@ -12,2 +17 @@
697 # running re.findall on the above string with pattern will give
698 # [('foo.py', ''), ('', '14,3'), ('', '17')]
699
700 curr_file = None
701 line_diffs = {}
702 for match in re.findall(pattern, diff_output, flags=re.MULTILINE):
703 if match[0] != '':
704 # Will match the second filename in diff --git a/a.py b/b.py.
705 curr_file = match[0]
706 line_diffs[curr_file] = []
707 else:
708 # Matches +14,3
709 if ',' in match[1]:
710 diff_start, diff_count = match[1].split(',')
711 else:
712 # Single line changes are of the form +12 instead of +12,1.
713 diff_start = match[1]
714 diff_count = 1
715
716 diff_start = int(diff_start)
717 diff_count = int(diff_count)
718
719 # If diff_count == 0 this is a removal we can ignore.
720 line_diffs[curr_file].append((diff_start, diff_count))
721
722 return line_diffs
723
724
725def _FindYapfConfigFile(fpath,
726 yapf_config_cache,
727 top_dir=None,
728 default_style=None):
729 """Checks if a yapf file is in any parent directory of fpath until top_dir.
730
731 Recursively checks parent directories to find yapf file
732 and if no yapf file is found returns default_style.
733 Uses yapf_config_cache as a cache for previously found files.
734 """
735 # Return result if we've already computed it.
736 if fpath in yapf_config_cache:
737 return yapf_config_cache[fpath]
738
739 # Check if there is a style file in the current directory.
740 yapf_file = os.path.join(fpath, YAPF_CONFIG_FILENAME)
741 dirname = os.path.dirname(fpath)
742 if os.path.isfile(yapf_file):
743 ret = yapf_file
744 elif fpath == top_dir or dirname == fpath:
745 # If we're at the top level directory, or if we're at root
746 # use the chromium default yapf style.
747 ret = default_style
748 else:
749 # Otherwise recurse on the current directory.
750 ret = _FindYapfConfigFile(dirname, yapf_config_cache, top_dir,
751 default_style)
752 yapf_config_cache[fpath] = ret
753 return ret
754
755
qyearsley53f48a12016-09-01 10:45:13 -0700756def write_try_results_json(output_file, builds):
757 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
758
759 The input |builds| dict is assumed to be generated by Buildbucket.
760 Buildbucket documentation: http://goo.gl/G0s101
761 """
762
763 def convert_build_dict(build):
Quinten Yearsleya563d722017-12-11 16:36:54 -0800764 """Extracts some of the information from one build dict."""
765 parameters = json.loads(build.get('parameters_json', '{}')) or {}
qyearsley53f48a12016-09-01 10:45:13 -0700766 return {
767 'buildbucket_id': build.get('id'),
qyearsley53f48a12016-09-01 10:45:13 -0700768 'bucket': build.get('bucket'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800769 'builder_name': parameters.get('builder_name'),
770 'created_ts': build.get('created_ts'),
771 'experimental': build.get('experimental'),
qyearsley53f48a12016-09-01 10:45:13 -0700772 'failure_reason': build.get('failure_reason'),
Quinten Yearsleya563d722017-12-11 16:36:54 -0800773 'result': build.get('result'),
774 'status': build.get('status'),
775 'tags': build.get('tags'),
qyearsley53f48a12016-09-01 10:45:13 -0700776 'url': build.get('url'),
777 }
778
779 converted = []
780 for _, build in sorted(builds.items()):
Aiden Bennerc08566e2018-10-03 17:52:42 +0000781 converted.append(convert_build_dict(build))
qyearsley53f48a12016-09-01 10:45:13 -0700782 write_json(output_file, converted)
783
784
Aaron Gable13101a62018-02-09 13:20:41 -0800785def print_stats(args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000786 """Prints statistics about the change to the user."""
787 # --no-ext-diff is broken in some versions of Git, so try to work around
788 # this by overriding the environment (but there is still a problem if the
789 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000790 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000791 if 'GIT_EXTERNAL_DIFF' in env:
792 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000793
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000794 try:
795 stdout = sys.stdout.fileno()
796 except AttributeError:
797 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000798 return subprocess2.call(
Aaron Gable13101a62018-02-09 13:20:41 -0800799 ['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000800 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000801
802
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000803class BuildbucketResponseException(Exception):
804 pass
805
806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000807class Settings(object):
808 def __init__(self):
809 self.default_server = None
810 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812 self.tree_status_url = None
813 self.viewvc_url = None
814 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000815 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000816 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000817 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000818 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000819 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000820 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000821
822 def LazyUpdateIfNeeded(self):
823 """Updates the settings from a codereview.settings file, if available."""
824 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000825 # The only value that actually changes the behavior is
826 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000827 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000828 error_ok=True
829 ).strip().lower()
830
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000831 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000832 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000833 LoadCodereviewSettingsFromFile(cr_settings_file)
834 self.updated = True
835
836 def GetDefaultServerUrl(self, error_ok=False):
837 if not self.default_server:
838 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000839 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000840 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000841 if error_ok:
842 return self.default_server
843 if not self.default_server:
844 error_message = ('Could not find settings file. You must configure '
845 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000846 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000847 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000848 return self.default_server
849
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000850 @staticmethod
851 def GetRelativeRoot():
852 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000853
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000855 if self.root is None:
856 self.root = os.path.abspath(self.GetRelativeRoot())
857 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000858
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000859 def GetGitMirror(self, remote='origin'):
860 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000861 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000862 if not os.path.isdir(local_url):
863 return None
864 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
865 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100866 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100867 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000868 if mirror.exists():
869 return mirror
870 return None
871
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000872 def GetTreeStatusUrl(self, error_ok=False):
873 if not self.tree_status_url:
874 error_message = ('You must configure your tree status URL by running '
875 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000876 self.tree_status_url = self._GetRietveldConfig(
877 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000878 return self.tree_status_url
879
880 def GetViewVCUrl(self):
881 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000882 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000883 return self.viewvc_url
884
rmistry@google.com90752582014-01-14 21:04:50 +0000885 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000886 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000887
rmistry@google.com78948ed2015-07-08 23:09:57 +0000888 def GetIsSkipDependencyUpload(self, branch_name):
889 """Returns true if specified branch should skip dep uploads."""
890 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
891 error_ok=True)
892
rmistry@google.com5626a922015-02-26 14:03:30 +0000893 def GetRunPostUploadHook(self):
894 run_post_upload_hook = self._GetRietveldConfig(
895 'run-post-upload-hook', error_ok=True)
896 return run_post_upload_hook == "True"
897
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000898 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000899 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000900
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000901 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000902 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000903
ukai@chromium.orge8077812012-02-03 03:41:46 +0000904 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700905 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000906 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700907 self.is_gerrit = (
908 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000909 return self.is_gerrit
910
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000911 def GetSquashGerritUploads(self):
912 """Return true if uploads to Gerrit should be squashed by default."""
913 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700914 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
915 if self.squash_gerrit_uploads is None:
916 # Default is squash now (http://crbug.com/611892#c23).
917 self.squash_gerrit_uploads = not (
918 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
919 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000920 return self.squash_gerrit_uploads
921
tandriia60502f2016-06-20 02:01:53 -0700922 def GetSquashGerritUploadsOverride(self):
923 """Return True or False if codereview.settings should be overridden.
924
925 Returns None if no override has been defined.
926 """
927 # See also http://crbug.com/611892#c23
928 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
929 error_ok=True).strip()
930 if result == 'true':
931 return True
932 if result == 'false':
933 return False
934 return None
935
tandrii@chromium.org28253532016-04-14 13:46:56 +0000936 def GetGerritSkipEnsureAuthenticated(self):
937 """Return True if EnsureAuthenticated should not be done for Gerrit
938 uploads."""
939 if self.gerrit_skip_ensure_authenticated is None:
940 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000941 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000942 error_ok=True).strip() == 'true')
943 return self.gerrit_skip_ensure_authenticated
944
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000945 def GetGitEditor(self):
946 """Return the editor specified in the git config, or None if none is."""
947 if self.git_editor is None:
948 self.git_editor = self._GetConfig('core.editor', error_ok=True)
949 return self.git_editor or None
950
thestig@chromium.org44202a22014-03-11 19:22:18 +0000951 def GetLintRegex(self):
952 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
953 DEFAULT_LINT_REGEX)
954
955 def GetLintIgnoreRegex(self):
956 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
957 DEFAULT_LINT_IGNORE_REGEX)
958
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000959 def GetProject(self):
960 if not self.project:
961 self.project = self._GetRietveldConfig('project', error_ok=True)
962 return self.project
963
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000964 def _GetRietveldConfig(self, param, **kwargs):
965 return self._GetConfig('rietveld.' + param, **kwargs)
966
rmistry@google.com78948ed2015-07-08 23:09:57 +0000967 def _GetBranchConfig(self, branch_name, param, **kwargs):
968 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
969
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000970 def _GetConfig(self, param, **kwargs):
971 self.LazyUpdateIfNeeded()
972 return RunGit(['config', param], **kwargs).strip()
973
974
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100975@contextlib.contextmanager
976def _get_gerrit_project_config_file(remote_url):
977 """Context manager to fetch and store Gerrit's project.config from
978 refs/meta/config branch and store it in temp file.
979
980 Provides a temporary filename or None if there was error.
981 """
982 error, _ = RunGitWithCode([
983 'fetch', remote_url,
984 '+refs/meta/config:refs/git_cl/meta/config'])
985 if error:
986 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700987 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100988 (remote_url, error))
989 yield None
990 return
991
992 error, project_config_data = RunGitWithCode(
993 ['show', 'refs/git_cl/meta/config:project.config'])
994 if error:
995 print('WARNING: project.config file not found')
996 yield None
997 return
998
999 with gclient_utils.temporary_directory() as tempdir:
1000 project_config_file = os.path.join(tempdir, 'project.config')
1001 gclient_utils.FileWrite(project_config_file, project_config_data)
1002 yield project_config_file
1003
1004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005def ShortBranchName(branch):
1006 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007 return branch.replace('refs/heads/', '', 1)
1008
1009
1010def GetCurrentBranchRef():
1011 """Returns branch ref (e.g., refs/heads/master) or None."""
1012 return RunGit(['symbolic-ref', 'HEAD'],
1013 stderr=subprocess2.VOID, error_ok=True).strip() or None
1014
1015
1016def GetCurrentBranch():
1017 """Returns current branch or None.
1018
1019 For refs/heads/* branches, returns just last part. For others, full ref.
1020 """
1021 branchref = GetCurrentBranchRef()
1022 if branchref:
1023 return ShortBranchName(branchref)
1024 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001025
1026
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001027class _CQState(object):
1028 """Enum for states of CL with respect to Commit Queue."""
1029 NONE = 'none'
1030 DRY_RUN = 'dry_run'
1031 COMMIT = 'commit'
1032
1033 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1034
1035
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001036class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001037 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001038 self.issue = issue
1039 self.patchset = patchset
1040 self.hostname = hostname
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001041 assert codereview in (None, 'gerrit', 'rietveld')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001042 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001043
1044 @property
1045 def valid(self):
1046 return self.issue is not None
1047
1048
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001049def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001050 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1051 fail_result = _ParsedIssueNumberArgument()
1052
1053 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001054 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055 if not arg.startswith('http'):
1056 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001057
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001058 url = gclient_utils.UpgradeToHttps(arg)
1059 try:
1060 parsed_url = urlparse.urlparse(url)
1061 except ValueError:
1062 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001063
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001064 if codereview is not None:
1065 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1066 return parsed or fail_result
1067
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001068 results = {}
1069 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1070 parsed = cls.ParseIssueURL(parsed_url)
1071 if parsed is not None:
1072 results[name] = parsed
1073
1074 if not results:
1075 return fail_result
1076 if len(results) == 1:
1077 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001078
Andrii Shyshkalovf5569d22018-10-15 03:35:23 +00001079 return results['gerrit']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001080
1081
Aaron Gablea45ee112016-11-22 15:14:38 -08001082class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001083 def __init__(self, issue, url):
1084 self.issue = issue
1085 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001086 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001087
1088 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001089 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001090 self.issue, self.url)
1091
1092
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001093_CommentSummary = collections.namedtuple(
1094 '_CommentSummary', ['date', 'message', 'sender',
1095 # TODO(tandrii): these two aren't known in Gerrit.
1096 'approval', 'disapproval'])
1097
1098
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001099class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001100 """Changelist works with one changelist in local branch.
1101
1102 Supports two codereview backends: Rietveld or Gerrit, selected at object
1103 creation.
1104
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001105 Notes:
1106 * Not safe for concurrent multi-{thread,process} use.
1107 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001108 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001109 """
1110
1111 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1112 """Create a new ChangeList instance.
1113
1114 If issue is given, the codereview must be given too.
1115
1116 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1117 Otherwise, it's decided based on current configuration of the local branch,
1118 with default being 'rietveld' for backwards compatibility.
1119 See _load_codereview_impl for more details.
1120
1121 **kwargs will be passed directly to codereview implementation.
1122 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001123 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001124 global settings
1125 if not settings:
1126 # Happens when git_cl.py is used as a utility library.
1127 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001128
1129 if issue:
1130 assert codereview, 'codereview must be known, if issue is known'
1131
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 self.branchref = branchref
1133 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001134 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 self.branch = ShortBranchName(self.branchref)
1136 else:
1137 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001139 self.lookedup_issue = False
1140 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.has_description = False
1142 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001143 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001145 self.cc = None
Daniel Cheng7227d212017-11-17 08:12:37 -08001146 self.more_cc = []
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001147 self._remote = None
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001148 self._cached_remote_url = (False, None) # (is_cached, value)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001149
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001150 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001151 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001152 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001153 assert self._codereview_impl
1154 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001155
1156 def _load_codereview_impl(self, codereview=None, **kwargs):
1157 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001158 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1159 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1160 self._codereview = codereview
1161 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162 return
1163
1164 # Automatic selection based on issue number set for a current branch.
1165 # Rietveld takes precedence over Gerrit.
1166 assert not self.issue
1167 # Whether we find issue or not, we are doing the lookup.
1168 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001169 if self.GetBranch():
1170 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1171 issue = _git_get_branch_config_value(
1172 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1173 if issue:
1174 self._codereview = codereview
1175 self._codereview_impl = cls(self, **kwargs)
1176 self.issue = int(issue)
1177 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001178
1179 # No issue is set for this branch, so decide based on repo-wide settings.
1180 return self._load_codereview_impl(
1181 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1182 **kwargs)
1183
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001184 def IsGerrit(self):
1185 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001186
1187 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001188 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001189
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001190 The return value is a string suitable for passing to git cl with the --cc
1191 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001192 """
1193 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001194 base_cc = settings.GetDefaultCCList()
Daniel Cheng7227d212017-11-17 08:12:37 -08001195 more_cc = ','.join(self.more_cc)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001196 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1197 return self.cc
1198
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001199 def GetCCListWithoutDefault(self):
1200 """Return the users cc'd on this CL excluding default ones."""
1201 if self.cc is None:
Daniel Cheng7227d212017-11-17 08:12:37 -08001202 self.cc = ','.join(self.more_cc)
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001203 return self.cc
1204
Daniel Cheng7227d212017-11-17 08:12:37 -08001205 def ExtendCC(self, more_cc):
1206 """Extends the list of users to cc on this CL based on the changed files."""
1207 self.more_cc.extend(more_cc)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001208
1209 def GetBranch(self):
1210 """Returns the short branch name, e.g. 'master'."""
1211 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001212 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001213 if not branchref:
1214 return None
1215 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001216 self.branch = ShortBranchName(self.branchref)
1217 return self.branch
1218
1219 def GetBranchRef(self):
1220 """Returns the full branch name, e.g. 'refs/heads/master'."""
1221 self.GetBranch() # Poke the lazy loader.
1222 return self.branchref
1223
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001224 def ClearBranch(self):
1225 """Clears cached branch data of this object."""
1226 self.branch = self.branchref = None
1227
tandrii5d48c322016-08-18 16:19:37 -07001228 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1229 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1230 kwargs['branch'] = self.GetBranch()
1231 return _git_get_branch_config_value(key, default, **kwargs)
1232
1233 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1234 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1235 assert self.GetBranch(), (
1236 'this CL must have an associated branch to %sset %s%s' %
1237 ('un' if value is None else '',
1238 key,
1239 '' if value is None else ' to %r' % value))
1240 kwargs['branch'] = self.GetBranch()
1241 return _git_set_branch_config_value(key, value, **kwargs)
1242
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001243 @staticmethod
1244 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001245 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 e.g. 'origin', 'refs/heads/master'
1247 """
1248 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001249 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1250
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001251 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001252 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001254 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1255 error_ok=True).strip()
1256 if upstream_branch:
1257 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001259 # Else, try to guess the origin remote.
1260 remote_branches = RunGit(['branch', '-r']).split()
1261 if 'origin/master' in remote_branches:
1262 # Fall back on origin/master if it exits.
1263 remote = 'origin'
1264 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001266 DieWithError(
1267 'Unable to determine default branch to diff against.\n'
1268 'Either pass complete "git diff"-style arguments, like\n'
1269 ' git cl upload origin/master\n'
1270 'or verify this branch is set up to track another \n'
1271 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001272
1273 return remote, upstream_branch
1274
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001275 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001276 upstream_branch = self.GetUpstreamBranch()
1277 if not BranchExists(upstream_branch):
1278 DieWithError('The upstream for the current branch (%s) does not exist '
1279 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001280 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001281 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001282
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283 def GetUpstreamBranch(self):
1284 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001286 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001287 upstream_branch = upstream_branch.replace('refs/heads/',
1288 'refs/remotes/%s/' % remote)
1289 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1290 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001291 self.upstream_branch = upstream_branch
1292 return self.upstream_branch
1293
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001294 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001295 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 remote, branch = None, self.GetBranch()
1297 seen_branches = set()
1298 while branch not in seen_branches:
1299 seen_branches.add(branch)
1300 remote, branch = self.FetchUpstreamTuple(branch)
1301 branch = ShortBranchName(branch)
1302 if remote != '.' or branch.startswith('refs/remotes'):
1303 break
1304 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001305 remotes = RunGit(['remote'], error_ok=True).split()
1306 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001307 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001308 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001310 logging.warn('Could not determine which remote this change is '
1311 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001312 else:
1313 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001314 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001315 branch = 'HEAD'
1316 if branch.startswith('refs/remotes'):
1317 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001318 elif branch.startswith('refs/branch-heads/'):
1319 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001320 else:
1321 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322 return self._remote
1323
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001324 def GitSanityChecks(self, upstream_git_obj):
1325 """Checks git repo status and ensures diff is from local commits."""
1326
sbc@chromium.org79706062015-01-14 21:18:12 +00001327 if upstream_git_obj is None:
1328 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001329 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001330 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001331 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001332 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001333 return False
1334
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001335 # Verify the commit we're diffing against is in our current branch.
1336 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1337 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1338 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001339 print('ERROR: %s is not in the current branch. You may need to rebase '
1340 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001341 return False
1342
1343 # List the commits inside the diff, and verify they are all local.
1344 commits_in_diff = RunGit(
1345 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1346 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1347 remote_branch = remote_branch.strip()
1348 if code != 0:
1349 _, remote_branch = self.GetRemoteBranch()
1350
1351 commits_in_remote = RunGit(
1352 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1353
1354 common_commits = set(commits_in_diff) & set(commits_in_remote)
1355 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001356 print('ERROR: Your diff contains %d commits already in %s.\n'
1357 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1358 'the diff. If you are using a custom git flow, you can override'
1359 ' the reference used for this check with "git config '
1360 'gitcl.remotebranch <git-ref>".' % (
1361 len(common_commits), remote_branch, upstream_git_obj),
1362 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001363 return False
1364 return True
1365
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001366 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001367 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001368
1369 Returns None if it is not set.
1370 """
tandrii5d48c322016-08-18 16:19:37 -07001371 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001372
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001373 def GetRemoteUrl(self):
1374 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1375
1376 Returns None if there is no remote.
1377 """
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001378 is_cached, value = self._cached_remote_url
1379 if is_cached:
1380 return value
1381
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001382 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001383 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1384
1385 # If URL is pointing to a local directory, it is probably a git cache.
1386 if os.path.isdir(url):
1387 url = RunGit(['config', 'remote.%s.url' % remote],
1388 error_ok=True,
1389 cwd=url).strip()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001390 self._cached_remote_url = (True, url)
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001391 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001392
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001393 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001394 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001395 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001396 self.issue = self._GitGetBranchConfigValue(
1397 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001398 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399 return self.issue
1400
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001401 def GetIssueURL(self):
1402 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001403 issue = self.GetIssue()
1404 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001405 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001406 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001408 def GetDescription(self, pretty=False, force=False):
1409 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001410 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001411 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412 self.has_description = True
1413 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001414 # Set width to 72 columns + 2 space indent.
1415 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001417 lines = self.description.splitlines()
1418 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001419 return self.description
1420
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001421 def GetDescriptionFooters(self):
1422 """Returns (non_footer_lines, footers) for the commit message.
1423
1424 Returns:
1425 non_footer_lines (list(str)) - Simple list of description lines without
1426 any footer. The lines do not contain newlines, nor does the list contain
1427 the empty line between the message and the footers.
1428 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1429 [("Change-Id", "Ideadbeef...."), ...]
1430 """
1431 raw_description = self.GetDescription()
1432 msg_lines, _, footers = git_footers.split_footers(raw_description)
1433 if footers:
1434 msg_lines = msg_lines[:len(msg_lines)-1]
1435 return msg_lines, footers
1436
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001438 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001439 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001440 self.patchset = self._GitGetBranchConfigValue(
1441 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001442 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001443 return self.patchset
1444
1445 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001446 """Set this branch's patchset. If patchset=0, clears the patchset."""
1447 assert self.GetBranch()
1448 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001449 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001450 else:
1451 self.patchset = int(patchset)
1452 self._GitSetBranchConfigValue(
1453 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001454
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001455 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001456 """Set this branch's issue. If issue isn't given, clears the issue."""
1457 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001458 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001459 issue = int(issue)
1460 self._GitSetBranchConfigValue(
1461 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001462 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001463 codereview_server = self._codereview_impl.GetCodereviewServer()
1464 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001465 self._GitSetBranchConfigValue(
1466 self._codereview_impl.CodereviewServerConfigKey(),
1467 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001468 else:
tandrii5d48c322016-08-18 16:19:37 -07001469 # Reset all of these just to be clean.
1470 reset_suffixes = [
1471 'last-upload-hash',
1472 self._codereview_impl.IssueConfigKey(),
1473 self._codereview_impl.PatchsetConfigKey(),
1474 self._codereview_impl.CodereviewServerConfigKey(),
1475 ] + self._PostUnsetIssueProperties()
1476 for prop in reset_suffixes:
1477 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001478 msg = RunGit(['log', '-1', '--format=%B']).strip()
1479 if msg and git_footers.get_footer_change_id(msg):
1480 print('WARNING: The change patched into this branch has a Change-Id. '
1481 'Removing it.')
1482 RunGit(['commit', '--amend', '-m',
1483 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001484 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001485 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001486
dnjba1b0f32016-09-02 12:37:42 -07001487 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001488 if not self.GitSanityChecks(upstream_branch):
1489 DieWithError('\nGit sanity check failure')
1490
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001491 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001492 if not root:
1493 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001494 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001495
1496 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001497 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001498 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001499 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001500 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001501 except subprocess2.CalledProcessError:
1502 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001503 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001504 'This branch probably doesn\'t exist anymore. To reset the\n'
1505 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001506 ' git branch --set-upstream-to origin/master %s\n'
1507 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001508 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001509
maruel@chromium.org52424302012-08-29 15:14:30 +00001510 issue = self.GetIssue()
1511 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001512 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001513 description = self.GetDescription()
1514 else:
1515 # If the change was never uploaded, use the log messages of all commits
1516 # up to the branch point, as git cl upload will prefill the description
1517 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001518 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1519 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001520
1521 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001522 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001523 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001524 name,
1525 description,
1526 absroot,
1527 files,
1528 issue,
1529 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001530 author,
1531 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001532
dsansomee2d6fd92016-09-08 00:10:47 -07001533 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001534 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001535 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001536 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001537
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001538 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1539 """Sets the description for this CL remotely.
1540
1541 You can get description_lines and footers with GetDescriptionFooters.
1542
1543 Args:
1544 description_lines (list(str)) - List of CL description lines without
1545 newline characters.
1546 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1547 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1548 `List-Of-Tokens`). It will be case-normalized so that each token is
1549 title-cased.
1550 """
1551 new_description = '\n'.join(description_lines)
1552 if footers:
1553 new_description += '\n'
1554 for k, v in footers:
1555 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1556 if not git_footers.FOOTER_PATTERN.match(foot):
1557 raise ValueError('Invalid footer %r' % foot)
1558 new_description += foot + '\n'
1559 self.UpdateDescription(new_description, force)
1560
Edward Lesmes8e282792018-04-03 18:50:29 -04001561 def RunHook(self, committing, may_prompt, verbose, change, parallel):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001562 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1563 try:
1564 return presubmit_support.DoPresubmitChecks(change, committing,
1565 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1566 default_presubmit=None, may_prompt=may_prompt,
Edward Lesmes8e282792018-04-03 18:50:29 -04001567 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit(),
1568 parallel=parallel)
vapierfd77ac72016-06-16 08:33:57 -07001569 except presubmit_support.PresubmitFailure as e:
Aaron Gable5d5f22c2018-02-02 09:12:41 -08001570 DieWithError('%s\nMaybe your depot_tools is out of date?' % e)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001571
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001572 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1573 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001574 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1575 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001576 else:
1577 # Assume url.
1578 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1579 urlparse.urlparse(issue_arg))
1580 if not parsed_issue_arg or not parsed_issue_arg.valid:
1581 DieWithError('Failed to parse issue argument "%s". '
1582 'Must be an issue number or a valid URL.' % issue_arg)
1583 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001584 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001585
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 def CMDUpload(self, options, git_diff_args, orig_args):
1587 """Uploads a change to codereview."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001588 assert self.IsGerrit()
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001589 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001591 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001592 else:
1593 if self.GetBranch() is None:
1594 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1595
1596 # Default to diffing against common ancestor of upstream branch
1597 base_branch = self.GetCommonAncestorWithUpstream()
1598 git_diff_args = [base_branch, 'HEAD']
1599
Aaron Gablec4c40d12017-05-22 11:49:53 -07001600
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001601 # Fast best-effort checks to abort before running potentially
1602 # expensive hooks if uploading is likely to fail anyway. Passing these
1603 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001604 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001605 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001606
1607 # Apply watchlists on upload.
1608 change = self.GetChange(base_branch, None)
1609 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1610 files = [f.LocalPath() for f in change.AffectedFiles()]
1611 if not options.bypass_watchlists:
Daniel Cheng7227d212017-11-17 08:12:37 -08001612 self.ExtendCC(watchlist.GetWatchersForPaths(files))
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001613
1614 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001615 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001616 # Set the reviewer list now so that presubmit checks can access it.
1617 change_description = ChangeDescription(change.FullDescriptionText())
1618 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001619 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001620 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001621 change)
1622 change.SetDescriptionText(change_description.description)
1623 hook_results = self.RunHook(committing=False,
Edward Lesmes8e282792018-04-03 18:50:29 -04001624 may_prompt=not options.force,
1625 verbose=options.verbose,
1626 change=change, parallel=options.parallel)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001627 if not hook_results.should_continue():
1628 return 1
1629 if not options.reviewers and hook_results.reviewers:
1630 options.reviewers = hook_results.reviewers.split(',')
Daniel Cheng7227d212017-11-17 08:12:37 -08001631 self.ExtendCC(hook_results.more_cc)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001632
Aaron Gable13101a62018-02-09 13:20:41 -08001633 print_stats(git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001634 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001635 if not ret:
tandrii5d48c322016-08-18 16:19:37 -07001636 _git_set_branch_config_value('last-upload-hash',
1637 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001638 # Run post upload hooks, if specified.
1639 if settings.GetRunPostUploadHook():
1640 presubmit_support.DoPostUploadExecuter(
1641 change,
1642 self,
1643 settings.GetRoot(),
1644 options.verbose,
1645 sys.stdout)
1646
1647 # Upload all dependencies if specified.
1648 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001649 print()
1650 print('--dependencies has been specified.')
1651 print('All dependent local branches will be re-uploaded.')
1652 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001653 # Remove the dependencies flag from args so that we do not end up in a
1654 # loop.
1655 orig_args.remove('--dependencies')
1656 ret = upload_branch_deps(self, orig_args)
1657 return ret
1658
Ravi Mistry31e7d562018-04-02 12:53:57 -04001659 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1660 """Sets labels on the change based on the provided flags.
1661
1662 Sets labels if issue is already uploaded and known, else returns without
1663 doing anything.
1664
1665 Args:
1666 enable_auto_submit: Sets Auto-Submit+1 on the change.
1667 use_commit_queue: Sets Commit-Queue+2 on the change.
1668 cq_dry_run: Sets Commit-Queue+1 on the change. Overrides Commit-Queue+2 if
1669 both use_commit_queue and cq_dry_run are true.
1670 """
1671 if not self.GetIssue():
1672 return
1673 try:
1674 self._codereview_impl.SetLabels(enable_auto_submit, use_commit_queue,
1675 cq_dry_run)
1676 return 0
1677 except KeyboardInterrupt:
1678 raise
1679 except:
1680 labels = []
1681 if enable_auto_submit:
1682 labels.append('Auto-Submit')
1683 if use_commit_queue or cq_dry_run:
1684 labels.append('Commit-Queue')
1685 print('WARNING: Failed to set label(s) on your change: %s\n'
1686 'Either:\n'
1687 ' * Your project does not have the above label(s),\n'
1688 ' * You don\'t have permission to set the above label(s),\n'
1689 ' * There\'s a bug in this code (see stack trace below).\n' %
1690 (', '.join(labels)))
1691 # Still raise exception so that stack trace is printed.
1692 raise
1693
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001694 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001695 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001696
1697 Issue must have been already uploaded and known.
1698 """
1699 assert new_state in _CQState.ALL_STATES
1700 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001701 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001702 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001703 return 0
1704 except KeyboardInterrupt:
1705 raise
1706 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001707 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001708 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001709 ' * Your project has no CQ,\n'
1710 ' * You don\'t have permission to change the CQ state,\n'
1711 ' * There\'s a bug in this code (see stack trace below).\n'
1712 'Consider specifying which bots to trigger manually or asking your '
1713 'project owners for permissions or contacting Chrome Infra at:\n'
1714 'https://www.chromium.org/infra\n\n' %
1715 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001716 # Still raise exception so that stack trace is printed.
1717 raise
1718
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001719 # Forward methods to codereview specific implementation.
1720
Aaron Gable636b13f2017-07-14 10:42:48 -07001721 def AddComment(self, message, publish=None):
1722 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001723
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001724 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001725 """Returns list of _CommentSummary for each comment.
1726
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001727 args:
1728 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001729 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001730 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001731
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001732 def CloseIssue(self):
1733 return self._codereview_impl.CloseIssue()
1734
1735 def GetStatus(self):
1736 return self._codereview_impl.GetStatus()
1737
1738 def GetCodereviewServer(self):
1739 return self._codereview_impl.GetCodereviewServer()
1740
tandriide281ae2016-10-12 06:02:30 -07001741 def GetIssueOwner(self):
1742 """Get owner from codereview, which may differ from this checkout."""
1743 return self._codereview_impl.GetIssueOwner()
1744
Edward Lemur707d70b2018-02-07 00:50:14 +01001745 def GetReviewers(self):
1746 return self._codereview_impl.GetReviewers()
1747
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001748 def GetMostRecentPatchset(self):
1749 return self._codereview_impl.GetMostRecentPatchset()
1750
tandriide281ae2016-10-12 06:02:30 -07001751 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001752 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001753 return self._codereview_impl.CannotTriggerTryJobReason()
1754
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001755 def GetTryJobProperties(self, patchset=None):
1756 """Returns dictionary of properties to launch try job."""
1757 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001758
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001759 def __getattr__(self, attr):
1760 # This is because lots of untested code accesses Rietveld-specific stuff
1761 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001762 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001763 # Note that child method defines __getattr__ as well, and forwards it here,
1764 # because _RietveldChangelistImpl is not cleaned up yet, and given
1765 # deprecation of Rietveld, it should probably be just removed.
1766 # Until that time, avoid infinite recursion by bypassing __getattr__
1767 # of implementation class.
1768 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001769
1770
1771class _ChangelistCodereviewBase(object):
1772 """Abstract base class encapsulating codereview specifics of a changelist."""
1773 def __init__(self, changelist):
1774 self._changelist = changelist # instance of Changelist
1775
1776 def __getattr__(self, attr):
1777 # Forward methods to changelist.
1778 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1779 # _RietveldChangelistImpl to avoid this hack?
1780 return getattr(self._changelist, attr)
1781
1782 def GetStatus(self):
1783 """Apply a rough heuristic to give a simple summary of an issue's review
1784 or CQ status, assuming adherence to a common workflow.
1785
1786 Returns None if no issue for this branch, or specific string keywords.
1787 """
1788 raise NotImplementedError()
1789
1790 def GetCodereviewServer(self):
1791 """Returns server URL without end slash, like "https://codereview.com"."""
1792 raise NotImplementedError()
1793
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001794 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001795 """Fetches and returns description from the codereview server."""
1796 raise NotImplementedError()
1797
tandrii5d48c322016-08-18 16:19:37 -07001798 @classmethod
1799 def IssueConfigKey(cls):
1800 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 raise NotImplementedError()
1802
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001803 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001804 def PatchsetConfigKey(cls):
1805 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001806 raise NotImplementedError()
1807
tandrii5d48c322016-08-18 16:19:37 -07001808 @classmethod
1809 def CodereviewServerConfigKey(cls):
1810 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001811 raise NotImplementedError()
1812
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001813 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001814 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001815 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001816
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001817 def GetGerritObjForPresubmit(self):
1818 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1819 return None
1820
dsansomee2d6fd92016-09-08 00:10:47 -07001821 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001822 """Update the description on codereview site."""
1823 raise NotImplementedError()
1824
Aaron Gable636b13f2017-07-14 10:42:48 -07001825 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001826 """Posts a comment to the codereview site."""
1827 raise NotImplementedError()
1828
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001829 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001830 raise NotImplementedError()
1831
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001832 def CloseIssue(self):
1833 """Closes the issue."""
1834 raise NotImplementedError()
1835
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 def GetMostRecentPatchset(self):
1837 """Returns the most recent patchset number from the codereview site."""
1838 raise NotImplementedError()
1839
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001840 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001841 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001842 """Fetches and applies the issue.
1843
1844 Arguments:
1845 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1846 reject: if True, reject the failed patch instead of switching to 3-way
1847 merge. Rietveld only.
1848 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1849 only.
1850 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001851 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001852 """
1853 raise NotImplementedError()
1854
1855 @staticmethod
1856 def ParseIssueURL(parsed_url):
1857 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1858 failed."""
1859 raise NotImplementedError()
1860
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001861 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001862 """Best effort check that user is authenticated with codereview server.
1863
1864 Arguments:
1865 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001866 refresh: whether to attempt to refresh credentials. Ignored if not
1867 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001868 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001869 raise NotImplementedError()
1870
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001871 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001872 """Best effort check that uploading isn't supposed to fail for predictable
1873 reasons.
1874
1875 This method should raise informative exception if uploading shouldn't
1876 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001877
1878 Arguments:
1879 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001880 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001881 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001882
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001883 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001884 """Uploads a change to codereview."""
1885 raise NotImplementedError()
1886
Ravi Mistry31e7d562018-04-02 12:53:57 -04001887 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
1888 """Sets labels on the change based on the provided flags.
1889
1890 Issue must have been already uploaded and known.
1891 """
1892 raise NotImplementedError()
1893
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001894 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001895 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001896
1897 Issue must have been already uploaded and known.
1898 """
1899 raise NotImplementedError()
1900
tandriie113dfd2016-10-11 10:20:12 -07001901 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001902 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001903 raise NotImplementedError()
1904
tandriide281ae2016-10-12 06:02:30 -07001905 def GetIssueOwner(self):
1906 raise NotImplementedError()
1907
Edward Lemur707d70b2018-02-07 00:50:14 +01001908 def GetReviewers(self):
1909 raise NotImplementedError()
1910
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001911 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001912 raise NotImplementedError()
1913
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001914
1915class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001916
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001917 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001918 super(_RietveldChangelistImpl, self).__init__(changelist)
1919 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001920 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001921 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001922
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001923 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001924 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001925 self._props = None
1926 self._rpc_server = None
1927
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001928 def GetCodereviewServer(self):
1929 if not self._rietveld_server:
1930 # If we're on a branch then get the server potentially associated
1931 # with that branch.
1932 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001933 self._rietveld_server = gclient_utils.UpgradeToHttps(
1934 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001935 if not self._rietveld_server:
1936 self._rietveld_server = settings.GetDefaultServerUrl()
1937 return self._rietveld_server
1938
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001939 def EnsureAuthenticated(self, force, refresh=False):
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00001940 raise NotImplementedError
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001941
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001942 def EnsureCanUploadPatchset(self, force):
1943 # No checks for Rietveld because we are deprecating Rietveld.
1944 pass
1945
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001946 def FetchDescription(self, force=False):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001947 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001948
1949 def GetMostRecentPatchset(self):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001950 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001951
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001952 def GetIssueProperties(self):
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00001953 raise NotImplementedError()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001954
tandriie113dfd2016-10-11 10:20:12 -07001955 def CannotTriggerTryJobReason(self):
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00001956 raise NotImplementedError()
tandriie113dfd2016-10-11 10:20:12 -07001957
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001958 def GetTryJobProperties(self, patchset=None):
Andrii Shyshkalov03da1502018-10-15 03:42:34 +00001959 raise NotImplementedError()
tandrii8c5a3532016-11-04 07:52:02 -07001960
tandriide281ae2016-10-12 06:02:30 -07001961 def GetIssueOwner(self):
1962 return (self.GetIssueProperties() or {}).get('owner_email')
1963
Edward Lemur707d70b2018-02-07 00:50:14 +01001964 def GetReviewers(self):
1965 return (self.GetIssueProperties() or {}).get('reviewers')
1966
Aaron Gable636b13f2017-07-14 10:42:48 -07001967 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 return self.RpcServer().add_comment(self.GetIssue(), message)
1969
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001970 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001971 summary = []
1972 for message in self.GetIssueProperties().get('messages', []):
1973 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
1974 summary.append(_CommentSummary(
1975 date=date,
1976 disapproval=bool(message['disapproval']),
1977 approval=bool(message['approval']),
1978 sender=message['sender'],
1979 message=message['text'],
1980 ))
1981 return summary
1982
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001983 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001984 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001985 or CQ status, assuming adherence to a common workflow.
1986
1987 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07001988 * 'error' - error from review tool (including deleted issues)
1989 * 'unsent' - not sent for review
1990 * 'waiting' - waiting for review
1991 * 'reply' - waiting for owner to reply to review
1992 * 'not lgtm' - Code-Review label has been set negatively
1993 * 'lgtm' - LGTM from at least one approved reviewer
1994 * 'commit' - in the commit queue
1995 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001996 """
1997 if not self.GetIssue():
1998 return None
1999
2000 try:
2001 props = self.GetIssueProperties()
2002 except urllib2.HTTPError:
2003 return 'error'
2004
2005 if props.get('closed'):
2006 # Issue is closed.
2007 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002008 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002009 # Issue is in the commit queue.
2010 return 'commit'
2011
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002012 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002013 if not messages:
2014 # No message was sent.
2015 return 'unsent'
2016
2017 if get_approving_reviewers(props):
2018 return 'lgtm'
2019 elif get_approving_reviewers(props, disapproval=True):
2020 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002021
tandrii9d2c7a32016-06-22 03:42:45 -07002022 # Skip CQ messages that don't require owner's action.
2023 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2024 if 'Dry run:' in messages[-1]['text']:
2025 messages.pop()
2026 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2027 # This message always follows prior messages from CQ,
2028 # so skip this too.
2029 messages.pop()
2030 else:
2031 # This is probably a CQ messages warranting user attention.
2032 break
2033
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002034 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002035 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002036 return 'reply'
2037 return 'waiting'
2038
dsansomee2d6fd92016-09-08 00:10:47 -07002039 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002040 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002041
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002042 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002043 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002044
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002045 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002046 return self.SetFlags({flag: value})
2047
2048 def SetFlags(self, flags):
2049 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002050 """
phajdan.jr68598232016-08-10 03:28:28 -07002051 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002052 try:
tandrii4b233bd2016-07-06 03:50:29 -07002053 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002054 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002055 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002056 if e.code == 404:
2057 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2058 if e.code == 403:
2059 DieWithError(
2060 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002061 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002062 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002063
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002064 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002065 """Returns an upload.RpcServer() to access this review's rietveld instance.
2066 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002067 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002068 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002069 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002070 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002071 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002072
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002073 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002074 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002075 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002076
tandrii5d48c322016-08-18 16:19:37 -07002077 @classmethod
2078 def PatchsetConfigKey(cls):
2079 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002080
tandrii5d48c322016-08-18 16:19:37 -07002081 @classmethod
2082 def CodereviewServerConfigKey(cls):
2083 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002084
Ravi Mistry31e7d562018-04-02 12:53:57 -04002085 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
2086 raise NotImplementedError()
2087
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002088 def SetCQState(self, new_state):
2089 props = self.GetIssueProperties()
2090 if props.get('private'):
2091 DieWithError('Cannot set-commit on private issue')
2092
2093 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002094 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002095 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002096 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002097 else:
tandrii4b233bd2016-07-06 03:50:29 -07002098 assert new_state == _CQState.DRY_RUN
2099 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002100
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002101 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002102 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 # PatchIssue should never be called with a dirty tree. It is up to the
2104 # caller to check this, but just in case we assert here since the
2105 # consequences of the caller not checking this could be dire.
2106 assert(not git_common.is_dirty_git_tree('apply'))
2107 assert(parsed_issue_arg.valid)
2108 self._changelist.issue = parsed_issue_arg.issue
2109 if parsed_issue_arg.hostname:
2110 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2111
skobes6468b902016-10-24 08:45:10 -07002112 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2113 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2114 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115 try:
skobes6468b902016-10-24 08:45:10 -07002116 scm_obj.apply_patch(patchset_object)
2117 except Exception as e:
2118 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002119 return 1
2120
2121 # If we had an issue, commit the current state and register the issue.
2122 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002123 self.SetIssue(self.GetIssue())
2124 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002125 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2126 'patch from issue %(i)s at patchset '
2127 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2128 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002129 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002131 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002132 return 0
2133
2134 @staticmethod
2135 def ParseIssueURL(parsed_url):
2136 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2137 return None
wychen3c1c1722016-08-04 11:46:36 -07002138 # Rietveld patch: https://domain/<number>/#ps<patchset>
2139 match = re.match(r'/(\d+)/$', parsed_url.path)
2140 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2141 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002142 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002143 issue=int(match.group(1)),
2144 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002145 hostname=parsed_url.netloc,
2146 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147 # Typical url: https://domain/<issue_number>[/[other]]
2148 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2149 if match:
skobes6468b902016-10-24 08:45:10 -07002150 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002152 hostname=parsed_url.netloc,
2153 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2155 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2156 if match:
skobes6468b902016-10-24 08:45:10 -07002157 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 issue=int(match.group(1)),
2159 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002160 hostname=parsed_url.netloc,
2161 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 return None
2163
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002164 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002165 """Upload the patch to Rietveld."""
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00002166 raise NotImplementedError
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002167
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002168
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002169class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002170 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002171 # auth_config is Rietveld thing, kept here to preserve interface only.
2172 super(_GerritChangelistImpl, self).__init__(changelist)
2173 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002174 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002175 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002176 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002177 # Map from change number (issue) to its detail cache.
2178 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002179
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002180 if codereview_host is not None:
2181 assert not codereview_host.startswith('https://'), codereview_host
2182 self._gerrit_host = codereview_host
2183 self._gerrit_server = 'https://%s' % codereview_host
2184
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002185 def _GetGerritHost(self):
2186 # Lazy load of configs.
2187 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002188 if self._gerrit_host and '.' not in self._gerrit_host:
2189 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2190 # This happens for internal stuff http://crbug.com/614312.
2191 parsed = urlparse.urlparse(self.GetRemoteUrl())
2192 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002193 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002194 ' Your current remote is: %s' % self.GetRemoteUrl())
2195 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2196 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002197 return self._gerrit_host
2198
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002199 def _GetGitHost(self):
2200 """Returns git host to be used when uploading change to Gerrit."""
2201 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2202
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002203 def GetCodereviewServer(self):
2204 if not self._gerrit_server:
2205 # If we're on a branch then get the server potentially associated
2206 # with that branch.
2207 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002208 self._gerrit_server = self._GitGetBranchConfigValue(
2209 self.CodereviewServerConfigKey())
2210 if self._gerrit_server:
2211 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002212 if not self._gerrit_server:
2213 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2214 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002215 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002216 parts[0] = parts[0] + '-review'
2217 self._gerrit_host = '.'.join(parts)
2218 self._gerrit_server = 'https://%s' % self._gerrit_host
2219 return self._gerrit_server
2220
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002221 def _GetGerritProject(self):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002222 """Returns Gerrit project name based on remote git URL."""
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002223 remote_url = self.GetRemoteUrl()
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002224 if remote_url is None:
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002225 logging.warn('can\'t detect Gerrit project.')
2226 return None
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002227 project = urlparse.urlparse(remote_url).path.strip('/')
2228 if project.endswith('.git'):
2229 project = project[:-len('.git')]
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002230 # *.googlesource.com hosts ensure that Git/Gerrit projects don't start with
2231 # 'a/' prefix, because 'a/' prefix is used to force authentication in
2232 # gitiles/git-over-https protocol. E.g.,
2233 # https://chromium.googlesource.com/a/v8/v8 refers to the same repo/project
2234 # as
2235 # https://chromium.googlesource.com/v8/v8
2236 if project.startswith('a/'):
2237 project = project[len('a/'):]
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00002238 return project
2239
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002240 def _GerritChangeIdentifier(self):
2241 """Handy method for gerrit_util.ChangeIdentifier for a given CL.
2242
2243 Not to be confused by value of "Change-Id:" footer.
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002244 If Gerrit project can be determined, this will speed up Gerrit HTTP API RPC.
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002245 """
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002246 project = self._GetGerritProject()
2247 if project:
2248 return gerrit_util.ChangeIdentifier(project, self.GetIssue())
2249 # Fall back on still unique, but less efficient change number.
2250 return str(self.GetIssue())
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00002251
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002252 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002253 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002254 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002255
tandrii5d48c322016-08-18 16:19:37 -07002256 @classmethod
2257 def PatchsetConfigKey(cls):
2258 return 'gerritpatchset'
2259
2260 @classmethod
2261 def CodereviewServerConfigKey(cls):
2262 return 'gerritserver'
2263
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002264 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002265 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002266 if settings.GetGerritSkipEnsureAuthenticated():
2267 # For projects with unusual authentication schemes.
2268 # See http://crbug.com/603378.
2269 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002270
2271 # Check presence of cookies only if using cookies-based auth method.
2272 cookie_auth = gerrit_util.Authenticator.get()
2273 if not isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002274 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002275
2276 # Lazy-loader to identify Gerrit and Git hosts.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002277 self.GetCodereviewServer()
2278 git_host = self._GetGitHost()
2279 assert self._gerrit_server and self._gerrit_host
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002280
2281 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2282 git_auth = cookie_auth.get_auth_header(git_host)
2283 if gerrit_auth and git_auth:
2284 if gerrit_auth == git_auth:
2285 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002286 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002287 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002288 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002289 ' %s\n'
2290 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002291 ' Consider running the following command:\n'
2292 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002293 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002294 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002295 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002296 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002297 cookie_auth.get_new_password_message(git_host)))
2298 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002299 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002300 return
2301 else:
2302 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002303 ([] if gerrit_auth else [self._gerrit_host]) +
2304 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002305 DieWithError('Credentials for the following hosts are required:\n'
2306 ' %s\n'
2307 'These are read from %s (or legacy %s)\n'
2308 '%s' % (
2309 '\n '.join(missing),
2310 cookie_auth.get_gitcookies_path(),
2311 cookie_auth.get_netrc_path(),
2312 cookie_auth.get_new_password_message(git_host)))
2313
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002314 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002315 if not self.GetIssue():
2316 return
2317
2318 # Warm change details cache now to avoid RPCs later, reducing latency for
2319 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002320 self._GetChangeDetail(
Andrii Shyshkalovc4a73562018-09-25 18:40:17 +00002321 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT', 'LABELS'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002322
2323 status = self._GetChangeDetail()['status']
2324 if status in ('MERGED', 'ABANDONED'):
2325 DieWithError('Change %s has been %s, new uploads are not allowed' %
2326 (self.GetIssueURL(),
2327 'submitted' if status == 'MERGED' else 'abandoned'))
2328
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002329 # TODO(vadimsh): For some reason the chunk of code below was skipped if
2330 # 'is_gce' is True. I'm just refactoring it to be 'skip if not cookies'.
2331 # Apparently this check is not very important? Otherwise get_auth_email
2332 # could have been added to other implementations of Authenticator.
2333 cookies_auth = gerrit_util.Authenticator.get()
2334 if not isinstance(cookies_auth, gerrit_util.CookiesAuthenticator):
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002335 return
Vadim Shtayurab250ec12018-10-04 00:21:08 +00002336
2337 cookies_user = cookies_auth.get_auth_email(self._GetGerritHost())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002338 if self.GetIssueOwner() == cookies_user:
2339 return
2340 logging.debug('change %s owner is %s, cookies user is %s',
2341 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002342 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002343 # so ask what Gerrit thinks of this user.
2344 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2345 if details['email'] == self.GetIssueOwner():
2346 return
2347 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002348 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002349 'as %s.\n'
2350 'Uploading may fail due to lack of permissions.' %
2351 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2352 confirm_or_exit(action='upload')
2353
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002354 def _PostUnsetIssueProperties(self):
2355 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002356 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002357
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002358 def GetGerritObjForPresubmit(self):
2359 return presubmit_support.GerritAccessor(self._GetGerritHost())
2360
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002361 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002362 """Apply a rough heuristic to give a simple summary of an issue's review
2363 or CQ status, assuming adherence to a common workflow.
2364
2365 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002366 * 'error' - error from review tool (including deleted issues)
2367 * 'unsent' - no reviewers added
2368 * 'waiting' - waiting for review
2369 * 'reply' - waiting for uploader to reply to review
2370 * 'lgtm' - Code-Review label has been set
2371 * 'commit' - in the commit queue
2372 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002373 """
2374 if not self.GetIssue():
2375 return None
2376
2377 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002378 data = self._GetChangeDetail([
2379 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002380 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002381 return 'error'
2382
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002383 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002384 return 'closed'
2385
Aaron Gable9ab38c62017-04-06 14:36:33 -07002386 if data['labels'].get('Commit-Queue', {}).get('approved'):
2387 # The section will have an "approved" subsection if anyone has voted
2388 # the maximum value on the label.
2389 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002390
Aaron Gable9ab38c62017-04-06 14:36:33 -07002391 if data['labels'].get('Code-Review', {}).get('approved'):
2392 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002393
2394 if not data.get('reviewers', {}).get('REVIEWER', []):
2395 return 'unsent'
2396
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002397 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002398 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2399 last_message_author = messages.pop().get('author', {})
2400 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002401 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2402 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002403 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002404 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002405 if last_message_author.get('_account_id') == owner:
2406 # Most recent message was by owner.
2407 return 'waiting'
2408 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002409 # Some reply from non-owner.
2410 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002411
2412 # Somehow there are no messages even though there are reviewers.
2413 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002414
2415 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002416 data = self._GetChangeDetail(['CURRENT_REVISION'])
Aaron Gablee8856ee2017-12-07 12:41:46 -08002417 patchset = data['revisions'][data['current_revision']]['_number']
2418 self.SetPatchset(patchset)
2419 return patchset
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002420
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002421 def FetchDescription(self, force=False):
2422 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2423 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002424 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002425 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002426
dsansomee2d6fd92016-09-08 00:10:47 -07002427 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002428 if gerrit_util.HasPendingChangeEdit(
2429 self._GetGerritHost(), self._GerritChangeIdentifier()):
dsansomee2d6fd92016-09-08 00:10:47 -07002430 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002431 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002432 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002433 'unpublished edit. Either publish the edit in the Gerrit web UI '
2434 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002435
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002436 gerrit_util.DeletePendingChangeEdit(
2437 self._GetGerritHost(), self._GerritChangeIdentifier())
2438 gerrit_util.SetCommitMessage(
2439 self._GetGerritHost(), self._GerritChangeIdentifier(),
2440 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002441
Aaron Gable636b13f2017-07-14 10:42:48 -07002442 def AddComment(self, message, publish=None):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002443 gerrit_util.SetReview(
2444 self._GetGerritHost(), self._GerritChangeIdentifier(),
2445 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002446
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002447 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002448 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002449 messages = self._GetChangeDetail(
2450 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2451 file_comments = gerrit_util.GetChangeComments(
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002452 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002453
2454 # Build dictionary of file comments for easy access and sorting later.
2455 # {author+date: {path: {patchset: {line: url+message}}}}
2456 comments = collections.defaultdict(
2457 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2458 for path, line_comments in file_comments.iteritems():
2459 for comment in line_comments:
2460 if comment.get('tag', '').startswith('autogenerated'):
2461 continue
2462 key = (comment['author']['email'], comment['updated'])
2463 if comment.get('side', 'REVISION') == 'PARENT':
2464 patchset = 'Base'
2465 else:
2466 patchset = 'PS%d' % comment['patch_set']
2467 line = comment.get('line', 0)
2468 url = ('https://%s/c/%s/%s/%s#%s%s' %
2469 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2470 'b' if comment.get('side') == 'PARENT' else '',
2471 str(line) if line else ''))
2472 comments[key][path][patchset][line] = (url, comment['message'])
2473
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002474 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002475 for msg in messages:
2476 # Don't bother showing autogenerated messages.
2477 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2478 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002479 # Gerrit spits out nanoseconds.
2480 assert len(msg['date'].split('.')[-1]) == 9
2481 date = datetime.datetime.strptime(msg['date'][:-3],
2482 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002483 message = msg['message']
2484 key = (msg['author']['email'], msg['date'])
2485 if key in comments:
2486 message += '\n'
2487 for path, patchsets in sorted(comments.get(key, {}).items()):
2488 if readable:
2489 message += '\n%s' % path
2490 for patchset, lines in sorted(patchsets.items()):
2491 for line, (url, content) in sorted(lines.items()):
2492 if line:
2493 line_str = 'Line %d' % line
2494 path_str = '%s:%d:' % (path, line)
2495 else:
2496 line_str = 'File comment'
2497 path_str = '%s:0:' % path
2498 if readable:
2499 message += '\n %s, %s: %s' % (patchset, line_str, url)
2500 message += '\n %s\n' % content
2501 else:
2502 message += '\n%s ' % path_str
2503 message += '\n%s\n' % content
2504
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002505 summary.append(_CommentSummary(
2506 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002507 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002508 sender=msg['author']['email'],
2509 # These could be inferred from the text messages and correlated with
2510 # Code-Review label maximum, however this is not reliable.
2511 # Leaving as is until the need arises.
2512 approval=False,
2513 disapproval=False,
2514 ))
2515 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002516
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002517 def CloseIssue(self):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002518 gerrit_util.AbandonChange(
2519 self._GetGerritHost(), self._GerritChangeIdentifier(), msg='')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002520
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002521 def SubmitIssue(self, wait_for_merge=True):
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002522 gerrit_util.SubmitChange(
2523 self._GetGerritHost(), self._GerritChangeIdentifier(),
2524 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002525
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002526 def _GetChangeDetail(self, options=None, no_cache=False):
2527 """Returns details of associated Gerrit change and caching results.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002528
2529 If fresh data is needed, set no_cache=True which will clear cache and
2530 thus new data will be fetched from Gerrit.
2531 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002532 options = options or []
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002533 assert self.GetIssue(), 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002534
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002535 # Optimization to avoid multiple RPCs:
2536 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2537 'CURRENT_COMMIT' not in options):
2538 options.append('CURRENT_COMMIT')
2539
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002540 # Normalize issue and options for consistent keys in cache.
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002541 cache_key = str(self.GetIssue())
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002542 options = [o.upper() for o in options]
2543
2544 # Check in cache first unless no_cache is True.
2545 if no_cache:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002546 self._detail_cache.pop(cache_key, None)
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002547 else:
2548 options_set = frozenset(options)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002549 for cached_options_set, data in self._detail_cache.get(cache_key, []):
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002550 # Assumption: data fetched before with extra options is suitable
2551 # for return for a smaller set of options.
2552 # For example, if we cached data for
2553 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2554 # and request is for options=[CURRENT_REVISION],
2555 # THEN we can return prior cached data.
2556 if options_set.issubset(cached_options_set):
2557 return data
2558
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002559 try:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002560 data = gerrit_util.GetChangeDetail(
2561 self._GetGerritHost(), self._GerritChangeIdentifier(), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002562 except gerrit_util.GerritError as e:
2563 if e.http_status == 404:
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002564 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002565 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002566
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002567 self._detail_cache.setdefault(cache_key, []).append(
2568 (frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002569 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002570
Andrii Shyshkalovcc5f17e2018-08-22 23:35:59 +00002571 def _GetChangeCommit(self):
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002572 assert self.GetIssue(), 'issue must be set to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002573 try:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002574 data = gerrit_util.GetChangeCommit(
2575 self._GetGerritHost(), self._GerritChangeIdentifier())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002576 except gerrit_util.GerritError as e:
2577 if e.http_status == 404:
Andrii Shyshkalove2633162018-08-27 23:50:31 +00002578 raise GerritChangeNotExists(self.GetIssue(), self.GetCodereviewServer())
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002579 raise
agable32978d92016-11-01 12:55:02 -07002580 return data
2581
Olivier Robin75ee7252018-04-13 10:02:56 +02002582 def CMDLand(self, force, bypass_hooks, verbose, parallel):
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002583 if git_common.is_dirty_git_tree('land'):
2584 return 1
tandriid60367b2016-06-22 05:25:12 -07002585 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2586 if u'Commit-Queue' in detail.get('labels', {}):
2587 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002588 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2589 'which can test and land changes for you. '
2590 'Are you sure you wish to bypass it?\n',
2591 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002592
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002593 differs = True
tandriic4344b52016-08-29 06:04:54 -07002594 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002595 # Note: git diff outputs nothing if there is no diff.
2596 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002597 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002598 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002599 if detail['current_revision'] == last_upload:
2600 differs = False
2601 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002602 print('WARNING: Local branch contents differ from latest uploaded '
2603 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002604 if differs:
2605 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002606 confirm_or_exit(
2607 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2608 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002609 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002610 elif not bypass_hooks:
2611 hook_results = self.RunHook(
2612 committing=True,
2613 may_prompt=not force,
2614 verbose=verbose,
Olivier Robin75ee7252018-04-13 10:02:56 +02002615 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None),
2616 parallel=parallel)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002617 if not hook_results.should_continue():
2618 return 1
2619
2620 self.SubmitIssue(wait_for_merge=True)
2621 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002622 links = self._GetChangeCommit().get('web_links', [])
2623 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002624 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002625 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002626 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002627 return 0
2628
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002629 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002630 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002631 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002632 assert not directory
2633 assert parsed_issue_arg.valid
2634
2635 self._changelist.issue = parsed_issue_arg.issue
2636
2637 if parsed_issue_arg.hostname:
2638 self._gerrit_host = parsed_issue_arg.hostname
2639 self._gerrit_server = 'https://%s' % self._gerrit_host
2640
tandriic2405f52016-10-10 08:13:15 -07002641 try:
2642 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002643 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002644 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002645
2646 if not parsed_issue_arg.patchset:
2647 # Use current revision by default.
2648 revision_info = detail['revisions'][detail['current_revision']]
2649 patchset = int(revision_info['_number'])
2650 else:
2651 patchset = parsed_issue_arg.patchset
2652 for revision_info in detail['revisions'].itervalues():
2653 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2654 break
2655 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002656 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002657 (parsed_issue_arg.patchset, self.GetIssue()))
2658
Aaron Gable697a91b2018-01-19 15:20:15 -08002659 remote_url = self._changelist.GetRemoteUrl()
2660 if remote_url.endswith('.git'):
2661 remote_url = remote_url[:-len('.git')]
erikchen0d14d0d2018-08-28 18:57:09 +00002662 remote_url = remote_url.rstrip('/')
2663
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002664 fetch_info = revision_info['fetch']['http']
erikchen0d14d0d2018-08-28 18:57:09 +00002665 fetch_info['url'] = fetch_info['url'].rstrip('/')
Aaron Gable697a91b2018-01-19 15:20:15 -08002666
2667 if remote_url != fetch_info['url']:
2668 DieWithError('Trying to patch a change from %s but this repo appears '
2669 'to be %s.' % (fetch_info['url'], remote_url))
2670
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002671 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002672
Aaron Gable62619a32017-06-16 08:22:09 -07002673 if force:
2674 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2675 print('Checked out commit for change %i patchset %i locally' %
2676 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002677 elif nocommit:
2678 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2679 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002680 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002681 RunGit(['cherry-pick', 'FETCH_HEAD'])
2682 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002683 (parsed_issue_arg.issue, patchset))
2684 print('Note: this created a local commit which does not have '
2685 'the same hash as the one uploaded for review. This will make '
2686 'uploading changes based on top of this branch difficult.\n'
2687 'If you want to do that, use "git cl patch --force" instead.')
2688
Stefan Zagerd08043c2017-10-12 12:07:02 -07002689 if self.GetBranch():
2690 self.SetIssue(parsed_issue_arg.issue)
2691 self.SetPatchset(patchset)
2692 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2693 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2694 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2695 else:
2696 print('WARNING: You are in detached HEAD state.\n'
2697 'The patch has been applied to your checkout, but you will not be '
2698 'able to upload a new patch set to the gerrit issue.\n'
2699 'Try using the \'-b\' option if you would like to work on a '
2700 'branch and/or upload a new patch set.')
2701
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002702 return 0
2703
2704 @staticmethod
2705 def ParseIssueURL(parsed_url):
2706 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2707 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002708 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2709 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002710 # Short urls like https://domain/<issue_number> can be used, but don't allow
2711 # specifying the patchset (you'd 404), but we allow that here.
2712 if parsed_url.path == '/':
2713 part = parsed_url.fragment
2714 else:
2715 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002716 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002717 if match:
2718 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002719 issue=int(match.group(3)),
2720 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002721 hostname=parsed_url.netloc,
2722 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002723 return None
2724
tandrii16e0b4e2016-06-07 10:34:28 -07002725 def _GerritCommitMsgHookCheck(self, offer_removal):
2726 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2727 if not os.path.exists(hook):
2728 return
2729 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2730 # custom developer made one.
2731 data = gclient_utils.FileRead(hook)
2732 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2733 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002734 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002735 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002736 'and may interfere with it in subtle ways.\n'
2737 'We recommend you remove the commit-msg hook.')
2738 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002739 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002740 gclient_utils.rm_file_or_tree(hook)
2741 print('Gerrit commit-msg hook removed.')
2742 else:
2743 print('OK, will keep Gerrit commit-msg hook in place.')
2744
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002745 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002746 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002747 if options.squash and options.no_squash:
2748 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002749
2750 if not options.squash and not options.no_squash:
2751 # Load default for user, repo, squash=true, in this order.
2752 options.squash = settings.GetSquashGerritUploads()
2753 elif options.no_squash:
2754 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002755
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002756 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002757 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002758
Aaron Gableb56ad332017-01-06 15:24:31 -08002759 # This may be None; default fallback value is determined in logic below.
2760 title = options.title
2761
Dominic Battre7d1c4842017-10-27 09:17:28 +02002762 # Extract bug number from branch name.
2763 bug = options.bug
2764 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2765 if not bug and match:
2766 bug = match.group(1)
2767
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002768 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002769 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002770 if self.GetIssue():
2771 # Try to get the message from a previous upload.
2772 message = self.GetDescription()
2773 if not message:
2774 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002775 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002776 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002777 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002778 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002779 # When uploading a subsequent patchset, -m|--message is taken
2780 # as the patchset title if --title was not provided.
2781 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002782 else:
2783 default_title = RunGit(
2784 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002785 if options.force:
2786 title = default_title
2787 else:
2788 title = ask_for_data(
2789 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002790 change_id = self._GetChangeDetail()['change_id']
2791 while True:
2792 footer_change_ids = git_footers.get_footer_change_id(message)
2793 if footer_change_ids == [change_id]:
2794 break
2795 if not footer_change_ids:
2796 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002797 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002798 continue
2799 # There is already a valid footer but with different or several ids.
2800 # Doing this automatically is non-trivial as we don't want to lose
2801 # existing other footers, yet we want to append just 1 desired
2802 # Change-Id. Thus, just create a new footer, but let user verify the
2803 # new description.
2804 message = '%s\n\nChange-Id: %s' % (message, change_id)
2805 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002806 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002807 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002808 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002809 'Please, check the proposed correction to the description, '
2810 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2811 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2812 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002813 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002814 if not options.force:
2815 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002816 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817 message = change_desc.description
2818 if not message:
2819 DieWithError("Description is empty. Aborting...")
2820 # Continue the while loop.
2821 # Sanity check of this code - we should end up with proper message
2822 # footer.
2823 assert [change_id] == git_footers.get_footer_change_id(message)
2824 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002825 else: # if not self.GetIssue()
2826 if options.message:
2827 message = options.message
2828 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002829 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002830 if options.title:
2831 message = options.title + '\n\n' + message
2832 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002833
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002834 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002835 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002836 # On first upload, patchset title is always this string, while
2837 # --title flag gets converted to first line of message.
2838 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002839 if not change_desc.description:
2840 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002841 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002842 if len(change_ids) > 1:
2843 DieWithError('too many Change-Id footers, at most 1 allowed.')
2844 if not change_ids:
2845 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002846 change_desc.set_description(git_footers.add_footer_change_id(
2847 change_desc.description,
2848 GenerateGerritChangeId(change_desc.description)))
2849 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002850 assert len(change_ids) == 1
2851 change_id = change_ids[0]
2852
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002853 if options.reviewers or options.tbrs or options.add_owners_to:
2854 change_desc.update_reviewers(options.reviewers, options.tbrs,
2855 options.add_owners_to, change)
2856
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002857 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002858 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2859 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002860 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07002861 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
2862 desc_tempfile.write(change_desc.description)
2863 desc_tempfile.close()
2864 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2865 '-F', desc_tempfile.name]).strip()
2866 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002867 else:
2868 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002869 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002870 if not change_desc.description:
2871 DieWithError("Description is empty. Aborting...")
2872
2873 if not git_footers.get_footer_change_id(change_desc.description):
2874 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002875 change_desc.set_description(
2876 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002877 if options.reviewers or options.tbrs or options.add_owners_to:
2878 change_desc.update_reviewers(options.reviewers, options.tbrs,
2879 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002881 # For no-squash mode, we assume the remote called "origin" is the one we
2882 # want. It is not worthwhile to support different workflows for
2883 # no-squash mode.
2884 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002885 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2886
2887 assert change_desc
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +00002888 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002889 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2890 ref_to_push)]).splitlines()
2891 if len(commits) > 1:
2892 print('WARNING: This will upload %d commits. Run the following command '
2893 'to see which commits will be uploaded: ' % len(commits))
2894 print('git log %s..%s' % (parent, ref_to_push))
2895 print('You can also use `git squash-branch` to squash these into a '
2896 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002897 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002898
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002899 if options.reviewers or options.tbrs or options.add_owners_to:
2900 change_desc.update_reviewers(options.reviewers, options.tbrs,
2901 options.add_owners_to, change)
2902
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002903 reviewers = sorted(change_desc.get_reviewers())
2904 # Add cc's from the CC_LIST and --cc flag (if any).
2905 if not options.private and not options.no_autocc:
2906 cc = self.GetCCList().split(',')
2907 else:
2908 cc = []
2909 if options.cc:
2910 cc.extend(options.cc)
2911 cc = filter(None, [email.strip() for email in cc])
2912 if change_desc.get_cced():
2913 cc.extend(change_desc.get_cced())
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +00002914 valid_accounts = gerrit_util.ValidAccounts(
2915 self._GetGerritHost(), reviewers + cc)
2916 logging.debug('accounts %s are valid, %s invalid', sorted(valid_accounts),
2917 set(reviewers + cc).difference(set(valid_accounts)))
Andrii Shyshkalov76988a82018-10-15 03:12:25 +00002918
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002919 # Extra options that can be specified at push time. Doc:
2920 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002921 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002922
Aaron Gable844cf292017-06-28 11:32:59 -07002923 # By default, new changes are started in WIP mode, and subsequent patchsets
2924 # don't send email. At any time, passing --send-mail will mark the change
2925 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07002926 if options.send_mail:
2927 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07002928 refspec_opts.append('notify=ALL')
Jamie Madill276da0b2018-04-27 14:41:20 -04002929 elif not self.GetIssue() and options.squash:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002930 refspec_opts.append('wip')
Aaron Gableafd52772017-06-27 16:40:10 -07002931 else:
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002932 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07002933
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002934 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07002935 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002936
Aaron Gable9b713dd2016-12-14 16:04:21 -08002937 if title:
Nick Carter8692b182017-11-06 16:30:38 -08002938 # Punctuation and whitespace in |title| must be percent-encoded.
2939 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002940
agablec6787972016-09-09 16:13:34 -07002941 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002942 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002943
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00002944 for r in sorted(reviewers):
2945 if r in valid_accounts:
2946 refspec_opts.append('r=%s' % r)
2947 reviewers.remove(r)
2948 else:
2949 # TODO(tandrii): this should probably be a hard failure.
2950 print('WARNING: reviewer %s doesn\'t have a Gerrit account, skipping'
2951 % r)
2952 for c in sorted(cc):
2953 # refspec option will be rejected if cc doesn't correspond to an
2954 # account, even though REST call to add such arbitrary cc may succeed.
2955 if c in valid_accounts:
2956 refspec_opts.append('cc=%s' % c)
2957 cc.remove(c)
2958
2959
rmistry9eadede2016-09-19 11:22:43 -07002960 if options.topic:
2961 # Documentation on Gerrit topics is here:
2962 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002963 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002964
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002965 # Gerrit sorts hashtags, so order is not important.
Nodir Turakulov23b82142017-11-16 11:04:25 -08002966 hashtags = {change_desc.sanitize_hash_tag(t) for t in options.hashtags}
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002967 if not self.GetIssue():
Nodir Turakulov23b82142017-11-16 11:04:25 -08002968 hashtags.update(change_desc.get_hash_tags())
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08002969 refspec_opts += ['hashtag=%s' % t for t in sorted(hashtags)]
2970
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002971 refspec_suffix = ''
2972 if refspec_opts:
2973 refspec_suffix = '%' + ','.join(refspec_opts)
2974 assert ' ' not in refspec_suffix, (
2975 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2976 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2977
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002978 try:
Edward Lemur83bd7f42018-10-10 00:14:21 +00002979 # TODO(crbug.com/881860): Remove.
Edward Lemur47faa062018-10-11 19:46:02 +00002980 # Clear the log after each git-cl upload run by setting mode='w'.
2981 handler = logging.FileHandler(gerrit_util.GERRIT_ERR_LOG_FILE, mode='w')
2982 handler.setFormatter(logging.Formatter('%(asctime)s %(message)s'))
2983
2984 GERRIT_ERR_LOGGER.addHandler(handler)
2985 GERRIT_ERR_LOGGER.setLevel(logging.INFO)
2986 # Don't propagate to root logger, so that logs are not printed.
2987 GERRIT_ERR_LOGGER.propagate = 0
2988
Edward Lemur83bd7f42018-10-10 00:14:21 +00002989 # Get interesting headers from git push, to be displayed to the user if
2990 # subsequent Gerrit RPC calls fail.
2991 env = os.environ.copy()
2992 env['GIT_CURL_VERBOSE'] = '1'
2993 class FilterHeaders(object):
2994 """Filter git push headers and store them in a file.
2995
2996 Regular git push output is printed directly.
2997 """
2998
2999 def __init__(self):
3000 # The output from git push that we want to store in a file.
3001 self._output = ''
3002 # Keeps track of whether the current line is part of a request header.
3003 self._on_header = False
3004 # Keeps track of repeated empty lines, which mark the end of a request
3005 # header.
3006 self._last_line_empty = False
3007
3008 def __call__(self, line):
3009 """Handle a single line of git push output."""
3010 if not line:
3011 # Two consecutive empty lines mark the end of a header.
3012 if self._last_line_empty:
3013 self._on_header = False
3014 self._last_line_empty = True
3015 return
3016
3017 self._last_line_empty = False
3018 # A line starting with '>' marks the beggining of a request header.
3019 if line[0] == '>':
3020 self._on_header = True
3021 GERRIT_ERR_LOGGER.info(line)
3022 # Lines not starting with '*' or '<', and not part of a request header
3023 # should be displayed to the user.
3024 elif line[0] not in '*<' and not self._on_header:
3025 print(line)
3026 # Flush after every line: useful for seeing progress when running as
3027 # recipe.
3028 sys.stdout.flush()
3029 # Filter out the cookie and authorization headers.
3030 elif ('cookie: ' not in line.lower()
3031 and 'authorization: ' not in line.lower()):
3032 GERRIT_ERR_LOGGER.info(line)
3033
3034 filter_fn = FilterHeaders()
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003035 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00003036 ['git', 'push', self.GetRemoteUrl(), refspec],
Edward Lemur83bd7f42018-10-10 00:14:21 +00003037 print_stdout=False,
3038 filter_fn=filter_fn,
3039 env=env)
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003040 except subprocess2.CalledProcessError:
3041 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003042 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003043 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003044 'credential problems:\n'
3045 ' git cl creds-check\n',
3046 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003047
3048 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003049 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003050 change_numbers = [m.group(1)
3051 for m in map(regex.match, push_stdout.splitlines())
3052 if m]
3053 if len(change_numbers) != 1:
3054 DieWithError(
3055 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003056 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003057 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003058 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003059
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00003060 if self.GetIssue() and (reviewers or cc):
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003061 # GetIssue() is not set in case of non-squash uploads according to tests.
3062 # TODO(agable): non-squash uploads in git cl should be removed.
3063 gerrit_util.AddReviewers(
3064 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003065 self._GerritChangeIdentifier(),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003066 reviewers, cc,
3067 notify=bool(options.send_mail))
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003068
Aaron Gablefd238082017-06-07 13:42:34 -07003069 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003070 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3071 score = 1
3072 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3073 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3074 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003075 gerrit_util.SetReview(
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00003076 self._GetGerritHost(),
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003077 self._GerritChangeIdentifier(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003078 msg='Self-approving for TBR',
3079 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003080
Andrii Shyshkalovdd788442018-10-13 17:55:29 +00003081 self.SetLabels(options.enable_auto_submit, options.use_commit_queue,
3082 options.cq_dry_run)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003083 return 0
3084
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003085 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3086 change_desc):
3087 """Computes parent of the generated commit to be uploaded to Gerrit.
3088
3089 Returns revision or a ref name.
3090 """
3091 if custom_cl_base:
3092 # Try to avoid creating additional unintended CLs when uploading, unless
3093 # user wants to take this risk.
3094 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3095 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3096 local_ref_of_target_remote])
3097 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003098 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003099 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3100 'If you proceed with upload, more than 1 CL may be created by '
3101 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3102 'If you are certain that specified base `%s` has already been '
3103 'uploaded to Gerrit as another CL, you may proceed.\n' %
3104 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3105 if not force:
3106 confirm_or_exit(
3107 'Do you take responsibility for cleaning up potential mess '
3108 'resulting from proceeding with upload?',
3109 action='upload')
3110 return custom_cl_base
3111
Aaron Gablef97e33d2017-03-30 15:44:27 -07003112 if remote != '.':
3113 return self.GetCommonAncestorWithUpstream()
3114
3115 # If our upstream branch is local, we base our squashed commit on its
3116 # squashed version.
3117 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3118
Aaron Gablef97e33d2017-03-30 15:44:27 -07003119 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003120 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003121
3122 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003123 # TODO(tandrii): consider checking parent change in Gerrit and using its
3124 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3125 # the tree hash of the parent branch. The upside is less likely bogus
3126 # requests to reupload parent change just because it's uploadhash is
3127 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003128 parent = RunGit(['config',
3129 'branch.%s.gerritsquashhash' % upstream_branch_name],
3130 error_ok=True).strip()
3131 # Verify that the upstream branch has been uploaded too, otherwise
3132 # Gerrit will create additional CLs when uploading.
3133 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3134 RunGitSilent(['rev-parse', parent + ':'])):
3135 DieWithError(
3136 '\nUpload upstream branch %s first.\n'
3137 'It is likely that this branch has been rebased since its last '
3138 'upload, so you just need to upload it again.\n'
3139 '(If you uploaded it with --no-squash, then branch dependencies '
3140 'are not supported, and you should reupload with --squash.)'
3141 % upstream_branch_name,
3142 change_desc)
3143 return parent
3144
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003145 def _AddChangeIdToCommitMessage(self, options, args):
3146 """Re-commits using the current message, assumes the commit hook is in
3147 place.
3148 """
3149 log_desc = options.message or CreateDescriptionFromLog(args)
3150 git_command = ['commit', '--amend', '-m', log_desc]
3151 RunGit(git_command)
3152 new_log_desc = CreateDescriptionFromLog(args)
3153 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003154 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003155 return new_log_desc
3156 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003157 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003158
Ravi Mistry31e7d562018-04-02 12:53:57 -04003159 def SetLabels(self, enable_auto_submit, use_commit_queue, cq_dry_run):
3160 """Sets labels on the change based on the provided flags."""
3161 labels = {}
3162 notify = None;
3163 if enable_auto_submit:
3164 labels['Auto-Submit'] = 1
3165 if use_commit_queue:
3166 labels['Commit-Queue'] = 2
3167 elif cq_dry_run:
3168 labels['Commit-Queue'] = 1
3169 notify = False
3170 if labels:
Andrii Shyshkalovd06cc782018-08-23 17:24:19 +00003171 gerrit_util.SetReview(
3172 self._GetGerritHost(),
3173 self._GerritChangeIdentifier(),
3174 labels=labels, notify=notify)
Ravi Mistry31e7d562018-04-02 12:53:57 -04003175
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003176 def SetCQState(self, new_state):
3177 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003178 vote_map = {
3179 _CQState.NONE: 0,
3180 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003181 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003182 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003183 labels = {'Commit-Queue': vote_map[new_state]}
3184 notify = False if new_state == _CQState.DRY_RUN else None
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00003185 gerrit_util.SetReview(
3186 self._GetGerritHost(), self._GerritChangeIdentifier(),
3187 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003188
tandriie113dfd2016-10-11 10:20:12 -07003189 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003190 try:
3191 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003192 except GerritChangeNotExists:
3193 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003194
3195 if data['status'] in ('ABANDONED', 'MERGED'):
3196 return 'CL %s is closed' % self.GetIssue()
3197
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003198 def GetTryJobProperties(self, patchset=None):
3199 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003200 data = self._GetChangeDetail(['ALL_REVISIONS'])
3201 patchset = int(patchset or self.GetPatchset())
3202 assert patchset
3203 revision_data = None # Pylint wants it to be defined.
3204 for revision_data in data['revisions'].itervalues():
3205 if int(revision_data['_number']) == patchset:
3206 break
3207 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003208 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003209 (patchset, self.GetIssue()))
3210 return {
3211 'patch_issue': self.GetIssue(),
3212 'patch_set': patchset or self.GetPatchset(),
3213 'patch_project': data['project'],
3214 'patch_storage': 'gerrit',
3215 'patch_ref': revision_data['fetch']['http']['ref'],
3216 'patch_repository_url': revision_data['fetch']['http']['url'],
3217 'patch_gerrit_url': self.GetCodereviewServer(),
3218 }
tandriie113dfd2016-10-11 10:20:12 -07003219
tandriide281ae2016-10-12 06:02:30 -07003220 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003221 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003222
Edward Lemur707d70b2018-02-07 00:50:14 +01003223 def GetReviewers(self):
3224 details = self._GetChangeDetail(['DETAILED_ACCOUNTS'])
3225 return [reviewer['email'] for reviewer in details['reviewers']['REVIEWER']]
3226
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003227
3228_CODEREVIEW_IMPLEMENTATIONS = {
3229 'rietveld': _RietveldChangelistImpl,
3230 'gerrit': _GerritChangelistImpl,
3231}
3232
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003233
iannuccie53c9352016-08-17 14:40:40 -07003234def _add_codereview_issue_select_options(parser, extra=""):
3235 _add_codereview_select_options(parser)
3236
3237 text = ('Operate on this issue number instead of the current branch\'s '
3238 'implicit issue.')
3239 if extra:
3240 text += ' '+extra
3241 parser.add_option('-i', '--issue', type=int, help=text)
3242
3243
3244def _process_codereview_issue_select_options(parser, options):
3245 _process_codereview_select_options(parser, options)
3246 if options.issue is not None and not options.forced_codereview:
3247 parser.error('--issue must be specified with either --rietveld or --gerrit')
3248
3249
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003250def _add_codereview_select_options(parser):
3251 """Appends --gerrit and --rietveld options to force specific codereview."""
3252 parser.codereview_group = optparse.OptionGroup(
3253 parser, 'EXPERIMENTAL! Codereview override options')
3254 parser.add_option_group(parser.codereview_group)
3255 parser.codereview_group.add_option(
3256 '--gerrit', action='store_true',
3257 help='Force the use of Gerrit for codereview')
3258 parser.codereview_group.add_option(
3259 '--rietveld', action='store_true',
3260 help='Force the use of Rietveld for codereview')
3261
3262
3263def _process_codereview_select_options(parser, options):
Andrii Shyshkalovfeec80e2018-10-16 01:00:47 +00003264 if options.rietveld:
3265 parser.error('--rietveld is no longer supported')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003266 options.forced_codereview = None
3267 if options.gerrit:
3268 options.forced_codereview = 'gerrit'
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003269
3270
tandriif9aefb72016-07-01 09:06:51 -07003271def _get_bug_line_values(default_project, bugs):
3272 """Given default_project and comma separated list of bugs, yields bug line
3273 values.
3274
3275 Each bug can be either:
3276 * a number, which is combined with default_project
3277 * string, which is left as is.
3278
3279 This function may produce more than one line, because bugdroid expects one
3280 project per line.
3281
3282 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3283 ['v8:123', 'chromium:789']
3284 """
3285 default_bugs = []
3286 others = []
3287 for bug in bugs.split(','):
3288 bug = bug.strip()
3289 if bug:
3290 try:
3291 default_bugs.append(int(bug))
3292 except ValueError:
3293 others.append(bug)
3294
3295 if default_bugs:
3296 default_bugs = ','.join(map(str, default_bugs))
3297 if default_project:
3298 yield '%s:%s' % (default_project, default_bugs)
3299 else:
3300 yield default_bugs
3301 for other in sorted(others):
3302 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3303 yield other
3304
3305
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003306class ChangeDescription(object):
3307 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003308 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003309 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003310 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003311 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
Nodir Turakulov23b82142017-11-16 11:04:25 -08003312 STRIP_HASH_TAG_PREFIX = r'^(\s*(revert|reland)( "|:)?\s*)*'
3313 BRACKET_HASH_TAG = r'\s*\[([^\[\]]+)\]'
3314 COLON_SEPARATED_HASH_TAG = r'^([a-zA-Z0-9_\- ]+):'
3315 BAD_HASH_TAG_CHUNK = r'[^a-zA-Z0-9]+'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003316
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003317 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003318 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003319
agable@chromium.org42c20792013-09-12 17:34:49 +00003320 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003321 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003322 return '\n'.join(self._description_lines)
3323
3324 def set_description(self, desc):
3325 if isinstance(desc, basestring):
3326 lines = desc.splitlines()
3327 else:
3328 lines = [line.rstrip() for line in desc]
3329 while lines and not lines[0]:
3330 lines.pop(0)
3331 while lines and not lines[-1]:
3332 lines.pop(-1)
3333 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003334
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003335 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3336 """Rewrites the R=/TBR= line(s) as a single line each.
3337
3338 Args:
3339 reviewers (list(str)) - list of additional emails to use for reviewers.
3340 tbrs (list(str)) - list of additional emails to use for TBRs.
3341 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3342 the change that are missing OWNER coverage. If this is not None, you
3343 must also pass a value for `change`.
3344 change (Change) - The Change that should be used for OWNERS lookups.
3345 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003346 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003347 assert isinstance(tbrs, list), tbrs
3348
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003349 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003350 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003351
3352 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003353 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003354
3355 reviewers = set(reviewers)
3356 tbrs = set(tbrs)
3357 LOOKUP = {
3358 'TBR': tbrs,
3359 'R': reviewers,
3360 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003361
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003362 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003363 regexp = re.compile(self.R_LINE)
3364 matches = [regexp.match(line) for line in self._description_lines]
3365 new_desc = [l for i, l in enumerate(self._description_lines)
3366 if not matches[i]]
3367 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003368
agable@chromium.org42c20792013-09-12 17:34:49 +00003369 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003370
3371 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003372 for match in matches:
3373 if not match:
3374 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003375 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3376
3377 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003378 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003379 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003380 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003381 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003382 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003383 LOOKUP[add_owners_to].update(
3384 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003385
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003386 # If any folks ended up in both groups, remove them from tbrs.
3387 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003388
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003389 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3390 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003391
3392 # Put the new lines in the description where the old first R= line was.
3393 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3394 if 0 <= line_loc < len(self._description_lines):
3395 if new_tbr_line:
3396 self._description_lines.insert(line_loc, new_tbr_line)
3397 if new_r_line:
3398 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003399 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003400 if new_r_line:
3401 self.append_footer(new_r_line)
3402 if new_tbr_line:
3403 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003404
Aaron Gable3a16ed12017-03-23 10:51:55 -07003405 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003406 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003407 self.set_description([
3408 '# Enter a description of the change.',
3409 '# This will be displayed on the codereview site.',
3410 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003411 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003412 '--------------------',
3413 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003414
agable@chromium.org42c20792013-09-12 17:34:49 +00003415 regexp = re.compile(self.BUG_LINE)
3416 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003417 prefix = settings.GetBugPrefix()
3418 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003419 if git_footer:
3420 self.append_footer('Bug: %s' % ', '.join(values))
3421 else:
3422 for value in values:
3423 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003424
agable@chromium.org42c20792013-09-12 17:34:49 +00003425 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003426 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003427 if not content:
3428 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003429 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003430
Bruce Dawson2377b012018-01-11 16:46:49 -08003431 # Strip off comments and default inserted "Bug:" line.
3432 clean_lines = [line.rstrip() for line in lines if not
3433 (line.startswith('#') or line.rstrip() == "Bug:")]
agable@chromium.org42c20792013-09-12 17:34:49 +00003434 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003435 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003436 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003437
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003438 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003439 """Adds a footer line to the description.
3440
3441 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3442 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3443 that Gerrit footers are always at the end.
3444 """
3445 parsed_footer_line = git_footers.parse_footer(line)
3446 if parsed_footer_line:
3447 # Line is a gerrit footer in the form: Footer-Key: any value.
3448 # Thus, must be appended observing Gerrit footer rules.
3449 self.set_description(
3450 git_footers.add_footer(self.description,
3451 key=parsed_footer_line[0],
3452 value=parsed_footer_line[1]))
3453 return
3454
3455 if not self._description_lines:
3456 self._description_lines.append(line)
3457 return
3458
3459 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3460 if gerrit_footers:
3461 # git_footers.split_footers ensures that there is an empty line before
3462 # actual (gerrit) footers, if any. We have to keep it that way.
3463 assert top_lines and top_lines[-1] == ''
3464 top_lines, separator = top_lines[:-1], top_lines[-1:]
3465 else:
3466 separator = [] # No need for separator if there are no gerrit_footers.
3467
3468 prev_line = top_lines[-1] if top_lines else ''
3469 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3470 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3471 top_lines.append('')
3472 top_lines.append(line)
3473 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003474
tandrii99a72f22016-08-17 14:33:24 -07003475 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003476 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003477 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003478 reviewers = [match.group(2).strip()
3479 for match in matches
3480 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003481 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003482
bradnelsond975b302016-10-23 12:20:23 -07003483 def get_cced(self):
3484 """Retrieves the list of reviewers."""
3485 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3486 cced = [match.group(2).strip() for match in matches if match]
3487 return cleanup_list(cced)
3488
Nodir Turakulov23b82142017-11-16 11:04:25 -08003489 def get_hash_tags(self):
3490 """Extracts and sanitizes a list of Gerrit hashtags."""
3491 subject = (self._description_lines or ('',))[0]
3492 subject = re.sub(
3493 self.STRIP_HASH_TAG_PREFIX, '', subject, flags=re.IGNORECASE)
3494
3495 tags = []
3496 start = 0
3497 bracket_exp = re.compile(self.BRACKET_HASH_TAG)
3498 while True:
3499 m = bracket_exp.match(subject, start)
3500 if not m:
3501 break
3502 tags.append(self.sanitize_hash_tag(m.group(1)))
3503 start = m.end()
3504
3505 if not tags:
3506 # Try "Tag: " prefix.
3507 m = re.match(self.COLON_SEPARATED_HASH_TAG, subject)
3508 if m:
3509 tags.append(self.sanitize_hash_tag(m.group(1)))
3510 return tags
3511
3512 @classmethod
3513 def sanitize_hash_tag(cls, tag):
3514 """Returns a sanitized Gerrit hash tag.
3515
3516 A sanitized hashtag can be used as a git push refspec parameter value.
3517 """
3518 return re.sub(cls.BAD_HASH_TAG_CHUNK, '-', tag).strip('-').lower()
3519
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003520 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3521 """Updates this commit description given the parent.
3522
3523 This is essentially what Gnumbd used to do.
3524 Consult https://goo.gl/WMmpDe for more details.
3525 """
3526 assert parent_msg # No, orphan branch creation isn't supported.
3527 assert parent_hash
3528 assert dest_ref
3529 parent_footer_map = git_footers.parse_footers(parent_msg)
3530 # This will also happily parse svn-position, which GnumbD is no longer
3531 # supporting. While we'd generate correct footers, the verifier plugin
3532 # installed in Gerrit will block such commit (ie git push below will fail).
3533 parent_position = git_footers.get_position(parent_footer_map)
3534
3535 # Cherry-picks may have last line obscuring their prior footers,
3536 # from git_footers perspective. This is also what Gnumbd did.
3537 cp_line = None
3538 if (self._description_lines and
3539 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3540 cp_line = self._description_lines.pop()
3541
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003542 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003543
3544 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3545 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003546 for i, line in enumerate(footer_lines):
3547 k, v = git_footers.parse_footer(line) or (None, None)
3548 if k and k.startswith('Cr-'):
3549 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003550
3551 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003552 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003553 if parent_position[0] == dest_ref:
3554 # Same branch as parent.
3555 number = int(parent_position[1]) + 1
3556 else:
3557 number = 1 # New branch, and extra lineage.
3558 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3559 int(parent_position[1])))
3560
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003561 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3562 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003563
3564 self._description_lines = top_lines
3565 if cp_line:
3566 self._description_lines.append(cp_line)
3567 if self._description_lines[-1] != '':
3568 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003569 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003570
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003571
Aaron Gablea1bab272017-04-11 16:38:18 -07003572def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003573 """Retrieves the reviewers that approved a CL from the issue properties with
3574 messages.
3575
3576 Note that the list may contain reviewers that are not committer, thus are not
3577 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003578
3579 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003580 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003581 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003582 return sorted(
3583 set(
3584 message['sender']
3585 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003586 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003587 )
3588 )
3589
3590
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003591def FindCodereviewSettingsFile(filename='codereview.settings'):
3592 """Finds the given file starting in the cwd and going up.
3593
3594 Only looks up to the top of the repository unless an
3595 'inherit-review-settings-ok' file exists in the root of the repository.
3596 """
3597 inherit_ok_file = 'inherit-review-settings-ok'
3598 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003599 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3601 root = '/'
3602 while True:
3603 if filename in os.listdir(cwd):
3604 if os.path.isfile(os.path.join(cwd, filename)):
3605 return open(os.path.join(cwd, filename))
3606 if cwd == root:
3607 break
3608 cwd = os.path.dirname(cwd)
3609
3610
3611def LoadCodereviewSettingsFromFile(fileobj):
3612 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003613 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003614
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003615 def SetProperty(name, setting, unset_error_ok=False):
3616 fullname = 'rietveld.' + name
3617 if setting in keyvals:
3618 RunGit(['config', fullname, keyvals[setting]])
3619 else:
3620 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3621
tandrii48df5812016-10-17 03:55:37 -07003622 if not keyvals.get('GERRIT_HOST', False):
3623 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003624 # Only server setting is required. Other settings can be absent.
3625 # In that case, we ignore errors raised during option deletion attempt.
3626 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003627 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003628 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3629 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003630 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003631 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3632 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003633 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003634 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3635 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003636
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003637 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003638 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003639
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003640 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003641 RunGit(['config', 'gerrit.squash-uploads',
3642 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003643
tandrii@chromium.org28253532016-04-14 13:46:56 +00003644 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003645 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003646 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3647
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003648 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003649 # should be of the form
3650 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3651 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003652 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3653 keyvals['ORIGIN_URL_CONFIG']])
3654
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003655
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003656def urlretrieve(source, destination):
3657 """urllib is broken for SSL connections via a proxy therefore we
3658 can't use urllib.urlretrieve()."""
3659 with open(destination, 'w') as f:
3660 f.write(urllib2.urlopen(source).read())
3661
3662
ukai@chromium.org712d6102013-11-27 00:52:58 +00003663def hasSheBang(fname):
3664 """Checks fname is a #! script."""
3665 with open(fname) as f:
3666 return f.read(2).startswith('#!')
3667
3668
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003669# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3670def DownloadHooks(*args, **kwargs):
3671 pass
3672
3673
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003674def DownloadGerritHook(force):
3675 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003676
3677 Args:
3678 force: True to update hooks. False to install hooks if not present.
3679 """
3680 if not settings.GetIsGerrit():
3681 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003682 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003683 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3684 if not os.access(dst, os.X_OK):
3685 if os.path.exists(dst):
3686 if not force:
3687 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003688 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003689 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003690 if not hasSheBang(dst):
3691 DieWithError('Not a script: %s\n'
3692 'You need to download from\n%s\n'
3693 'into .git/hooks/commit-msg and '
3694 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003695 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3696 except Exception:
3697 if os.path.exists(dst):
3698 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003699 DieWithError('\nFailed to download hooks.\n'
3700 'You need to download from\n%s\n'
3701 'into .git/hooks/commit-msg and '
3702 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003703
3704
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003705def GetRietveldCodereviewSettingsInteractively():
3706 """Prompt the user for settings."""
3707 server = settings.GetDefaultServerUrl(error_ok=True)
3708 prompt = 'Rietveld server (host[:port])'
3709 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3710 newserver = ask_for_data(prompt + ':')
3711 if not server and not newserver:
3712 newserver = DEFAULT_SERVER
3713 if newserver:
3714 newserver = gclient_utils.UpgradeToHttps(newserver)
3715 if newserver != server:
3716 RunGit(['config', 'rietveld.server', newserver])
3717
3718 def SetProperty(initial, caption, name, is_url):
3719 prompt = caption
3720 if initial:
3721 prompt += ' ("x" to clear) [%s]' % initial
3722 new_val = ask_for_data(prompt + ':')
3723 if new_val == 'x':
3724 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3725 elif new_val:
3726 if is_url:
3727 new_val = gclient_utils.UpgradeToHttps(new_val)
3728 if new_val != initial:
3729 RunGit(['config', 'rietveld.' + name, new_val])
3730
3731 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3732 SetProperty(settings.GetDefaultPrivateFlag(),
3733 'Private flag (rietveld only)', 'private', False)
3734 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3735 'tree-status-url', False)
3736 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3737 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3738 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3739 'run-post-upload-hook', False)
3740
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003741
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003742class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003743 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003744
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003745 _GOOGLESOURCE = 'googlesource.com'
3746
3747 def __init__(self):
3748 # Cached list of [host, identity, source], where source is either
3749 # .gitcookies or .netrc.
3750 self._all_hosts = None
3751
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003752 def ensure_configured_gitcookies(self):
3753 """Runs checks and suggests fixes to make git use .gitcookies from default
3754 path."""
3755 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3756 configured_path = RunGitSilent(
3757 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003758 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003759 if configured_path:
3760 self._ensure_default_gitcookies_path(configured_path, default)
3761 else:
3762 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003763
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003764 @staticmethod
3765 def _ensure_default_gitcookies_path(configured_path, default_path):
3766 assert configured_path
3767 if configured_path == default_path:
3768 print('git is already configured to use your .gitcookies from %s' %
3769 configured_path)
3770 return
3771
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003772 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003773 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3774 (configured_path, default_path))
3775
3776 if not os.path.exists(configured_path):
3777 print('However, your configured .gitcookies file is missing.')
3778 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3779 action='reconfigure')
3780 RunGit(['config', '--global', 'http.cookiefile', default_path])
3781 return
3782
3783 if os.path.exists(default_path):
3784 print('WARNING: default .gitcookies file already exists %s' %
3785 default_path)
3786 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3787 default_path)
3788
3789 confirm_or_exit('Move existing .gitcookies to default location?',
3790 action='move')
3791 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003792 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003793 print('Moved and reconfigured git to use .gitcookies from %s' %
3794 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003795
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003796 @staticmethod
3797 def _configure_gitcookies_path(default_path):
3798 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3799 if os.path.exists(netrc_path):
3800 print('You seem to be using outdated .netrc for git credentials: %s' %
3801 netrc_path)
3802 print('This tool will guide you through setting up recommended '
3803 '.gitcookies store for git credentials.\n'
3804 '\n'
3805 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3806 ' git config --global --unset http.cookiefile\n'
3807 ' mv %s %s.backup\n\n' % (default_path, default_path))
3808 confirm_or_exit(action='setup .gitcookies')
3809 RunGit(['config', '--global', 'http.cookiefile', default_path])
3810 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003811
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003812 def get_hosts_with_creds(self, include_netrc=False):
3813 if self._all_hosts is None:
3814 a = gerrit_util.CookiesAuthenticator()
3815 self._all_hosts = [
3816 (h, u, s)
3817 for h, u, s in itertools.chain(
3818 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3819 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3820 )
3821 if h.endswith(self._GOOGLESOURCE)
3822 ]
3823
3824 if include_netrc:
3825 return self._all_hosts
3826 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3827
3828 def print_current_creds(self, include_netrc=False):
3829 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3830 if not hosts:
3831 print('No Git/Gerrit credentials found')
3832 return
3833 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3834 header = [('Host', 'User', 'Which file'),
3835 ['=' * l for l in lengths]]
3836 for row in (header + hosts):
3837 print('\t'.join((('%%+%ds' % l) % s)
3838 for l, s in zip(lengths, row)))
3839
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003840 @staticmethod
3841 def _parse_identity(identity):
Lei Zhangd3f769a2017-12-15 15:16:14 -08003842 """Parses identity "git-<username>.domain" into <username> and domain."""
3843 # Special case: usernames that contain ".", which are generally not
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003844 # distinguishable from sub-domains. But we do know typical domains:
3845 if identity.endswith('.chromium.org'):
3846 domain = 'chromium.org'
3847 username = identity[:-len('.chromium.org')]
3848 else:
3849 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003850 if username.startswith('git-'):
3851 username = username[len('git-'):]
3852 return username, domain
3853
3854 def _get_usernames_of_domain(self, domain):
3855 """Returns list of usernames referenced by .gitcookies in a given domain."""
3856 identities_by_domain = {}
3857 for _, identity, _ in self.get_hosts_with_creds():
3858 username, domain = self._parse_identity(identity)
3859 identities_by_domain.setdefault(domain, []).append(username)
3860 return identities_by_domain.get(domain)
3861
3862 def _canonical_git_googlesource_host(self, host):
3863 """Normalizes Gerrit hosts (with '-review') to Git host."""
3864 assert host.endswith(self._GOOGLESOURCE)
3865 # Prefix doesn't include '.' at the end.
3866 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3867 if prefix.endswith('-review'):
3868 prefix = prefix[:-len('-review')]
3869 return prefix + '.' + self._GOOGLESOURCE
3870
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003871 def _canonical_gerrit_googlesource_host(self, host):
3872 git_host = self._canonical_git_googlesource_host(host)
3873 prefix = git_host.split('.', 1)[0]
3874 return prefix + '-review.' + self._GOOGLESOURCE
3875
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003876 def _get_counterpart_host(self, host):
3877 assert host.endswith(self._GOOGLESOURCE)
3878 git = self._canonical_git_googlesource_host(host)
3879 gerrit = self._canonical_gerrit_googlesource_host(git)
3880 return git if gerrit == host else gerrit
3881
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003882 def has_generic_host(self):
3883 """Returns whether generic .googlesource.com has been configured.
3884
3885 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3886 """
3887 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3888 if host == '.' + self._GOOGLESOURCE:
3889 return True
3890 return False
3891
3892 def _get_git_gerrit_identity_pairs(self):
3893 """Returns map from canonic host to pair of identities (Git, Gerrit).
3894
3895 One of identities might be None, meaning not configured.
3896 """
3897 host_to_identity_pairs = {}
3898 for host, identity, _ in self.get_hosts_with_creds():
3899 canonical = self._canonical_git_googlesource_host(host)
3900 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3901 idx = 0 if canonical == host else 1
3902 pair[idx] = identity
3903 return host_to_identity_pairs
3904
3905 def get_partially_configured_hosts(self):
3906 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003907 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3908 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3909 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003910
3911 def get_conflicting_hosts(self):
3912 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003913 host
3914 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003915 if None not in (i1, i2) and i1 != i2)
3916
3917 def get_duplicated_hosts(self):
3918 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3919 return set(host for host, count in counters.iteritems() if count > 1)
3920
3921 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3922 'chromium.googlesource.com': 'chromium.org',
3923 'chrome-internal.googlesource.com': 'google.com',
3924 }
3925
3926 def get_hosts_with_wrong_identities(self):
3927 """Finds hosts which **likely** reference wrong identities.
3928
3929 Note: skips hosts which have conflicting identities for Git and Gerrit.
3930 """
3931 hosts = set()
3932 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3933 pair = self._get_git_gerrit_identity_pairs().get(host)
3934 if pair and pair[0] == pair[1]:
3935 _, domain = self._parse_identity(pair[0])
3936 if domain != expected:
3937 hosts.add(host)
3938 return hosts
3939
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003940 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003941 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003942 hosts = sorted(hosts)
3943 assert hosts
3944 if extra_column_func is None:
3945 extras = [''] * len(hosts)
3946 else:
3947 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003948 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3949 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003950 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003951 lines.append(tmpl % he)
3952 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003953
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003954 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003955 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003956 yield ('.googlesource.com wildcard record detected',
3957 ['Chrome Infrastructure team recommends to list full host names '
3958 'explicitly.'],
3959 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003960
3961 dups = self.get_duplicated_hosts()
3962 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003963 yield ('The following hosts were defined twice',
3964 self._format_hosts(dups),
3965 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003966
3967 partial = self.get_partially_configured_hosts()
3968 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003969 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3970 'These hosts are missing',
3971 self._format_hosts(partial, lambda host: 'but %s defined' %
3972 self._get_counterpart_host(host)),
3973 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003974
3975 conflicting = self.get_conflicting_hosts()
3976 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003977 yield ('The following Git hosts have differing credentials from their '
3978 'Gerrit counterparts',
3979 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3980 tuple(self._get_git_gerrit_identity_pairs()[host])),
3981 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003982
3983 wrong = self.get_hosts_with_wrong_identities()
3984 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003985 yield ('These hosts likely use wrong identity',
3986 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3987 (self._get_git_gerrit_identity_pairs()[host][0],
3988 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3989 wrong)
3990
3991 def find_and_report_problems(self):
3992 """Returns True if there was at least one problem, else False."""
3993 found = False
3994 bad_hosts = set()
3995 for title, sublines, hosts in self._find_problems():
3996 if not found:
3997 found = True
3998 print('\n\n.gitcookies problem report:\n')
3999 bad_hosts.update(hosts or [])
4000 print(' %s%s' % (title , (':' if sublines else '')))
4001 if sublines:
4002 print()
4003 print(' %s' % '\n '.join(sublines))
4004 print()
4005
4006 if bad_hosts:
4007 assert found
4008 print(' You can manually remove corresponding lines in your %s file and '
4009 'visit the following URLs with correct account to generate '
4010 'correct credential lines:\n' %
4011 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4012 print(' %s' % '\n '.join(sorted(set(
4013 gerrit_util.CookiesAuthenticator().get_new_password_url(
4014 self._canonical_git_googlesource_host(host))
4015 for host in bad_hosts
4016 ))))
4017 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004018
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004019
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004020@metrics.collector.collect_metrics('git cl creds-check')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004021def CMDcreds_check(parser, args):
4022 """Checks credentials and suggests changes."""
4023 _, _ = parser.parse_args(args)
4024
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004025 # Code below checks .gitcookies. Abort if using something else.
4026 authn = gerrit_util.Authenticator.get()
4027 if not isinstance(authn, gerrit_util.CookiesAuthenticator):
4028 if isinstance(authn, gerrit_util.GceAuthenticator):
4029 DieWithError(
4030 'This command is not designed for GCE, are you on a bot?\n'
4031 'If you need to run this on GCE, export SKIP_GCE_AUTH_FOR_GIT=1 '
4032 'in your env.')
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004033 DieWithError(
Vadim Shtayurab250ec12018-10-04 00:21:08 +00004034 'This command is not designed for bot environment. It checks '
4035 '~/.gitcookies file not generally used on bots.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004036
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004037 checker = _GitCookiesChecker()
4038 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004039
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004040 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004041 checker.print_current_creds(include_netrc=True)
4042
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004043 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004044 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004045 return 0
4046 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004047
4048
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004049@subcommand.usage('[repo root containing codereview.settings]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004050@metrics.collector.collect_metrics('git cl config')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004051def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004052 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004053
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004054 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004055 # TODO(tandrii): remove this once we switch to Gerrit.
4056 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004057 parser.add_option('--activate-update', action='store_true',
4058 help='activate auto-updating [rietveld] section in '
4059 '.git/config')
4060 parser.add_option('--deactivate-update', action='store_true',
4061 help='deactivate auto-updating [rietveld] section in '
4062 '.git/config')
4063 options, args = parser.parse_args(args)
4064
4065 if options.deactivate_update:
4066 RunGit(['config', 'rietveld.autoupdate', 'false'])
4067 return
4068
4069 if options.activate_update:
4070 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4071 return
4072
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004073 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004074 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004075 return 0
4076
4077 url = args[0]
4078 if not url.endswith('codereview.settings'):
4079 url = os.path.join(url, 'codereview.settings')
4080
4081 # Load code review settings and download hooks (if available).
4082 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4083 return 0
4084
4085
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004086@metrics.collector.collect_metrics('git cl baseurl')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004087def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004088 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004089 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4090 branch = ShortBranchName(branchref)
4091 _, args = parser.parse_args(args)
4092 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004093 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004094 return RunGit(['config', 'branch.%s.base-url' % branch],
4095 error_ok=False).strip()
4096 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004097 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004098 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4099 error_ok=False).strip()
4100
4101
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004102def color_for_status(status):
4103 """Maps a Changelist status to color, for CMDstatus and other tools."""
4104 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004105 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004106 'waiting': Fore.BLUE,
4107 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004108 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004109 'lgtm': Fore.GREEN,
4110 'commit': Fore.MAGENTA,
4111 'closed': Fore.CYAN,
4112 'error': Fore.WHITE,
4113 }.get(status, Fore.WHITE)
4114
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004115
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004116def get_cl_statuses(changes, fine_grained, max_processes=None):
4117 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004118
4119 If fine_grained is true, this will fetch CL statuses from the server.
4120 Otherwise, simply indicate if there's a matching url for the given branches.
4121
4122 If max_processes is specified, it is used as the maximum number of processes
4123 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4124 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004125
4126 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004127 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004128 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004129 upload.verbosity = 0
4130
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004131 if not changes:
4132 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004133
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004134 if not fine_grained:
4135 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004136 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004137 for cl in changes:
4138 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004139 return
4140
4141 # First, sort out authentication issues.
4142 logging.debug('ensuring credentials exist')
4143 for cl in changes:
4144 cl.EnsureAuthenticated(force=False, refresh=True)
4145
4146 def fetch(cl):
4147 try:
4148 return (cl, cl.GetStatus())
4149 except:
4150 # See http://crbug.com/629863.
Andrii Shyshkalov98824232018-04-19 11:37:15 -07004151 logging.exception('failed to fetch status for cl %s:', cl.GetIssue())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004152 raise
4153
4154 threads_count = len(changes)
4155 if max_processes:
4156 threads_count = max(1, min(threads_count, max_processes))
4157 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4158
4159 pool = ThreadPool(threads_count)
4160 fetched_cls = set()
4161 try:
4162 it = pool.imap_unordered(fetch, changes).__iter__()
4163 while True:
4164 try:
4165 cl, status = it.next(timeout=5)
4166 except multiprocessing.TimeoutError:
4167 break
4168 fetched_cls.add(cl)
4169 yield cl, status
4170 finally:
4171 pool.close()
4172
4173 # Add any branches that failed to fetch.
4174 for cl in set(changes) - fetched_cls:
4175 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004176
rmistry@google.com2dd99862015-06-22 12:22:18 +00004177
4178def upload_branch_deps(cl, args):
4179 """Uploads CLs of local branches that are dependents of the current branch.
4180
4181 If the local branch dependency tree looks like:
4182 test1 -> test2.1 -> test3.1
4183 -> test3.2
4184 -> test2.2 -> test3.3
4185
4186 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4187 run on the dependent branches in this order:
4188 test2.1, test3.1, test3.2, test2.2, test3.3
4189
4190 Note: This function does not rebase your local dependent branches. Use it when
4191 you make a change to the parent branch that will not conflict with its
4192 dependent branches, and you would like their dependencies updated in
4193 Rietveld.
4194 """
4195 if git_common.is_dirty_git_tree('upload-branch-deps'):
4196 return 1
4197
4198 root_branch = cl.GetBranch()
4199 if root_branch is None:
4200 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4201 'Get on a branch!')
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00004202 if not cl.GetIssue():
rmistry@google.com2dd99862015-06-22 12:22:18 +00004203 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4204 'patchset dependencies without an uploaded CL.')
4205
4206 branches = RunGit(['for-each-ref',
4207 '--format=%(refname:short) %(upstream:short)',
4208 'refs/heads'])
4209 if not branches:
4210 print('No local branches found.')
4211 return 0
4212
4213 # Create a dictionary of all local branches to the branches that are dependent
4214 # on it.
4215 tracked_to_dependents = collections.defaultdict(list)
4216 for b in branches.splitlines():
4217 tokens = b.split()
4218 if len(tokens) == 2:
4219 branch_name, tracked = tokens
4220 tracked_to_dependents[tracked].append(branch_name)
4221
vapiera7fbd5a2016-06-16 09:17:49 -07004222 print()
4223 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004224 dependents = []
4225 def traverse_dependents_preorder(branch, padding=''):
4226 dependents_to_process = tracked_to_dependents.get(branch, [])
4227 padding += ' '
4228 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004230 dependents.append(dependent)
4231 traverse_dependents_preorder(dependent, padding)
4232 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004233 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004234
4235 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004236 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004237 return 0
4238
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004239 confirm_or_exit('This command will checkout all dependent branches and run '
4240 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004241
rmistry@google.com2dd99862015-06-22 12:22:18 +00004242 # Record all dependents that failed to upload.
4243 failures = {}
4244 # Go through all dependents, checkout the branch and upload.
4245 try:
4246 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004247 print()
4248 print('--------------------------------------')
4249 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004250 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004251 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004252 try:
4253 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004254 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004255 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004256 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004257 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004258 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004259 finally:
4260 # Swap back to the original root branch.
4261 RunGit(['checkout', '-q', root_branch])
4262
vapiera7fbd5a2016-06-16 09:17:49 -07004263 print()
4264 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004265 for dependent_branch in dependents:
4266 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004267 print(' %s : %s' % (dependent_branch, upload_status))
4268 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004269
4270 return 0
4271
4272
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004273@metrics.collector.collect_metrics('git cl archive')
kmarshall3bff56b2016-06-06 18:31:47 -07004274def CMDarchive(parser, args):
4275 """Archives and deletes branches associated with closed changelists."""
4276 parser.add_option(
4277 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004278 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004279 parser.add_option(
4280 '-f', '--force', action='store_true',
4281 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004282 parser.add_option(
4283 '-d', '--dry-run', action='store_true',
4284 help='Skip the branch tagging and removal steps.')
4285 parser.add_option(
4286 '-t', '--notags', action='store_true',
4287 help='Do not tag archived branches. '
4288 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004289
4290 auth.add_auth_options(parser)
4291 options, args = parser.parse_args(args)
4292 if args:
4293 parser.error('Unsupported args: %s' % ' '.join(args))
4294 auth_config = auth.extract_auth_config_from_options(options)
4295
4296 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4297 if not branches:
4298 return 0
4299
vapiera7fbd5a2016-06-16 09:17:49 -07004300 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004301 changes = [Changelist(branchref=b, auth_config=auth_config)
4302 for b in branches.splitlines()]
4303 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4304 statuses = get_cl_statuses(changes,
4305 fine_grained=True,
4306 max_processes=options.maxjobs)
4307 proposal = [(cl.GetBranch(),
4308 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4309 for cl, status in statuses
4310 if status == 'closed']
4311 proposal.sort()
4312
4313 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004314 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004315 return 0
4316
4317 current_branch = GetCurrentBranch()
4318
vapiera7fbd5a2016-06-16 09:17:49 -07004319 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004320 if options.notags:
4321 for next_item in proposal:
4322 print(' ' + next_item[0])
4323 else:
4324 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4325 for next_item in proposal:
4326 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004327
kmarshall9249e012016-08-23 12:02:16 -07004328 # Quit now on precondition failure or if instructed by the user, either
4329 # via an interactive prompt or by command line flags.
4330 if options.dry_run:
4331 print('\nNo changes were made (dry run).\n')
4332 return 0
4333 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004334 print('You are currently on a branch \'%s\' which is associated with a '
4335 'closed codereview issue, so archive cannot proceed. Please '
4336 'checkout another branch and run this command again.' %
4337 current_branch)
4338 return 1
kmarshall9249e012016-08-23 12:02:16 -07004339 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004340 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4341 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004342 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004343 return 1
4344
4345 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004346 if not options.notags:
4347 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004348 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004349
vapiera7fbd5a2016-06-16 09:17:49 -07004350 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004351
4352 return 0
4353
4354
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004355@metrics.collector.collect_metrics('git cl status')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004356def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004357 """Show status of changelists.
4358
4359 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004360 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004361 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004362 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004363 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004364 - Magenta in the commit queue
4365 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004366 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004367
4368 Also see 'git cl comments'.
4369 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004370 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004371 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004372 parser.add_option('-f', '--fast', action='store_true',
4373 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004374 parser.add_option(
4375 '-j', '--maxjobs', action='store', type=int,
4376 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004377
4378 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004379 _add_codereview_issue_select_options(
4380 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004381 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004382 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004383 if args:
4384 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004385 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004386
iannuccie53c9352016-08-17 14:40:40 -07004387 if options.issue is not None and not options.field:
4388 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004389
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004390 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004391 cl = Changelist(auth_config=auth_config, issue=options.issue,
4392 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004393 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004394 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004395 elif options.field == 'id':
4396 issueid = cl.GetIssue()
4397 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004398 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004399 elif options.field == 'patch':
Aaron Gablee8856ee2017-12-07 12:41:46 -08004400 patchset = cl.GetMostRecentPatchset()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004401 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004402 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004403 elif options.field == 'status':
4404 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004405 elif options.field == 'url':
4406 url = cl.GetIssueURL()
4407 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004408 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004409 return 0
4410
4411 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4412 if not branches:
4413 print('No local branch found.')
4414 return 0
4415
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004416 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004417 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004418 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004419 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004420 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004421 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004422 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004423
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004424 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004425 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4426 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4427 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004428 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004429 c, status = output.next()
4430 branch_statuses[c.GetBranch()] = status
4431 status = branch_statuses.pop(branch)
4432 url = cl.GetIssueURL()
4433 if url and (not status or status == 'error'):
4434 # The issue probably doesn't exist anymore.
4435 url += ' (broken)'
4436
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004437 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004438 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004439 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004440 color = ''
4441 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004442 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004443 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004444 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004445 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004446
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004447
4448 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004449 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004450 print('Current branch: %s' % branch)
4451 for cl in changes:
4452 if cl.GetBranch() == branch:
4453 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004454 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004455 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004456 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004457 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004458 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004459 print('Issue description:')
4460 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004461 return 0
4462
4463
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004464def colorize_CMDstatus_doc():
4465 """To be called once in main() to add colors to git cl status help."""
4466 colors = [i for i in dir(Fore) if i[0].isupper()]
4467
4468 def colorize_line(line):
4469 for color in colors:
4470 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004471 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004472 indent = len(line) - len(line.lstrip(' ')) + 1
4473 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4474 return line
4475
4476 lines = CMDstatus.__doc__.splitlines()
4477 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4478
4479
phajdan.jre328cf92016-08-22 04:12:17 -07004480def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004481 if path == '-':
4482 json.dump(contents, sys.stdout)
4483 else:
4484 with open(path, 'w') as f:
4485 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004486
4487
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004488@subcommand.usage('[issue_number]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004489@metrics.collector.collect_metrics('git cl issue')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004490def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004491 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004492
4493 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004494 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004495 parser.add_option('-r', '--reverse', action='store_true',
4496 help='Lookup the branch(es) for the specified issues. If '
4497 'no issues are specified, all branches with mapped '
4498 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004499 parser.add_option('--json',
4500 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004501 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004502 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004503 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004504
dnj@chromium.org406c4402015-03-03 17:22:28 +00004505 if options.reverse:
4506 branches = RunGit(['for-each-ref', 'refs/heads',
Aaron Gablead64abd2017-12-04 09:49:13 -08004507 '--format=%(refname)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004508 # Reverse issue lookup.
4509 issue_branch_map = {}
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004510
4511 git_config = {}
4512 for config in RunGit(['config', '--get-regexp',
4513 r'branch\..*issue']).splitlines():
4514 name, _space, val = config.partition(' ')
4515 git_config[name] = val
4516
dnj@chromium.org406c4402015-03-03 17:22:28 +00004517 for branch in branches:
Daniel Bratellb56a43a2018-09-06 15:49:03 +00004518 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
4519 config_key = _git_branch_config_key(ShortBranchName(branch),
4520 cls.IssueConfigKey())
4521 issue = git_config.get(config_key)
4522 if issue:
4523 issue_branch_map.setdefault(int(issue), []).append(branch)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004524 if not args:
4525 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004526 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004527 for issue in args:
4528 if not issue:
4529 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004530 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004531 print('Branch for issue number %s: %s' % (
4532 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004533 if options.json:
4534 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004535 return 0
4536
4537 if len(args) > 0:
4538 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4539 if not issue.valid:
4540 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4541 'or no argument to list it.\n'
4542 'Maybe you want to run git cl status?')
4543 cl = Changelist(codereview=issue.codereview)
4544 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004545 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004546 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004547 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4548 if options.json:
4549 write_json(options.json, {
4550 'issue': cl.GetIssue(),
4551 'issue_url': cl.GetIssueURL(),
4552 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553 return 0
4554
4555
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004556@metrics.collector.collect_metrics('git cl comments')
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004557def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004558 """Shows or posts review comments for any changelist."""
4559 parser.add_option('-a', '--add-comment', dest='comment',
4560 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004561 parser.add_option('-i', '--issue', dest='issue',
4562 help='review issue id (defaults to current issue). '
4563 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004564 parser.add_option('-m', '--machine-readable', dest='readable',
4565 action='store_false', default=True,
4566 help='output comments in a format compatible with '
4567 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004568 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004569 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004570 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004571 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004572 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004573 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004574 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004575
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004576 issue = None
4577 if options.issue:
4578 try:
4579 issue = int(options.issue)
4580 except ValueError:
4581 DieWithError('A review issue id is expected to be a number')
4582
Andrii Shyshkalov642641d2018-10-16 05:54:41 +00004583 cl = Changelist(issue=issue, codereview='gerrit', auth_config=auth_config)
4584
4585 if not cl.IsGerrit():
4586 parser.error('rietveld is not supported')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004587
4588 if options.comment:
4589 cl.AddComment(options.comment)
4590 return 0
4591
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004592 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4593 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004594 for comment in summary:
4595 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004596 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004597 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004598 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004599 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004600 color = Fore.MAGENTA
4601 else:
4602 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004603 print('\n%s%s %s%s\n%s' % (
4604 color,
4605 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4606 comment.sender,
4607 Fore.RESET,
4608 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4609
smut@google.comc85ac942015-09-15 16:34:43 +00004610 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004611 def pre_serialize(c):
4612 dct = c.__dict__.copy()
4613 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4614 return dct
Leszek Swirski45b20c42018-09-17 17:05:26 +00004615 write_json(options.json_file, map(pre_serialize, summary))
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004616 return 0
4617
4618
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004619@subcommand.usage('[codereview url or issue id]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004620@metrics.collector.collect_metrics('git cl description')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004621def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004622 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004623 parser.add_option('-d', '--display', action='store_true',
4624 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004625 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004626 help='New description to set for this issue (- for stdin, '
4627 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004628 parser.add_option('-f', '--force', action='store_true',
4629 help='Delete any unpublished Gerrit edits for this issue '
4630 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004631
4632 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004633 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004634 options, args = parser.parse_args(args)
4635 _process_codereview_select_options(parser, options)
4636
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004637 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004638 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004639 target_issue_arg = ParseIssueNumberArgument(args[0],
4640 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004641 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004642 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004643
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004644 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004645
martiniss6eda05f2016-06-30 10:18:35 -07004646 kwargs = {
4647 'auth_config': auth_config,
4648 'codereview': options.forced_codereview,
4649 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004650 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004651 if target_issue_arg:
4652 kwargs['issue'] = target_issue_arg.issue
4653 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004654 if target_issue_arg.codereview and not options.forced_codereview:
4655 detected_codereview_from_url = True
4656 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004657
4658 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004659 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004660 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004661 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004662
4663 if detected_codereview_from_url:
4664 logging.info('canonical issue/change URL: %s (type: %s)\n',
4665 cl.GetIssueURL(), target_issue_arg.codereview)
4666
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004667 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004668
smut@google.com34fb6b12015-07-13 20:03:26 +00004669 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004670 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004671 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004672
4673 if options.new_description:
4674 text = options.new_description
4675 if text == '-':
4676 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004677 elif text == '+':
4678 base_branch = cl.GetCommonAncestorWithUpstream()
4679 change = cl.GetChange(base_branch, None, local_description=True)
4680 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004681
4682 description.set_description(text)
4683 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004684 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004685
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004686 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004687 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004688 return 0
4689
4690
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004691def CreateDescriptionFromLog(args):
4692 """Pulls out the commit log to use as a base for the CL description."""
4693 log_args = []
4694 if len(args) == 1 and not args[0].endswith('.'):
4695 log_args = [args[0] + '..']
4696 elif len(args) == 1 and args[0].endswith('...'):
4697 log_args = [args[0][:-1]]
4698 elif len(args) == 2:
4699 log_args = [args[0] + '..' + args[1]]
4700 else:
4701 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004702 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004703
4704
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004705@metrics.collector.collect_metrics('git cl lint')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004706def CMDlint(parser, args):
4707 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004708 parser.add_option('--filter', action='append', metavar='-x,+y',
4709 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004710 auth.add_auth_options(parser)
4711 options, args = parser.parse_args(args)
4712 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004713
4714 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004715 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004716 try:
4717 import cpplint
4718 import cpplint_chromium
4719 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004720 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004721 return 1
4722
4723 # Change the current working directory before calling lint so that it
4724 # shows the correct base.
4725 previous_cwd = os.getcwd()
4726 os.chdir(settings.GetRoot())
4727 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004728 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004729 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4730 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004731 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004732 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004733 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004734
4735 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004736 command = args + files
4737 if options.filter:
4738 command = ['--filter=' + ','.join(options.filter)] + command
4739 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004740
4741 white_regex = re.compile(settings.GetLintRegex())
4742 black_regex = re.compile(settings.GetLintIgnoreRegex())
4743 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4744 for filename in filenames:
4745 if white_regex.match(filename):
4746 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004747 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004748 else:
4749 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4750 extra_check_functions)
4751 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004752 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004753 finally:
4754 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004755 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004756 if cpplint._cpplint_state.error_count != 0:
4757 return 1
4758 return 0
4759
4760
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004761@metrics.collector.collect_metrics('git cl presubmit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004762def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004763 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004764 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004765 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004766 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004767 help='Run checks even if tree is dirty')
Aaron Gable8076c282017-11-29 14:39:41 -08004768 parser.add_option('--all', action='store_true',
4769 help='Run checks against all files, not just modified ones')
Edward Lesmes8e282792018-04-03 18:50:29 -04004770 parser.add_option('--parallel', action='store_true',
4771 help='Run all tests specified by input_api.RunTests in all '
4772 'PRESUBMIT files in parallel.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004773 auth.add_auth_options(parser)
4774 options, args = parser.parse_args(args)
4775 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004776
sbc@chromium.org71437c02015-04-09 19:29:40 +00004777 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004778 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004779 return 1
4780
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004781 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004782 if args:
4783 base_branch = args[0]
4784 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004785 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004786 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004787
Aaron Gable8076c282017-11-29 14:39:41 -08004788 if options.all:
4789 base_change = cl.GetChange(base_branch, None)
4790 files = [('M', f) for f in base_change.AllFiles()]
4791 change = presubmit_support.GitChange(
4792 base_change.Name(),
4793 base_change.FullDescriptionText(),
4794 base_change.RepositoryRoot(),
4795 files,
4796 base_change.issue,
4797 base_change.patchset,
4798 base_change.author_email,
4799 base_change._upstream)
4800 else:
4801 change = cl.GetChange(base_branch, None)
4802
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004803 cl.RunHook(
4804 committing=not options.upload,
4805 may_prompt=False,
4806 verbose=options.verbose,
Edward Lesmes8e282792018-04-03 18:50:29 -04004807 change=change,
4808 parallel=options.parallel)
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004809 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004810
4811
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004812def GenerateGerritChangeId(message):
4813 """Returns Ixxxxxx...xxx change id.
4814
4815 Works the same way as
4816 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4817 but can be called on demand on all platforms.
4818
4819 The basic idea is to generate git hash of a state of the tree, original commit
4820 message, author/committer info and timestamps.
4821 """
4822 lines = []
4823 tree_hash = RunGitSilent(['write-tree'])
4824 lines.append('tree %s' % tree_hash.strip())
4825 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4826 if code == 0:
4827 lines.append('parent %s' % parent.strip())
4828 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4829 lines.append('author %s' % author.strip())
4830 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4831 lines.append('committer %s' % committer.strip())
4832 lines.append('')
4833 # Note: Gerrit's commit-hook actually cleans message of some lines and
4834 # whitespace. This code is not doing this, but it clearly won't decrease
4835 # entropy.
4836 lines.append(message)
4837 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4838 stdin='\n'.join(lines))
4839 return 'I%s' % change_hash.strip()
4840
4841
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004842def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004843 """Computes the remote branch ref to use for the CL.
4844
4845 Args:
4846 remote (str): The git remote for the CL.
4847 remote_branch (str): The git remote branch for the CL.
4848 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004849 """
4850 if not (remote and remote_branch):
4851 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004852
wittman@chromium.org455dc922015-01-26 20:15:50 +00004853 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004854 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004855 # refs, which are then translated into the remote full symbolic refs
4856 # below.
4857 if '/' not in target_branch:
4858 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4859 else:
4860 prefix_replacements = (
4861 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4862 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4863 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4864 )
4865 match = None
4866 for regex, replacement in prefix_replacements:
4867 match = re.search(regex, target_branch)
4868 if match:
4869 remote_branch = target_branch.replace(match.group(0), replacement)
4870 break
4871 if not match:
4872 # This is a branch path but not one we recognize; use as-is.
4873 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004874 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4875 # Handle the refs that need to land in different refs.
4876 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004877
wittman@chromium.org455dc922015-01-26 20:15:50 +00004878 # Create the true path to the remote branch.
4879 # Does the following translation:
4880 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4881 # * refs/remotes/origin/master -> refs/heads/master
4882 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4883 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4884 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4885 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4886 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4887 'refs/heads/')
4888 elif remote_branch.startswith('refs/remotes/branch-heads'):
4889 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004890
wittman@chromium.org455dc922015-01-26 20:15:50 +00004891 return remote_branch
4892
4893
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004894def cleanup_list(l):
4895 """Fixes a list so that comma separated items are put as individual items.
4896
4897 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4898 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4899 """
4900 items = sum((i.split(',') for i in l), [])
4901 stripped_items = (i.strip() for i in items)
4902 return sorted(filter(None, stripped_items))
4903
4904
Aaron Gable4db38df2017-11-03 14:59:07 -07004905@subcommand.usage('[flags]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00004906@metrics.collector.collect_metrics('git cl upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004907def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004908 """Uploads the current changelist to codereview.
4909
4910 Can skip dependency patchset uploads for a branch by running:
4911 git config branch.branch_name.skip-deps-uploads True
4912 To unset run:
4913 git config --unset branch.branch_name.skip-deps-uploads
4914 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004915
4916 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4917 a bug number, this bug number is automatically populated in the CL
4918 description.
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004919
4920 If subject contains text in square brackets or has "<text>: " prefix, such
4921 text(s) is treated as Gerrit hashtags. For example, CLs with subjects
4922 [git-cl] add support for hashtags
4923 Foo bar: implement foo
4924 will be hashtagged with "git-cl" and "foo-bar" respectively.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004925 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004926 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4927 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004928 parser.add_option('--bypass-watchlists', action='store_true',
4929 dest='bypass_watchlists',
4930 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004931 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004932 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004933 parser.add_option('--message', '-m', dest='message',
4934 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004935 parser.add_option('-b', '--bug',
4936 help='pre-populate the bug number(s) for this issue. '
4937 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004938 parser.add_option('--message-file', dest='message_file',
4939 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004940 parser.add_option('--title', '-t', dest='title',
4941 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004942 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004943 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004944 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004945 parser.add_option('--tbrs',
4946 action='append', default=[],
4947 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004948 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004949 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004950 help='cc email addresses')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004951 parser.add_option('--hashtag', dest='hashtags',
4952 action='append', default=[],
4953 help=('Gerrit hashtag for new CL; '
4954 'can be applied multiple times'))
adamk@chromium.org36f47302013-04-05 01:08:31 +00004955 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004956 help='send email to reviewer(s) and cc(s) immediately')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004957 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004958 help='tell the commit queue to commit this patchset; '
4959 'implies --send-mail')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004960 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004961 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004962 metavar='TARGET',
4963 help='Apply CL to remote ref TARGET. ' +
4964 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004965 parser.add_option('--squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004966 help='Squash multiple commits into one')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004967 parser.add_option('--no-squash', action='store_true',
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004968 help='Don\'t squash multiple commits into one')
rmistry9eadede2016-09-19 11:22:43 -07004969 parser.add_option('--topic', default=None,
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004970 help='Topic to specify when uploading')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004971 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4972 const='TBR', help='add a set of OWNERS to TBR')
4973 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4974 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004975 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4976 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004977 help='Send the patchset to do a CQ dry run right after '
4978 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004979 parser.add_option('--dependencies', action='store_true',
4980 help='Uploads CLs of all the local branches that depend on '
4981 'the current branch')
Ravi Mistry31e7d562018-04-02 12:53:57 -04004982 parser.add_option('-a', '--enable-auto-submit', action='store_true',
4983 help='Sends your change to the CQ after an approval. Only '
4984 'works on repos that have the Auto-Submit label '
4985 'enabled')
Edward Lesmes8e282792018-04-03 18:50:29 -04004986 parser.add_option('--parallel', action='store_true',
4987 help='Run all tests specified by input_api.RunTests in all '
4988 'PRESUBMIT files in parallel.')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004989
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004990 parser.add_option('--no-autocc', action='store_true',
4991 help='Disables automatic addition of CC emails')
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -08004992 parser.add_option('--private', action='store_true',
Sergiy Byelozyorov1aa405f2018-09-18 17:38:43 +00004993 help='Set the review private. This implies --no-autocc.')
4994
rmistry@google.com2dd99862015-06-22 12:22:18 +00004995 orig_args = args
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004996 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004997 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004998 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004999 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005000 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005001
sbc@chromium.org71437c02015-04-09 19:29:40 +00005002 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00005003 return 1
5004
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005005 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005006 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00005007 options.cc = cleanup_list(options.cc)
5008
tandriib80458a2016-06-23 12:20:07 -07005009 if options.message_file:
5010 if options.message:
5011 parser.error('only one of --message and --message-file allowed.')
5012 options.message = gclient_utils.FileRead(options.message_file)
5013 options.message_file = None
5014
tandrii4d0545a2016-07-06 03:56:49 -07005015 if options.cq_dry_run and options.use_commit_queue:
5016 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
5017
Aaron Gableedbc4132017-09-11 13:22:28 -07005018 if options.use_commit_queue:
5019 options.send_mail = True
5020
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00005021 # For sanity of test expectations, do this otherwise lazy-loading *now*.
5022 settings.GetIsGerrit()
5023
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005024 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
Andrii Shyshkalov9f274432018-10-15 16:40:23 +00005025 if not cl.IsGerrit():
5026 # Error out with instructions for repos not yet configured for Gerrit.
5027 print('=====================================')
5028 print('NOTICE: Rietveld is no longer supported. '
5029 'You can upload changes to Gerrit with')
5030 print(' git cl upload --gerrit')
5031 print('or set Gerrit to be your default code review tool with')
5032 print(' git config gerrit.host true')
5033 print('=====================================')
5034 return 1
5035
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00005036 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00005037
5038
Francois Dorayd42c6812017-05-30 15:10:20 -04005039@subcommand.usage('--description=<description file>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005040@metrics.collector.collect_metrics('git cl split')
Francois Dorayd42c6812017-05-30 15:10:20 -04005041def CMDsplit(parser, args):
5042 """Splits a branch into smaller branches and uploads CLs.
5043
5044 Creates a branch and uploads a CL for each group of files modified in the
5045 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005046 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04005047 the shared OWNERS file.
5048 """
5049 parser.add_option("-d", "--description", dest="description_file",
Gabriel Charette02b5ee82017-11-08 16:36:05 -05005050 help="A text file containing a CL description in which "
5051 "$directory will be replaced by each CL's directory.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005052 parser.add_option("-c", "--comment", dest="comment_file",
5053 help="A text file containing a CL comment.")
Chris Watkinsba28e462017-12-13 11:22:17 +11005054 parser.add_option("-n", "--dry-run", dest="dry_run", action='store_true',
5055 default=False,
5056 help="List the files and reviewers for each CL that would "
5057 "be created, but don't create branches or CLs.")
Stephen Martiniscb326682018-08-29 21:06:30 +00005058 parser.add_option("--cq-dry-run", action='store_true',
5059 help="If set, will do a cq dry run for each uploaded CL. "
5060 "Please be careful when doing this; more than ~10 CLs "
5061 "has the potential to overload our build "
5062 "infrastructure. Try to upload these not during high "
5063 "load times (usually 11-3 Mountain View time). Email "
5064 "infra-dev@chromium.org with any questions.")
Francois Dorayd42c6812017-05-30 15:10:20 -04005065 options, _ = parser.parse_args(args)
5066
5067 if not options.description_file:
5068 parser.error('No --description flag specified.')
5069
5070 def WrappedCMDupload(args):
5071 return CMDupload(OptionParser(), args)
5072
5073 return split_cl.SplitCl(options.description_file, options.comment_file,
Stephen Martiniscb326682018-08-29 21:06:30 +00005074 Changelist, WrappedCMDupload, options.dry_run,
5075 options.cq_dry_run)
Francois Dorayd42c6812017-05-30 15:10:20 -04005076
5077
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005078@subcommand.usage('DEPRECATED')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005079@metrics.collector.collect_metrics('git cl commit')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005080def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005081 """DEPRECATED: Used to commit the current changelist via git-svn."""
5082 message = ('git-cl no longer supports committing to SVN repositories via '
5083 'git-svn. You probably want to use `git cl land` instead.')
5084 print(message)
5085 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005086
5087
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005088# Two special branches used by git cl land.
5089MERGE_BRANCH = 'git-cl-commit'
5090CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5091
5092
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005093@subcommand.usage('[upstream branch to apply against]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005094@metrics.collector.collect_metrics('git cl land')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005095def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005096 """Commits the current changelist via git.
5097
5098 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5099 upstream and closes the issue automatically and atomically.
5100
5101 Otherwise (in case of Rietveld):
5102 Squashes branch into a single commit.
5103 Updates commit message with metadata (e.g. pointer to review).
5104 Pushes the code upstream.
5105 Updates review and closes.
5106 """
5107 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5108 help='bypass upload presubmit hook')
5109 parser.add_option('-m', dest='message',
5110 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005111 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005112 help="force yes to questions (don't prompt)")
5113 parser.add_option('-c', dest='contributor',
5114 help="external contributor for patch (appended to " +
5115 "description and used as author for git). Should be " +
5116 "formatted as 'First Last <email@example.com>'")
Edward Lesmes67b3faa2018-04-13 17:50:52 -04005117 parser.add_option('--parallel', action='store_true',
5118 help='Run all tests specified by input_api.RunTests in all '
5119 'PRESUBMIT files in parallel.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005120 auth.add_auth_options(parser)
5121 (options, args) = parser.parse_args(args)
5122 auth_config = auth.extract_auth_config_from_options(options)
5123
5124 cl = Changelist(auth_config=auth_config)
5125
Robert Iannucci2e73d432018-03-14 01:10:47 -07005126 if not cl.IsGerrit():
5127 parser.error('rietveld is not supported')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005128
Robert Iannucci2e73d432018-03-14 01:10:47 -07005129 if options.message:
5130 # This could be implemented, but it requires sending a new patch to
5131 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5132 # Besides, Gerrit has the ability to change the commit message on submit
5133 # automatically, thus there is no need to support this option (so far?).
5134 parser.error('-m MESSAGE option is not supported for Gerrit.')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005135 if options.contributor:
Robert Iannucci2e73d432018-03-14 01:10:47 -07005136 parser.error(
5137 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5138 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5139 'the contributor\'s "name <email>". If you can\'t upload such a '
5140 'commit for review, contact your repository admin and request'
5141 '"Forge-Author" permission.')
5142 if not cl.GetIssue():
5143 DieWithError('You must upload the change first to Gerrit.\n'
5144 ' If you would rather have `git cl land` upload '
5145 'automatically for you, see http://crbug.com/642759')
5146 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
Olivier Robin75ee7252018-04-13 10:02:56 +02005147 options.verbose, options.parallel)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005148
5149
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005150def PushToGitWithAutoRebase(remote, branch, original_description,
5151 git_numberer_enabled, max_attempts=3):
5152 """Pushes current HEAD commit on top of remote's branch.
5153
5154 Attempts to fetch and autorebase on push failures.
5155 Adds git number footers on the fly.
5156
5157 Returns integer code from last command.
5158 """
5159 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5160 code = 0
5161 attempts_left = max_attempts
5162 while attempts_left:
5163 attempts_left -= 1
5164 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5165
5166 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5167 # If fetch fails, retry.
5168 print('Fetching %s/%s...' % (remote, branch))
5169 code, out = RunGitWithCode(
5170 ['retry', 'fetch', remote,
5171 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5172 if code:
5173 print('Fetch failed with exit code %d.' % code)
5174 print(out.strip())
5175 continue
5176
5177 print('Cherry-picking commit on top of latest %s' % branch)
5178 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5179 suppress_stderr=True)
5180 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5181 code, out = RunGitWithCode(['cherry-pick', cherry])
5182 if code:
5183 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5184 'the following files have merge conflicts:' %
5185 (branch, parent_hash))
Aaron Gable7817f022017-12-12 09:43:17 -08005186 print(RunGit(['-c', 'core.quotePath=false', 'diff',
5187 '--name-status', '--diff-filter=U']).strip())
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005188 print('Please rebase your patch and try again.')
5189 RunGitWithCode(['cherry-pick', '--abort'])
5190 break
5191
5192 commit_desc = ChangeDescription(original_description)
5193 if git_numberer_enabled:
5194 logging.debug('Adding git number footers')
5195 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5196 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5197 branch)
5198 # Ensure timestamps are monotonically increasing.
5199 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5200 _get_committer_timestamp('HEAD'))
5201 _git_amend_head(commit_desc.description, timestamp)
5202
5203 code, out = RunGitWithCode(
5204 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5205 print(out)
5206 if code == 0:
5207 break
5208 if IsFatalPushFailure(out):
5209 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005210 'user.email are correct and you have push access to the repo.\n'
5211 'Hint: run command below to diangose common Git/Gerrit credential '
5212 'problems:\n'
5213 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005214 break
5215 return code
5216
5217
5218def IsFatalPushFailure(push_stdout):
5219 """True if retrying push won't help."""
5220 return '(prohibited by Gerrit)' in push_stdout
5221
5222
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005223@subcommand.usage('<patch url or issue id or issue url>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005224@metrics.collector.collect_metrics('git cl patch')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005225def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005226 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005227 parser.add_option('-b', dest='newbranch',
5228 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005229 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005230 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005231 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005232 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005233 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005234 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005235 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005236 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005237 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005238 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005239
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005240
5241 group = optparse.OptionGroup(
5242 parser,
5243 'Options for continuing work on the current issue uploaded from a '
5244 'different clone (e.g. different machine). Must be used independently '
5245 'from the other options. No issue number should be specified, and the '
5246 'branch must have an issue number associated with it')
5247 group.add_option('--reapply', action='store_true', dest='reapply',
5248 help='Reset the branch and reapply the issue.\n'
5249 'CAUTION: This will undo any local changes in this '
5250 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005251
5252 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005253 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005254 parser.add_option_group(group)
5255
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005256 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005257 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005258 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005259 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005260 auth_config = auth.extract_auth_config_from_options(options)
5261
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005262 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005263 if options.newbranch:
5264 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005265 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005266 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005267
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005268 cl = Changelist(auth_config=auth_config,
5269 codereview=options.forced_codereview)
5270 if not cl.GetIssue():
5271 parser.error('current branch must have an associated issue')
5272
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005273 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005274 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005275 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005276
5277 RunGit(['reset', '--hard', upstream])
5278 if options.pull:
5279 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005280
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005281 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5282 options.directory)
5283
5284 if len(args) != 1 or not args[0]:
5285 parser.error('Must specify issue number or url')
5286
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005287 target_issue_arg = ParseIssueNumberArgument(args[0],
5288 options.forced_codereview)
5289 if not target_issue_arg.valid:
5290 parser.error('invalid codereview url or CL id')
5291
5292 cl_kwargs = {
5293 'auth_config': auth_config,
5294 'codereview_host': target_issue_arg.hostname,
5295 'codereview': options.forced_codereview,
5296 }
5297 detected_codereview_from_url = False
5298 if target_issue_arg.codereview and not options.forced_codereview:
5299 detected_codereview_from_url = True
5300 cl_kwargs['codereview'] = target_issue_arg.codereview
5301 cl_kwargs['issue'] = target_issue_arg.issue
5302
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005303 # We don't want uncommitted changes mixed up with the patch.
5304 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005305 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005306
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005307 if options.newbranch:
5308 if options.force:
5309 RunGit(['branch', '-D', options.newbranch],
5310 stderr=subprocess2.PIPE, error_ok=True)
5311 RunGit(['new-branch', options.newbranch])
5312
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005313 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005314
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005315 if cl.IsGerrit():
5316 if options.reject:
5317 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005318 if options.directory:
5319 parser.error('--directory is not supported with Gerrit codereview.')
5320
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005321 if detected_codereview_from_url:
5322 print('canonical issue/change URL: %s (type: %s)\n' %
5323 (cl.GetIssueURL(), target_issue_arg.codereview))
5324
5325 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005326 options.nocommit, options.directory,
5327 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005328
5329
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005330def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005331 """Fetches the tree status and returns either 'open', 'closed',
5332 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005333 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005334 if url:
5335 status = urllib2.urlopen(url).read().lower()
5336 if status.find('closed') != -1 or status == '0':
5337 return 'closed'
5338 elif status.find('open') != -1 or status == '1':
5339 return 'open'
5340 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005341 return 'unset'
5342
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005343
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005344def GetTreeStatusReason():
5345 """Fetches the tree status from a json url and returns the message
5346 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005347 url = settings.GetTreeStatusUrl()
5348 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005349 connection = urllib2.urlopen(json_url)
5350 status = json.loads(connection.read())
5351 connection.close()
5352 return status['message']
5353
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005354
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005355@metrics.collector.collect_metrics('git cl tree')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005356def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005357 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005358 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005359 status = GetTreeStatus()
5360 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005361 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005362 return 2
5363
vapiera7fbd5a2016-06-16 09:17:49 -07005364 print('The tree is %s' % status)
5365 print()
5366 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005367 if status != 'open':
5368 return 1
5369 return 0
5370
5371
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005372@metrics.collector.collect_metrics('git cl try')
maruel@chromium.org15192402012-09-06 12:38:29 +00005373def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005374 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005375 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005376 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005377 '-b', '--bot', action='append',
5378 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5379 'times to specify multiple builders. ex: '
5380 '"-b win_rel -b win_layout". See '
5381 'the try server waterfall for the builders name and the tests '
5382 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005383 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005384 '-B', '--bucket', default='',
5385 help=('Buildbucket bucket to send the try requests.'))
5386 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005387 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005388 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005389 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005390 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005391 help='Revision to use for the try job; default: the revision will '
5392 'be determined by the try recipe that builder runs, which usually '
5393 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005394 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005395 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005396 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005397 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005398 group.add_option(
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005399 '--category', default='git_cl_try', help='Specify custom build category.')
5400 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005401 '--project',
5402 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005403 'in recipe to determine to which repository or directory to '
5404 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005405 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005406 '-p', '--property', dest='properties', action='append', default=[],
5407 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005408 'key2=value2 etc. The value will be treated as '
5409 'json if decodable, or as string otherwise. '
5410 'NOTE: using this may make your try job not usable for CQ, '
5411 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005412 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005413 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5414 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005415 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005416 auth.add_auth_options(parser)
Koji Ishii31c14782018-01-08 17:17:33 +09005417 _add_codereview_issue_select_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005418 options, args = parser.parse_args(args)
Koji Ishii31c14782018-01-08 17:17:33 +09005419 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005420 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005421
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005422 if options.master and options.master.startswith('luci.'):
5423 parser.error(
5424 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005425 # Make sure that all properties are prop=value pairs.
5426 bad_params = [x for x in options.properties if '=' not in x]
5427 if bad_params:
5428 parser.error('Got properties with missing "=": %s' % bad_params)
5429
maruel@chromium.org15192402012-09-06 12:38:29 +00005430 if args:
5431 parser.error('Unknown arguments: %s' % args)
5432
Koji Ishii31c14782018-01-08 17:17:33 +09005433 cl = Changelist(auth_config=auth_config, issue=options.issue,
5434 codereview=options.forced_codereview)
maruel@chromium.org15192402012-09-06 12:38:29 +00005435 if not cl.GetIssue():
5436 parser.error('Need to upload first')
5437
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005438 if cl.IsGerrit():
5439 # HACK: warm up Gerrit change detail cache to save on RPCs.
5440 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5441
tandriie113dfd2016-10-11 10:20:12 -07005442 error_message = cl.CannotTriggerTryJobReason()
5443 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005444 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005445
borenet6c0efe62016-10-19 08:13:29 -07005446 if options.bucket and options.master:
5447 parser.error('Only one of --bucket and --master may be used.')
5448
qyearsley1fdfcb62016-10-24 13:22:03 -07005449 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005450
qyearsleydd49f942016-10-28 11:57:22 -07005451 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5452 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005453 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005454 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005455 print('git cl try with no bots now defaults to CQ dry run.')
5456 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5457 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005458
borenet6c0efe62016-10-19 08:13:29 -07005459 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005460 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005461 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005462 'of bot requires an initial job from a parent (usually a builder). '
5463 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005464 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005465 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005466
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005467 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005468 # TODO(tandrii): Checking local patchset against remote patchset is only
5469 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5470 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005471 print('Warning: Codereview server has newer patchsets (%s) than most '
5472 'recent upload from local checkout (%s). Did a previous upload '
5473 'fail?\n'
5474 'By default, git cl try uses the latest patchset from '
5475 'codereview, continuing to use patchset %s.\n' %
5476 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005477
tandrii568043b2016-10-11 07:49:18 -07005478 try:
Andrii Shyshkalovf9648b52018-02-21 22:32:42 -08005479 _trigger_try_jobs(auth_config, cl, buckets, options, patchset)
tandrii568043b2016-10-11 07:49:18 -07005480 except BuildbucketResponseException as ex:
5481 print('ERROR: %s' % ex)
5482 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005483 return 0
5484
5485
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005486@metrics.collector.collect_metrics('git cl try-results')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005487def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005488 """Prints info about try jobs associated with current CL."""
5489 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005490 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005491 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005492 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005493 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005494 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005495 '--color', action='store_true', default=setup_color.IS_TTY,
5496 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005497 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005498 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5499 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005500 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005501 '--json', help=('Path of JSON output file to write try job results to,'
5502 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005503 parser.add_option_group(group)
5504 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005505 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005506 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005507 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005508 if args:
5509 parser.error('Unrecognized args: %s' % ' '.join(args))
5510
5511 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005512 cl = Changelist(
5513 issue=options.issue, codereview=options.forced_codereview,
5514 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005515 if not cl.GetIssue():
5516 parser.error('Need to upload first')
5517
tandrii221ab252016-10-06 08:12:04 -07005518 patchset = options.patchset
5519 if not patchset:
5520 patchset = cl.GetMostRecentPatchset()
5521 if not patchset:
5522 parser.error('Codereview doesn\'t know about issue %s. '
5523 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005524 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005525 cl.GetIssue())
5526
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005527 # TODO(tandrii): Checking local patchset against remote patchset is only
5528 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5529 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005530 print('Warning: Codereview server has newer patchsets (%s) than most '
5531 'recent upload from local checkout (%s). Did a previous upload '
5532 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005533 'By default, git cl try-results uses the latest patchset from '
5534 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005535 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005536 try:
tandrii221ab252016-10-06 08:12:04 -07005537 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005538 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005539 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005540 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005541 if options.json:
5542 write_try_results_json(options.json, jobs)
5543 else:
5544 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005545 return 0
5546
5547
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005548@subcommand.usage('[new upstream branch]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005549@metrics.collector.collect_metrics('git cl upstream')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005550def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005551 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005552 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005553 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005554 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005555
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005556 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005557 if args:
5558 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005559 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005560 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005561 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005562 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005563
5564 # Clear configured merge-base, if there is one.
5565 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005566 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005567 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005568 return 0
5569
5570
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005571@metrics.collector.collect_metrics('git cl web')
thestig@chromium.org00858c82013-12-02 23:08:03 +00005572def CMDweb(parser, args):
5573 """Opens the current CL in the web browser."""
5574 _, args = parser.parse_args(args)
5575 if args:
5576 parser.error('Unrecognized args: %s' % ' '.join(args))
5577
5578 issue_url = Changelist().GetIssueURL()
5579 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005580 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005581 return 1
5582
5583 webbrowser.open(issue_url)
5584 return 0
5585
5586
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005587@metrics.collector.collect_metrics('git cl set-commit')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005588def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005589 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005590 parser.add_option('-d', '--dry-run', action='store_true',
5591 help='trigger in dry run mode')
5592 parser.add_option('-c', '--clear', action='store_true',
5593 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005594 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005595 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005596 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005597 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005598 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005599 if args:
5600 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005601 if options.dry_run and options.clear:
5602 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5603
iannuccie53c9352016-08-17 14:40:40 -07005604 cl = Changelist(auth_config=auth_config, issue=options.issue,
5605 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005606 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005607 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005608 elif options.dry_run:
5609 state = _CQState.DRY_RUN
5610 else:
5611 state = _CQState.COMMIT
5612 if not cl.GetIssue():
5613 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005614 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005615 return 0
5616
5617
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005618@metrics.collector.collect_metrics('git cl set-close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005619def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005620 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005621 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005622 auth.add_auth_options(parser)
5623 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005624 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005625 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005626 if args:
5627 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005628 cl = Changelist(auth_config=auth_config, issue=options.issue,
5629 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005630 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005631 if not cl.GetIssue():
5632 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005633 cl.CloseIssue()
5634 return 0
5635
5636
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005637@metrics.collector.collect_metrics('git cl diff')
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005638def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005639 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005640 parser.add_option(
5641 '--stat',
5642 action='store_true',
5643 dest='stat',
5644 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005645 auth.add_auth_options(parser)
5646 options, args = parser.parse_args(args)
5647 auth_config = auth.extract_auth_config_from_options(options)
5648 if args:
5649 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005650
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005651 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005652 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005653 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005654 if not issue:
5655 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005656
Aaron Gablea718c3e2017-08-28 17:47:28 -07005657 base = cl._GitGetBranchConfigValue('last-upload-hash')
5658 if not base:
5659 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5660 if not base:
5661 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5662 revision_info = detail['revisions'][detail['current_revision']]
5663 fetch_info = revision_info['fetch']['http']
5664 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5665 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005666
Aaron Gablea718c3e2017-08-28 17:47:28 -07005667 cmd = ['git', 'diff']
5668 if options.stat:
5669 cmd.append('--stat')
5670 cmd.append(base)
5671 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005672
5673 return 0
5674
5675
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005676@metrics.collector.collect_metrics('git cl owners')
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005677def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005678 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005679 parser.add_option(
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005680 '--ignore-current',
5681 action='store_true',
5682 help='Ignore the CL\'s current reviewers and start from scratch.')
5683 parser.add_option(
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005684 '--no-color',
5685 action='store_true',
5686 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005687 parser.add_option(
5688 '--batch',
5689 action='store_true',
5690 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005691 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005692 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005693 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005694
5695 author = RunGit(['config', 'user.email']).strip() or None
5696
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005697 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005698
5699 if args:
5700 if len(args) > 1:
5701 parser.error('Unknown args')
5702 base_branch = args[0]
5703 else:
5704 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005705 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005706
5707 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005708 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5709
5710 if options.batch:
5711 db = owners.Database(change.RepositoryRoot(), file, os.path)
5712 print('\n'.join(db.reviewers_for(affected_files, author)))
5713 return 0
5714
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005715 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005716 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005717 change.RepositoryRoot(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005718 author,
Sidney San Martín8e6f58c2018-06-08 01:02:56 +00005719 [] if options.ignore_current else cl.GetReviewers(),
Edward Lemur707d70b2018-02-07 00:50:14 +01005720 fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005721 disable_color=options.no_color,
5722 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005723
5724
Aiden Bennerc08566e2018-10-03 17:52:42 +00005725def BuildGitDiffCmd(diff_type, upstream_commit, args, allow_prefix=False):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005726 """Generates a diff command."""
5727 # Generate diff for the current branch's changes.
Aiden Bennerc08566e2018-10-03 17:52:42 +00005728 diff_cmd = ['-c', 'core.quotePath=false', 'diff', '--no-ext-diff']
5729
5730 if not allow_prefix:
5731 diff_cmd += ['--no-prefix']
5732
5733 diff_cmd += [diff_type, upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005734
5735 if args:
5736 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005737 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005738 diff_cmd.append(arg)
5739 else:
5740 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005741
5742 return diff_cmd
5743
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005744
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005745def MatchingFileType(file_name, extensions):
5746 """Returns true if the file name ends with one of the given extensions."""
5747 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005748
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005749
enne@chromium.org555cfe42014-01-29 18:21:39 +00005750@subcommand.usage('[files or directories to diff]')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005751@metrics.collector.collect_metrics('git cl format')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005752def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005753 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005754 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005755 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005756 parser.add_option('--full', action='store_true',
5757 help='Reformat the full content of all touched files')
5758 parser.add_option('--dry-run', action='store_true',
5759 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005760 parser.add_option('--python', action='store_true',
5761 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005762 parser.add_option('--js', action='store_true',
5763 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005764 parser.add_option('--diff', action='store_true',
5765 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005766 parser.add_option('--presubmit', action='store_true',
5767 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005768 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005769
Daniel Chengc55eecf2016-12-30 03:11:02 -08005770 # Normalize any remaining args against the current path, so paths relative to
5771 # the current directory are still resolved as expected.
5772 args = [os.path.join(os.getcwd(), arg) for arg in args]
5773
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005774 # git diff generates paths against the root of the repository. Change
5775 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005776 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005777 if rel_base_path:
5778 os.chdir(rel_base_path)
5779
digit@chromium.org29e47272013-05-17 17:01:46 +00005780 # Grab the merge-base commit, i.e. the upstream commit of the current
5781 # branch when it was created or the last time it was rebased. This is
5782 # to cover the case where the user may have called "git fetch origin",
5783 # moving the origin branch to a newer commit, but hasn't rebased yet.
5784 upstream_commit = None
5785 cl = Changelist()
5786 upstream_branch = cl.GetUpstreamBranch()
5787 if upstream_branch:
5788 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5789 upstream_commit = upstream_commit.strip()
5790
5791 if not upstream_commit:
5792 DieWithError('Could not find base commit for this branch. '
5793 'Are you in detached state?')
5794
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005795 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5796 diff_output = RunGit(changed_files_cmd)
5797 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005798 # Filter out files deleted by this CL
5799 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005800
Christopher Lamc5ba6922017-01-24 11:19:14 +11005801 if opts.js:
Deepanjan Roy605dd312018-07-02 17:48:54 +00005802 CLANG_EXTS.extend(['.js', '.ts'])
Christopher Lamc5ba6922017-01-24 11:19:14 +11005803
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005804 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5805 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5806 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005807 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005808
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005809 top_dir = os.path.normpath(
5810 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5811
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005812 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5813 # formatted. This is used to block during the presubmit.
5814 return_value = 0
5815
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005816 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005817 # Locate the clang-format binary in the checkout
5818 try:
5819 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005820 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005821 DieWithError(e)
5822
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005823 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005824 cmd = [clang_format_tool]
5825 if not opts.dry_run and not opts.diff:
5826 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005827 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005828 if opts.diff:
5829 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005830 else:
5831 env = os.environ.copy()
5832 env['PATH'] = str(os.path.dirname(clang_format_tool))
5833 try:
5834 script = clang_format.FindClangFormatScriptInChromiumTree(
5835 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005836 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005837 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005838
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005839 cmd = [sys.executable, script, '-p0']
5840 if not opts.dry_run and not opts.diff:
5841 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005842
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005843 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5844 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005845
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005846 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5847 if opts.diff:
5848 sys.stdout.write(stdout)
5849 if opts.dry_run and len(stdout) > 0:
5850 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005851
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005852 # Similar code to above, but using yapf on .py files rather than clang-format
5853 # on C/C++ files
Aiden Bennerc08566e2018-10-03 17:52:42 +00005854 if opts.python and python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005855 yapf_tool = gclient_utils.FindExecutable('yapf')
5856 if yapf_tool is None:
5857 DieWithError('yapf not found in PATH')
5858
Aiden Bennerc08566e2018-10-03 17:52:42 +00005859 # If we couldn't find a yapf file we'll default to the chromium style
5860 # specified in depot_tools.
5861 depot_tools_path = os.path.dirname(os.path.abspath(__file__))
5862 chromium_default_yapf_style = os.path.join(depot_tools_path,
5863 YAPF_CONFIG_FILENAME)
5864
5865 # Note: yapf still seems to fix indentation of the entire file
5866 # even if line ranges are specified.
5867 # See https://github.com/google/yapf/issues/499
5868 if not opts.full:
5869 py_line_diffs = _ComputeDiffLineRanges(python_diff_files, upstream_commit)
5870
5871 # Used for caching.
5872 yapf_configs = {}
5873 for f in python_diff_files:
5874 # Find the yapf style config for the current file, defaults to depot
5875 # tools default.
5876 yapf_config = _FindYapfConfigFile(
5877 os.path.abspath(f), yapf_configs, top_dir,
5878 chromium_default_yapf_style)
5879
5880 cmd = [yapf_tool, '--style', yapf_config, f]
5881
5882 has_formattable_lines = False
5883 if not opts.full:
5884 # Only run yapf over changed line ranges.
5885 for diff_start, diff_len in py_line_diffs[f]:
5886 diff_end = diff_start + diff_len - 1
5887 # Yapf errors out if diff_end < diff_start but this
5888 # is a valid line range diff for a removal.
5889 if diff_end >= diff_start:
5890 has_formattable_lines = True
5891 cmd += ['-l', '{}-{}'.format(diff_start, diff_end)]
5892 # If all line diffs were removals we have nothing to format.
5893 if not has_formattable_lines:
5894 continue
5895
5896 if opts.diff or opts.dry_run:
5897 cmd += ['--diff']
5898 # Will return non-zero exit code if non-empty diff.
5899 stdout = RunCommand(cmd, error_ok=True, cwd=top_dir)
5900 if opts.diff:
5901 sys.stdout.write(stdout)
5902 elif len(stdout) > 0:
5903 return_value = 2
5904 else:
5905 cmd += ['-i']
5906 RunCommand(cmd, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005907
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005908 # Dart's formatter does not have the nice property of only operating on
5909 # modified chunks, so hard code full.
5910 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005911 try:
5912 command = [dart_format.FindDartFmtToolInChromiumTree()]
5913 if not opts.dry_run and not opts.diff:
5914 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005915 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005916
ppi@chromium.org6593d932016-03-03 15:41:15 +00005917 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005918 if opts.dry_run and stdout:
5919 return_value = 2
5920 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005921 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5922 'found in this checkout. Files in other languages are still '
5923 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005924
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005925 # Format GN build files. Always run on full build files for canonical form.
5926 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005927 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005928 if opts.dry_run or opts.diff:
5929 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005930 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005931 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5932 shell=sys.platform == 'win32',
5933 cwd=top_dir)
5934 if opts.dry_run and gn_ret == 2:
5935 return_value = 2 # Not formatted.
5936 elif opts.diff and gn_ret == 2:
5937 # TODO this should compute and print the actual diff.
5938 print("This change has GN build file diff for " + gn_diff_file)
5939 elif gn_ret != 0:
5940 # For non-dry run cases (and non-2 return values for dry-run), a
5941 # nonzero error code indicates a failure, probably because the file
5942 # doesn't parse.
5943 DieWithError("gn format failed on " + gn_diff_file +
5944 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005945
Ilya Shermane081cbe2017-08-15 17:51:04 -07005946 # Skip the metrics formatting from the global presubmit hook. These files have
5947 # a separate presubmit hook that issues an error if the files need formatting,
5948 # whereas the top-level presubmit script merely issues a warning. Formatting
5949 # these files is somewhat slow, so it's important not to duplicate the work.
5950 if not opts.presubmit:
5951 for xml_dir in GetDirtyMetricsDirs(diff_files):
5952 tool_dir = os.path.join(top_dir, xml_dir)
5953 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5954 if opts.dry_run or opts.diff:
5955 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005956 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005957 if opts.diff:
5958 sys.stdout.write(stdout)
5959 if opts.dry_run and stdout:
5960 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005961
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005962 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005963
Steven Holte2e664bf2017-04-21 13:10:47 -07005964def GetDirtyMetricsDirs(diff_files):
5965 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5966 metrics_xml_dirs = [
5967 os.path.join('tools', 'metrics', 'actions'),
5968 os.path.join('tools', 'metrics', 'histograms'),
5969 os.path.join('tools', 'metrics', 'rappor'),
5970 os.path.join('tools', 'metrics', 'ukm')]
5971 for xml_dir in metrics_xml_dirs:
5972 if any(file.startswith(xml_dir) for file in xml_diff_files):
5973 yield xml_dir
5974
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005975
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005976@subcommand.usage('<codereview url or issue id>')
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00005977@metrics.collector.collect_metrics('git cl checkout')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005978def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005979 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005980 _, args = parser.parse_args(args)
5981
5982 if len(args) != 1:
5983 parser.print_help()
5984 return 1
5985
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005986 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005987 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005988 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005989
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005990 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005991
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005992 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005993 output = RunGit(['config', '--local', '--get-regexp',
5994 r'branch\..*\.%s' % issueprefix],
5995 error_ok=True)
5996 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005997 if issue == target_issue:
5998 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005999
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006000 branches = []
6001 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006002 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006003 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006004 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006005 return 1
6006 if len(branches) == 1:
6007 RunGit(['checkout', branches[0]])
6008 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006009 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006010 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006011 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006012 which = raw_input('Choose by index: ')
6013 try:
6014 RunGit(['checkout', branches[int(which)]])
6015 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006016 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006017 return 1
6018
6019 return 0
6020
6021
maruel@chromium.org29404b52014-09-08 22:58:00 +00006022def CMDlol(parser, args):
6023 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006024 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006025 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6026 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6027 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006028 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006029 return 0
6030
6031
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006032class OptionParser(optparse.OptionParser):
6033 """Creates the option parse and add --verbose support."""
6034 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006035 optparse.OptionParser.__init__(
6036 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006037 self.add_option(
6038 '-v', '--verbose', action='count', default=0,
6039 help='Use 2 times for more debugging info')
6040
Edward Lemur5ba1e9c2018-07-23 18:19:02 +00006041 def parse_args(self, args=None, _values=None):
6042 # Create an optparse.Values object that will store only the actual passed
6043 # options, without the defaults.
6044 actual_options = optparse.Values()
6045 _, args = optparse.OptionParser.parse_args(self, args, actual_options)
6046 # Create an optparse.Values object with the default options.
6047 options = optparse.Values(self.get_default_values().__dict__)
6048 # Update it with the options passed by the user.
6049 options._update_careful(actual_options.__dict__)
6050 # Store the options passed by the user in an _actual_options attribute.
6051 # We store only the keys, and not the values, since the values can contain
6052 # arbitrary information, which might be PII.
6053 metrics.collector.add('arguments', actual_options.__dict__.keys())
6054
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006055 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006056 logging.basicConfig(
6057 level=levels[min(options.verbose, len(levels) - 1)],
6058 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6059 '%(filename)s] %(message)s')
Edward Lemur83bd7f42018-10-10 00:14:21 +00006060
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006061 return options, args
6062
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006063
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006064def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006065 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006066 print('\nYour python version %s is unsupported, please upgrade.\n' %
6067 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006068 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006069
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006070 # Reload settings.
6071 global settings
6072 settings = Settings()
6073
Edward Lemurad463c92018-07-25 21:31:23 +00006074 if not metrics.DISABLE_METRICS_COLLECTION:
6075 metrics.collector.add('project_urls', [settings.GetViewVCUrl().strip('/+')])
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006076 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006077 dispatcher = subcommand.CommandDispatcher(__name__)
6078 try:
6079 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006080 except auth.AuthenticationError as e:
6081 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006082 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006083 if e.code != 500:
6084 raise
6085 DieWithError(
6086 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6087 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006088 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006089
6090
6091if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006092 # These affect sys.stdout so do it outside of main() to simplify mocks in
6093 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006094 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006095 setup_color.init()
Edward Lemur6f812e12018-07-31 22:45:57 +00006096 with metrics.collector.print_notice_and_exit():
sbc@chromium.org013731e2015-02-26 18:28:43 +00006097 sys.exit(main(sys.argv[1:]))