blob: bd9b4796dc83d17eb50b9f80fb2c185ba14c8865 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
38try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080039 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000040except ImportError:
41 pass
42
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000043from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000044from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000045from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000046import auth
skobes6468b902016-10-24 08:45:10 -070047import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000048import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000049import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000050import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000051import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000052import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000053import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000054import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000056import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000057import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000058import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000060import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040062import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000063import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000064import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065import watchlists
66
tandrii7400cf02016-06-21 08:48:07 -070067__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068
tandrii9d2c7a32016-06-22 03:42:45 -070069COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070070DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080071POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000072DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000073REFS_THAT_ALIAS_TO_OTHER_REFS = {
74 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
75 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
76}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000077
thestig@chromium.org44202a22014-03-11 19:22:18 +000078# Valid extensions for files we want to lint.
79DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
80DEFAULT_LINT_IGNORE_REGEX = r"$^"
81
borenet6c0efe62016-10-19 08:13:29 -070082# Buildbucket master name prefix.
83MASTER_PREFIX = 'master.'
84
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000085# Shortcut since it quickly becomes redundant.
86Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000087
maruel@chromium.orgddd59412011-11-30 14:20:38 +000088# Initialized in main()
89settings = None
90
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010091# Used by tests/git_cl_test.py to add extra logging.
92# Inside the weirdly failing test, add this:
93# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
94# And scroll up to see the strack trace printed.
95_IS_BEING_TESTED = False
96
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097
Christopher Lamf732cd52017-01-24 12:40:11 +110098def DieWithError(message, change_desc=None):
99 if change_desc:
100 SaveDescriptionBackup(change_desc)
101
vapiera7fbd5a2016-06-16 09:17:49 -0700102 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000103 sys.exit(1)
104
105
Christopher Lamf732cd52017-01-24 12:40:11 +1100106def SaveDescriptionBackup(change_desc):
107 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
108 print('\nError after CL description prompt -- saving description to %s\n' %
109 backup_path)
110 backup_file = open(backup_path, 'w')
111 backup_file.write(change_desc.description)
112 backup_file.close()
113
114
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000115def GetNoGitPagerEnv():
116 env = os.environ.copy()
117 # 'cat' is a magical git string that disables pagers on all platforms.
118 env['GIT_PAGER'] = 'cat'
119 return env
120
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000121
bsep@chromium.org627d9002016-04-29 00:00:52 +0000122def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000123 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000124 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000125 except subprocess2.CalledProcessError as e:
126 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000127 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000128 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000129 'Command "%s" failed.\n%s' % (
130 ' '.join(args), error_message or e.stdout or ''))
131 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132
133
134def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000135 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000136 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137
138
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000139def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000140 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700141 if suppress_stderr:
142 stderr = subprocess2.VOID
143 else:
144 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000145 try:
tandrii5d48c322016-08-18 16:19:37 -0700146 (out, _), code = subprocess2.communicate(['git'] + args,
147 env=GetNoGitPagerEnv(),
148 stdout=subprocess2.PIPE,
149 stderr=stderr)
150 return code, out
151 except subprocess2.CalledProcessError as e:
152 logging.debug('Failed running %s', args)
153 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000154
155
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000156def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000157 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000158 return RunGitWithCode(args, suppress_stderr=True)[1]
159
160
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000161def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000162 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000163 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000164 return (version.startswith(prefix) and
165 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000166
167
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000168def BranchExists(branch):
169 """Return True if specified branch exists."""
170 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
171 suppress_stderr=True)
172 return not code
173
174
tandrii2a16b952016-10-19 07:09:44 -0700175def time_sleep(seconds):
176 # Use this so that it can be mocked in tests without interfering with python
177 # system machinery.
178 import time # Local import to discourage others from importing time globally.
179 return time.sleep(seconds)
180
181
maruel@chromium.org90541732011-04-01 17:54:18 +0000182def ask_for_data(prompt):
183 try:
184 return raw_input(prompt)
185 except KeyboardInterrupt:
186 # Hide the exception.
187 sys.exit(1)
188
189
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100190def confirm_or_exit(prefix='', action='confirm'):
191 """Asks user to press enter to continue or press Ctrl+C to abort."""
192 if not prefix or prefix.endswith('\n'):
193 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100194 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100195 mid = ' Press'
196 elif prefix.endswith(' '):
197 mid = 'press'
198 else:
199 mid = ' press'
200 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
201
202
203def ask_for_explicit_yes(prompt):
204 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
205 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
206 while True:
207 if 'yes'.startswith(result):
208 return True
209 if 'no'.startswith(result):
210 return False
211 result = ask_for_data('Please, type yes or no: ').lower()
212
213
tandrii5d48c322016-08-18 16:19:37 -0700214def _git_branch_config_key(branch, key):
215 """Helper method to return Git config key for a branch."""
216 assert branch, 'branch name is required to set git config for it'
217 return 'branch.%s.%s' % (branch, key)
218
219
220def _git_get_branch_config_value(key, default=None, value_type=str,
221 branch=False):
222 """Returns git config value of given or current branch if any.
223
224 Returns default in all other cases.
225 """
226 assert value_type in (int, str, bool)
227 if branch is False: # Distinguishing default arg value from None.
228 branch = GetCurrentBranch()
229
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000230 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700231 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000232
tandrii5d48c322016-08-18 16:19:37 -0700233 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700234 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700235 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700236 # git config also has --int, but apparently git config suffers from integer
237 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700238 args.append(_git_branch_config_key(branch, key))
239 code, out = RunGitWithCode(args)
240 if code == 0:
241 value = out.strip()
242 if value_type == int:
243 return int(value)
244 if value_type == bool:
245 return bool(value.lower() == 'true')
246 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000247 return default
248
249
tandrii5d48c322016-08-18 16:19:37 -0700250def _git_set_branch_config_value(key, value, branch=None, **kwargs):
251 """Sets the value or unsets if it's None of a git branch config.
252
253 Valid, though not necessarily existing, branch must be provided,
254 otherwise currently checked out branch is used.
255 """
256 if not branch:
257 branch = GetCurrentBranch()
258 assert branch, 'a branch name OR currently checked out branch is required'
259 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700260 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700261 if value is None:
262 args.append('--unset')
263 elif isinstance(value, bool):
264 args.append('--bool')
265 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700266 else:
tandrii33a46ff2016-08-23 05:53:40 -0700267 # git config also has --int, but apparently git config suffers from integer
268 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700269 value = str(value)
270 args.append(_git_branch_config_key(branch, key))
271 if value is not None:
272 args.append(value)
273 RunGit(args, **kwargs)
274
275
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100276def _get_committer_timestamp(commit):
277 """Returns unix timestamp as integer of a committer in a commit.
278
279 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
280 """
281 # Git also stores timezone offset, but it only affects visual display,
282 # actual point in time is defined by this timestamp only.
283 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
284
285
286def _git_amend_head(message, committer_timestamp):
287 """Amends commit with new message and desired committer_timestamp.
288
289 Sets committer timezone to UTC.
290 """
291 env = os.environ.copy()
292 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
293 return RunGit(['commit', '--amend', '-m', message], env=env)
294
295
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000296def add_git_similarity(parser):
297 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700298 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000299 help='Sets the percentage that a pair of files need to match in order to'
300 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000301 parser.add_option(
302 '--find-copies', action='store_true',
303 help='Allows git to look for copies.')
304 parser.add_option(
305 '--no-find-copies', action='store_false', dest='find_copies',
306 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000307
308 old_parser_args = parser.parse_args
309 def Parse(args):
310 options, args = old_parser_args(args)
311
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000312 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700313 options.similarity = _git_get_branch_config_value(
314 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000315 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000316 print('Note: Saving similarity of %d%% in git config.'
317 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700318 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000319
iannucci@chromium.org79540052012-10-19 23:15:26 +0000320 options.similarity = max(0, min(options.similarity, 100))
321
322 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700323 options.find_copies = _git_get_branch_config_value(
324 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000325 else:
tandrii5d48c322016-08-18 16:19:37 -0700326 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000327
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000328 return options, args
329 parser.parse_args = Parse
330
331
machenbach@chromium.org45453142015-09-15 08:45:22 +0000332def _get_properties_from_options(options):
333 properties = dict(x.split('=', 1) for x in options.properties)
334 for key, val in properties.iteritems():
335 try:
336 properties[key] = json.loads(val)
337 except ValueError:
338 pass # If a value couldn't be evaluated, treat it as a string.
339 return properties
340
341
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000342def _prefix_master(master):
343 """Convert user-specified master name to full master name.
344
345 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
346 name, while the developers always use shortened master name
347 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
348 function does the conversion for buildbucket migration.
349 """
borenet6c0efe62016-10-19 08:13:29 -0700350 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000351 return master
borenet6c0efe62016-10-19 08:13:29 -0700352 return '%s%s' % (MASTER_PREFIX, master)
353
354
355def _unprefix_master(bucket):
356 """Convert bucket name to shortened master name.
357
358 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
359 name, while the developers always use shortened master name
360 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
361 function does the conversion for buildbucket migration.
362 """
363 if bucket.startswith(MASTER_PREFIX):
364 return bucket[len(MASTER_PREFIX):]
365 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000366
367
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000368def _buildbucket_retry(operation_name, http, *args, **kwargs):
369 """Retries requests to buildbucket service and returns parsed json content."""
370 try_count = 0
371 while True:
372 response, content = http.request(*args, **kwargs)
373 try:
374 content_json = json.loads(content)
375 except ValueError:
376 content_json = None
377
378 # Buildbucket could return an error even if status==200.
379 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000380 error = content_json.get('error')
381 if error.get('code') == 403:
382 raise BuildbucketResponseException(
383 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000384 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000385 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000386 raise BuildbucketResponseException(msg)
387
388 if response.status == 200:
389 if not content_json:
390 raise BuildbucketResponseException(
391 'Buildbucket returns invalid json content: %s.\n'
392 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
393 content)
394 return content_json
395 if response.status < 500 or try_count >= 2:
396 raise httplib2.HttpLib2Error(content)
397
398 # status >= 500 means transient failures.
399 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700400 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000401 try_count += 1
402 assert False, 'unreachable'
403
404
qyearsley1fdfcb62016-10-24 13:22:03 -0700405def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700406 """Returns a dict mapping bucket names to builders and tests,
407 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700408 """
qyearsleydd49f942016-10-28 11:57:22 -0700409 # If no bots are listed, we try to get a set of builders and tests based
410 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700411 if not options.bot:
412 change = changelist.GetChange(
413 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700414 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700415 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700416 change=change,
417 changed_files=change.LocalPaths(),
418 repository_root=settings.GetRoot(),
419 default_presubmit=None,
420 project=None,
421 verbose=options.verbose,
422 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700423 if masters is None:
424 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100425 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700426
qyearsley1fdfcb62016-10-24 13:22:03 -0700427 if options.bucket:
428 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700429 if options.master:
430 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700431
qyearsleydd49f942016-10-28 11:57:22 -0700432 # If bots are listed but no master or bucket, then we need to find out
433 # the corresponding master for each bot.
434 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
435 if error_message:
436 option_parser.error(
437 'Tryserver master cannot be found because: %s\n'
438 'Please manually specify the tryserver master, e.g. '
439 '"-m tryserver.chromium.linux".' % error_message)
440 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700441
442
qyearsley123a4682016-10-26 09:12:17 -0700443def _get_bucket_map_for_builders(builders):
444 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700445 map_url = 'https://builders-map.appspot.com/'
446 try:
qyearsley123a4682016-10-26 09:12:17 -0700447 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700448 except urllib2.URLError as e:
449 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
450 (map_url, e))
451 except ValueError as e:
452 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700453 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700454 return None, 'Failed to build master map.'
455
qyearsley123a4682016-10-26 09:12:17 -0700456 bucket_map = {}
457 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700458 masters = builders_map.get(builder, [])
459 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700460 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700461 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700463 (builder, masters))
464 bucket = _prefix_master(masters[0])
465 bucket_map.setdefault(bucket, {})[builder] = []
466
467 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700468
469
borenet6c0efe62016-10-19 08:13:29 -0700470def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700471 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700472 """Sends a request to Buildbucket to trigger try jobs for a changelist.
473
474 Args:
475 auth_config: AuthConfig for Rietveld.
476 changelist: Changelist that the try jobs are associated with.
477 buckets: A nested dict mapping bucket names to builders to tests.
478 options: Command-line options.
479 """
tandriide281ae2016-10-12 06:02:30 -0700480 assert changelist.GetIssue(), 'CL must be uploaded first'
481 codereview_url = changelist.GetCodereviewServer()
482 assert codereview_url, 'CL must be uploaded first'
483 patchset = patchset or changelist.GetMostRecentPatchset()
484 assert patchset, 'CL must be uploaded first'
485
486 codereview_host = urlparse.urlparse(codereview_url).hostname
487 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000488 http = authenticator.authorize(httplib2.Http())
489 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700490
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000491 buildbucket_put_url = (
492 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000493 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700494 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
495 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
496 hostname=codereview_host,
497 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000498 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700499
500 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
501 shared_parameters_properties['category'] = category
502 if options.clobber:
503 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700504 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700505 if extra_properties:
506 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000507
508 batch_req_body = {'builds': []}
509 print_text = []
510 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700511 for bucket, builders_and_tests in sorted(buckets.iteritems()):
512 print_text.append('Bucket: %s' % bucket)
513 master = None
514 if bucket.startswith(MASTER_PREFIX):
515 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000516 for builder, tests in sorted(builders_and_tests.iteritems()):
517 print_text.append(' %s: %s' % (builder, tests))
518 parameters = {
519 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000520 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100521 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000522 'revision': options.revision,
523 }],
tandrii8c5a3532016-11-04 07:52:02 -0700524 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000525 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000526 if 'presubmit' in builder.lower():
527 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000528 if tests:
529 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700530
531 tags = [
532 'builder:%s' % builder,
533 'buildset:%s' % buildset,
534 'user_agent:git_cl_try',
535 ]
536 if master:
537 parameters['properties']['master'] = master
538 tags.append('master:%s' % master)
539
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000540 batch_req_body['builds'].append(
541 {
542 'bucket': bucket,
543 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000544 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700545 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000546 }
547 )
548
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000549 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700550 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 http,
552 buildbucket_put_url,
553 'PUT',
554 body=json.dumps(batch_req_body),
555 headers={'Content-Type': 'application/json'}
556 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000557 print_text.append('To see results here, run: git cl try-results')
558 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700559 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000560
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000561
tandrii221ab252016-10-06 08:12:04 -0700562def fetch_try_jobs(auth_config, changelist, buildbucket_host,
563 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700564 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000565
qyearsley53f48a12016-09-01 10:45:13 -0700566 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567 """
tandrii221ab252016-10-06 08:12:04 -0700568 assert buildbucket_host
569 assert changelist.GetIssue(), 'CL must be uploaded first'
570 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
571 patchset = patchset or changelist.GetMostRecentPatchset()
572 assert patchset, 'CL must be uploaded first'
573
574 codereview_url = changelist.GetCodereviewServer()
575 codereview_host = urlparse.urlparse(codereview_url).hostname
576 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000577 if authenticator.has_cached_credentials():
578 http = authenticator.authorize(httplib2.Http())
579 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700580 print('Warning: Some results might be missing because %s' %
581 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700582 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000583 http = httplib2.Http()
584
585 http.force_exception_to_status_code = True
586
tandrii221ab252016-10-06 08:12:04 -0700587 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
588 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
589 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000590 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700591 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 params = {'tag': 'buildset:%s' % buildset}
593
594 builds = {}
595 while True:
596 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700597 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000598 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700599 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600 for build in content.get('builds', []):
601 builds[build['id']] = build
602 if 'next_cursor' in content:
603 params['start_cursor'] = content['next_cursor']
604 else:
605 break
606 return builds
607
608
qyearsleyeab3c042016-08-24 09:18:28 -0700609def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000610 """Prints nicely result of fetch_try_jobs."""
611 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700612 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613 return
614
615 # Make a copy, because we'll be modifying builds dictionary.
616 builds = builds.copy()
617 builder_names_cache = {}
618
619 def get_builder(b):
620 try:
621 return builder_names_cache[b['id']]
622 except KeyError:
623 try:
624 parameters = json.loads(b['parameters_json'])
625 name = parameters['builder_name']
626 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700627 print('WARNING: failed to get builder name for build %s: %s' % (
628 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000629 name = None
630 builder_names_cache[b['id']] = name
631 return name
632
633 def get_bucket(b):
634 bucket = b['bucket']
635 if bucket.startswith('master.'):
636 return bucket[len('master.'):]
637 return bucket
638
639 if options.print_master:
640 name_fmt = '%%-%ds %%-%ds' % (
641 max(len(str(get_bucket(b))) for b in builds.itervalues()),
642 max(len(str(get_builder(b))) for b in builds.itervalues()))
643 def get_name(b):
644 return name_fmt % (get_bucket(b), get_builder(b))
645 else:
646 name_fmt = '%%-%ds' % (
647 max(len(str(get_builder(b))) for b in builds.itervalues()))
648 def get_name(b):
649 return name_fmt % get_builder(b)
650
651 def sort_key(b):
652 return b['status'], b.get('result'), get_name(b), b.get('url')
653
654 def pop(title, f, color=None, **kwargs):
655 """Pop matching builds from `builds` dict and print them."""
656
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000657 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000658 colorize = str
659 else:
660 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
661
662 result = []
663 for b in builds.values():
664 if all(b.get(k) == v for k, v in kwargs.iteritems()):
665 builds.pop(b['id'])
666 result.append(b)
667 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700668 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000669 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700670 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671
672 total = len(builds)
673 pop(status='COMPLETED', result='SUCCESS',
674 title='Successes:', color=Fore.GREEN,
675 f=lambda b: (get_name(b), b.get('url')))
676 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
677 title='Infra Failures:', color=Fore.MAGENTA,
678 f=lambda b: (get_name(b), b.get('url')))
679 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
680 title='Failures:', color=Fore.RED,
681 f=lambda b: (get_name(b), b.get('url')))
682 pop(status='COMPLETED', result='CANCELED',
683 title='Canceled:', color=Fore.MAGENTA,
684 f=lambda b: (get_name(b),))
685 pop(status='COMPLETED', result='FAILURE',
686 failure_reason='INVALID_BUILD_DEFINITION',
687 title='Wrong master/builder name:', color=Fore.MAGENTA,
688 f=lambda b: (get_name(b),))
689 pop(status='COMPLETED', result='FAILURE',
690 title='Other failures:',
691 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
692 pop(status='COMPLETED',
693 title='Other finished:',
694 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
695 pop(status='STARTED',
696 title='Started:', color=Fore.YELLOW,
697 f=lambda b: (get_name(b), b.get('url')))
698 pop(status='SCHEDULED',
699 title='Scheduled:',
700 f=lambda b: (get_name(b), 'id=%s' % b['id']))
701 # The last section is just in case buildbucket API changes OR there is a bug.
702 pop(title='Other:',
703 f=lambda b: (get_name(b), 'id=%s' % b['id']))
704 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700705 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000706
707
qyearsley53f48a12016-09-01 10:45:13 -0700708def write_try_results_json(output_file, builds):
709 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
710
711 The input |builds| dict is assumed to be generated by Buildbucket.
712 Buildbucket documentation: http://goo.gl/G0s101
713 """
714
715 def convert_build_dict(build):
716 return {
717 'buildbucket_id': build.get('id'),
718 'status': build.get('status'),
719 'result': build.get('result'),
720 'bucket': build.get('bucket'),
721 'builder_name': json.loads(
722 build.get('parameters_json', '{}')).get('builder_name'),
723 'failure_reason': build.get('failure_reason'),
724 'url': build.get('url'),
725 }
726
727 converted = []
728 for _, build in sorted(builds.items()):
729 converted.append(convert_build_dict(build))
730 write_json(output_file, converted)
731
732
iannucci@chromium.org79540052012-10-19 23:15:26 +0000733def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000734 """Prints statistics about the change to the user."""
735 # --no-ext-diff is broken in some versions of Git, so try to work around
736 # this by overriding the environment (but there is still a problem if the
737 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000738 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000739 if 'GIT_EXTERNAL_DIFF' in env:
740 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000741
742 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800743 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000744 else:
745 similarity_options = ['-M%s' % similarity]
746
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000747 try:
748 stdout = sys.stdout.fileno()
749 except AttributeError:
750 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000751 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000752 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000753 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000754 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000755
756
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000757class BuildbucketResponseException(Exception):
758 pass
759
760
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000761class Settings(object):
762 def __init__(self):
763 self.default_server = None
764 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000765 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000766 self.tree_status_url = None
767 self.viewvc_url = None
768 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000769 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000770 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000771 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000772 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000773 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000774 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775
776 def LazyUpdateIfNeeded(self):
777 """Updates the settings from a codereview.settings file, if available."""
778 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000779 # The only value that actually changes the behavior is
780 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000781 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000782 error_ok=True
783 ).strip().lower()
784
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000786 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 LoadCodereviewSettingsFromFile(cr_settings_file)
788 self.updated = True
789
790 def GetDefaultServerUrl(self, error_ok=False):
791 if not self.default_server:
792 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000793 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000794 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000795 if error_ok:
796 return self.default_server
797 if not self.default_server:
798 error_message = ('Could not find settings file. You must configure '
799 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000800 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000801 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802 return self.default_server
803
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000804 @staticmethod
805 def GetRelativeRoot():
806 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000807
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000808 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000809 if self.root is None:
810 self.root = os.path.abspath(self.GetRelativeRoot())
811 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000812
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000813 def GetGitMirror(self, remote='origin'):
814 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000815 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000816 if not os.path.isdir(local_url):
817 return None
818 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
819 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100820 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100821 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000822 if mirror.exists():
823 return mirror
824 return None
825
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826 def GetTreeStatusUrl(self, error_ok=False):
827 if not self.tree_status_url:
828 error_message = ('You must configure your tree status URL by running '
829 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000830 self.tree_status_url = self._GetRietveldConfig(
831 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000832 return self.tree_status_url
833
834 def GetViewVCUrl(self):
835 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000836 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000837 return self.viewvc_url
838
rmistry@google.com90752582014-01-14 21:04:50 +0000839 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000840 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000841
rmistry@google.com78948ed2015-07-08 23:09:57 +0000842 def GetIsSkipDependencyUpload(self, branch_name):
843 """Returns true if specified branch should skip dep uploads."""
844 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
845 error_ok=True)
846
rmistry@google.com5626a922015-02-26 14:03:30 +0000847 def GetRunPostUploadHook(self):
848 run_post_upload_hook = self._GetRietveldConfig(
849 'run-post-upload-hook', error_ok=True)
850 return run_post_upload_hook == "True"
851
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000852 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000853 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000854
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000855 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000856 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857
ukai@chromium.orge8077812012-02-03 03:41:46 +0000858 def GetIsGerrit(self):
859 """Return true if this repo is assosiated with gerrit code review system."""
860 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700861 self.is_gerrit = (
862 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000863 return self.is_gerrit
864
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000865 def GetSquashGerritUploads(self):
866 """Return true if uploads to Gerrit should be squashed by default."""
867 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700868 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
869 if self.squash_gerrit_uploads is None:
870 # Default is squash now (http://crbug.com/611892#c23).
871 self.squash_gerrit_uploads = not (
872 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
873 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000874 return self.squash_gerrit_uploads
875
tandriia60502f2016-06-20 02:01:53 -0700876 def GetSquashGerritUploadsOverride(self):
877 """Return True or False if codereview.settings should be overridden.
878
879 Returns None if no override has been defined.
880 """
881 # See also http://crbug.com/611892#c23
882 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
883 error_ok=True).strip()
884 if result == 'true':
885 return True
886 if result == 'false':
887 return False
888 return None
889
tandrii@chromium.org28253532016-04-14 13:46:56 +0000890 def GetGerritSkipEnsureAuthenticated(self):
891 """Return True if EnsureAuthenticated should not be done for Gerrit
892 uploads."""
893 if self.gerrit_skip_ensure_authenticated is None:
894 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000895 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000896 error_ok=True).strip() == 'true')
897 return self.gerrit_skip_ensure_authenticated
898
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000899 def GetGitEditor(self):
900 """Return the editor specified in the git config, or None if none is."""
901 if self.git_editor is None:
902 self.git_editor = self._GetConfig('core.editor', error_ok=True)
903 return self.git_editor or None
904
thestig@chromium.org44202a22014-03-11 19:22:18 +0000905 def GetLintRegex(self):
906 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
907 DEFAULT_LINT_REGEX)
908
909 def GetLintIgnoreRegex(self):
910 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
911 DEFAULT_LINT_IGNORE_REGEX)
912
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000913 def GetProject(self):
914 if not self.project:
915 self.project = self._GetRietveldConfig('project', error_ok=True)
916 return self.project
917
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000918 def _GetRietveldConfig(self, param, **kwargs):
919 return self._GetConfig('rietveld.' + param, **kwargs)
920
rmistry@google.com78948ed2015-07-08 23:09:57 +0000921 def _GetBranchConfig(self, branch_name, param, **kwargs):
922 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
923
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000924 def _GetConfig(self, param, **kwargs):
925 self.LazyUpdateIfNeeded()
926 return RunGit(['config', param], **kwargs).strip()
927
928
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100929@contextlib.contextmanager
930def _get_gerrit_project_config_file(remote_url):
931 """Context manager to fetch and store Gerrit's project.config from
932 refs/meta/config branch and store it in temp file.
933
934 Provides a temporary filename or None if there was error.
935 """
936 error, _ = RunGitWithCode([
937 'fetch', remote_url,
938 '+refs/meta/config:refs/git_cl/meta/config'])
939 if error:
940 # Ref doesn't exist or isn't accessible to current user.
941 print('WARNING: failed to fetch project config for %s: %s' %
942 (remote_url, error))
943 yield None
944 return
945
946 error, project_config_data = RunGitWithCode(
947 ['show', 'refs/git_cl/meta/config:project.config'])
948 if error:
949 print('WARNING: project.config file not found')
950 yield None
951 return
952
953 with gclient_utils.temporary_directory() as tempdir:
954 project_config_file = os.path.join(tempdir, 'project.config')
955 gclient_utils.FileWrite(project_config_file, project_config_data)
956 yield project_config_file
957
958
959def _is_git_numberer_enabled(remote_url, remote_ref):
960 """Returns True if Git Numberer is enabled on this ref."""
961 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100962 KNOWN_PROJECTS_WHITELIST = [
963 'chromium/src',
964 'external/webrtc',
965 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100966 'infra/experimental',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100967 ]
968
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100969 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
970 url_parts = urlparse.urlparse(remote_url)
971 project_name = url_parts.path.lstrip('/').rstrip('git./')
972 for known in KNOWN_PROJECTS_WHITELIST:
973 if project_name.endswith(known):
974 break
975 else:
976 # Early exit to avoid extra fetches for repos that aren't using Git
977 # Numberer.
978 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100979
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100980 with _get_gerrit_project_config_file(remote_url) as project_config_file:
981 if project_config_file is None:
982 # Failed to fetch project.config, which shouldn't happen on open source
983 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100984 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100985 def get_opts(x):
986 code, out = RunGitWithCode(
987 ['config', '-f', project_config_file, '--get-all',
988 'plugin.git-numberer.validate-%s-refglob' % x])
989 if code == 0:
990 return out.strip().splitlines()
991 return []
992 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100993
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100994 logging.info('validator config enabled %s disabled %s refglobs for '
995 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000996
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100997 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100998 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100999 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001000 return True
1001 return False
1002
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001003 if match_refglobs(disabled):
1004 return False
1005 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001006
1007
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008def ShortBranchName(branch):
1009 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001010 return branch.replace('refs/heads/', '', 1)
1011
1012
1013def GetCurrentBranchRef():
1014 """Returns branch ref (e.g., refs/heads/master) or None."""
1015 return RunGit(['symbolic-ref', 'HEAD'],
1016 stderr=subprocess2.VOID, error_ok=True).strip() or None
1017
1018
1019def GetCurrentBranch():
1020 """Returns current branch or None.
1021
1022 For refs/heads/* branches, returns just last part. For others, full ref.
1023 """
1024 branchref = GetCurrentBranchRef()
1025 if branchref:
1026 return ShortBranchName(branchref)
1027 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001028
1029
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001030class _CQState(object):
1031 """Enum for states of CL with respect to Commit Queue."""
1032 NONE = 'none'
1033 DRY_RUN = 'dry_run'
1034 COMMIT = 'commit'
1035
1036 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1037
1038
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001039class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001040 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001041 self.issue = issue
1042 self.patchset = patchset
1043 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001044 assert codereview in (None, 'rietveld', 'gerrit')
1045 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001046
1047 @property
1048 def valid(self):
1049 return self.issue is not None
1050
1051
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001052def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001053 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1054 fail_result = _ParsedIssueNumberArgument()
1055
1056 if arg.isdigit():
1057 return _ParsedIssueNumberArgument(issue=int(arg))
1058 if not arg.startswith('http'):
1059 return fail_result
1060 url = gclient_utils.UpgradeToHttps(arg)
1061 try:
1062 parsed_url = urlparse.urlparse(url)
1063 except ValueError:
1064 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001065
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001066 if codereview is not None:
1067 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1068 return parsed or fail_result
1069
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001070 results = {}
1071 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1072 parsed = cls.ParseIssueURL(parsed_url)
1073 if parsed is not None:
1074 results[name] = parsed
1075
1076 if not results:
1077 return fail_result
1078 if len(results) == 1:
1079 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001080
1081 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1082 # This is likely Gerrit.
1083 return results['gerrit']
1084 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001085 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001086
1087
Aaron Gablea45ee112016-11-22 15:14:38 -08001088class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001089 def __init__(self, issue, url):
1090 self.issue = issue
1091 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001092 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001093
1094 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001095 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001096 self.issue, self.url)
1097
1098
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001099_CommentSummary = collections.namedtuple(
1100 '_CommentSummary', ['date', 'message', 'sender',
1101 # TODO(tandrii): these two aren't known in Gerrit.
1102 'approval', 'disapproval'])
1103
1104
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001105class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001106 """Changelist works with one changelist in local branch.
1107
1108 Supports two codereview backends: Rietveld or Gerrit, selected at object
1109 creation.
1110
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001111 Notes:
1112 * Not safe for concurrent multi-{thread,process} use.
1113 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001114 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001115 """
1116
1117 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1118 """Create a new ChangeList instance.
1119
1120 If issue is given, the codereview must be given too.
1121
1122 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1123 Otherwise, it's decided based on current configuration of the local branch,
1124 with default being 'rietveld' for backwards compatibility.
1125 See _load_codereview_impl for more details.
1126
1127 **kwargs will be passed directly to codereview implementation.
1128 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001130 global settings
1131 if not settings:
1132 # Happens when git_cl.py is used as a utility library.
1133 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001134
1135 if issue:
1136 assert codereview, 'codereview must be known, if issue is known'
1137
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.branchref = branchref
1139 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001140 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.branch = ShortBranchName(self.branchref)
1142 else:
1143 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001145 self.lookedup_issue = False
1146 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.has_description = False
1148 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001149 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001151 self.cc = None
1152 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001153 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001154
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001155 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001156 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001157 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001158 assert self._codereview_impl
1159 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001160
1161 def _load_codereview_impl(self, codereview=None, **kwargs):
1162 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001163 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1164 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1165 self._codereview = codereview
1166 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001167 return
1168
1169 # Automatic selection based on issue number set for a current branch.
1170 # Rietveld takes precedence over Gerrit.
1171 assert not self.issue
1172 # Whether we find issue or not, we are doing the lookup.
1173 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001174 if self.GetBranch():
1175 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1176 issue = _git_get_branch_config_value(
1177 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1178 if issue:
1179 self._codereview = codereview
1180 self._codereview_impl = cls(self, **kwargs)
1181 self.issue = int(issue)
1182 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001183
1184 # No issue is set for this branch, so decide based on repo-wide settings.
1185 return self._load_codereview_impl(
1186 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1187 **kwargs)
1188
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001189 def IsGerrit(self):
1190 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001191
1192 def GetCCList(self):
1193 """Return the users cc'd on this CL.
1194
agable92bec4f2016-08-24 09:27:27 -07001195 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001196 """
1197 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001198 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001199 more_cc = ','.join(self.watchers)
1200 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1201 return self.cc
1202
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001203 def GetCCListWithoutDefault(self):
1204 """Return the users cc'd on this CL excluding default ones."""
1205 if self.cc is None:
1206 self.cc = ','.join(self.watchers)
1207 return self.cc
1208
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001209 def SetWatchers(self, watchers):
1210 """Set the list of email addresses that should be cc'd based on the changed
1211 files in this CL.
1212 """
1213 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001214
1215 def GetBranch(self):
1216 """Returns the short branch name, e.g. 'master'."""
1217 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001218 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001219 if not branchref:
1220 return None
1221 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001222 self.branch = ShortBranchName(self.branchref)
1223 return self.branch
1224
1225 def GetBranchRef(self):
1226 """Returns the full branch name, e.g. 'refs/heads/master'."""
1227 self.GetBranch() # Poke the lazy loader.
1228 return self.branchref
1229
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001230 def ClearBranch(self):
1231 """Clears cached branch data of this object."""
1232 self.branch = self.branchref = None
1233
tandrii5d48c322016-08-18 16:19:37 -07001234 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1235 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1236 kwargs['branch'] = self.GetBranch()
1237 return _git_get_branch_config_value(key, default, **kwargs)
1238
1239 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1240 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1241 assert self.GetBranch(), (
1242 'this CL must have an associated branch to %sset %s%s' %
1243 ('un' if value is None else '',
1244 key,
1245 '' if value is None else ' to %r' % value))
1246 kwargs['branch'] = self.GetBranch()
1247 return _git_set_branch_config_value(key, value, **kwargs)
1248
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001249 @staticmethod
1250 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001251 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 e.g. 'origin', 'refs/heads/master'
1253 """
1254 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001255 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1256
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001258 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001260 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1261 error_ok=True).strip()
1262 if upstream_branch:
1263 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001265 # Else, try to guess the origin remote.
1266 remote_branches = RunGit(['branch', '-r']).split()
1267 if 'origin/master' in remote_branches:
1268 # Fall back on origin/master if it exits.
1269 remote = 'origin'
1270 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001271 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001272 DieWithError(
1273 'Unable to determine default branch to diff against.\n'
1274 'Either pass complete "git diff"-style arguments, like\n'
1275 ' git cl upload origin/master\n'
1276 'or verify this branch is set up to track another \n'
1277 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001278
1279 return remote, upstream_branch
1280
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001281 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001282 upstream_branch = self.GetUpstreamBranch()
1283 if not BranchExists(upstream_branch):
1284 DieWithError('The upstream for the current branch (%s) does not exist '
1285 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001286 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001287 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001288
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001289 def GetUpstreamBranch(self):
1290 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001293 upstream_branch = upstream_branch.replace('refs/heads/',
1294 'refs/remotes/%s/' % remote)
1295 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1296 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 self.upstream_branch = upstream_branch
1298 return self.upstream_branch
1299
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001300 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001301 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001302 remote, branch = None, self.GetBranch()
1303 seen_branches = set()
1304 while branch not in seen_branches:
1305 seen_branches.add(branch)
1306 remote, branch = self.FetchUpstreamTuple(branch)
1307 branch = ShortBranchName(branch)
1308 if remote != '.' or branch.startswith('refs/remotes'):
1309 break
1310 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001311 remotes = RunGit(['remote'], error_ok=True).split()
1312 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001313 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001314 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001315 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001316 logging.warn('Could not determine which remote this change is '
1317 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001318 else:
1319 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001320 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001321 branch = 'HEAD'
1322 if branch.startswith('refs/remotes'):
1323 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001324 elif branch.startswith('refs/branch-heads/'):
1325 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001326 else:
1327 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001328 return self._remote
1329
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 def GitSanityChecks(self, upstream_git_obj):
1331 """Checks git repo status and ensures diff is from local commits."""
1332
sbc@chromium.org79706062015-01-14 21:18:12 +00001333 if upstream_git_obj is None:
1334 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001335 print('ERROR: unable to determine current branch (detached HEAD?)',
1336 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001337 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001338 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001339 return False
1340
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001341 # Verify the commit we're diffing against is in our current branch.
1342 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1343 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1344 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001345 print('ERROR: %s is not in the current branch. You may need to rebase '
1346 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001347 return False
1348
1349 # List the commits inside the diff, and verify they are all local.
1350 commits_in_diff = RunGit(
1351 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1352 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1353 remote_branch = remote_branch.strip()
1354 if code != 0:
1355 _, remote_branch = self.GetRemoteBranch()
1356
1357 commits_in_remote = RunGit(
1358 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1359
1360 common_commits = set(commits_in_diff) & set(commits_in_remote)
1361 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001362 print('ERROR: Your diff contains %d commits already in %s.\n'
1363 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1364 'the diff. If you are using a custom git flow, you can override'
1365 ' the reference used for this check with "git config '
1366 'gitcl.remotebranch <git-ref>".' % (
1367 len(common_commits), remote_branch, upstream_git_obj),
1368 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001369 return False
1370 return True
1371
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001372 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001373 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001374
1375 Returns None if it is not set.
1376 """
tandrii5d48c322016-08-18 16:19:37 -07001377 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001379 def GetRemoteUrl(self):
1380 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1381
1382 Returns None if there is no remote.
1383 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001384 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001385 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1386
1387 # If URL is pointing to a local directory, it is probably a git cache.
1388 if os.path.isdir(url):
1389 url = RunGit(['config', 'remote.%s.url' % remote],
1390 error_ok=True,
1391 cwd=url).strip()
1392 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001394 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001395 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001396 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001397 self.issue = self._GitGetBranchConfigValue(
1398 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001399 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400 return self.issue
1401
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001402 def GetIssueURL(self):
1403 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001404 issue = self.GetIssue()
1405 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001406 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001407 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001409 def GetDescription(self, pretty=False, force=False):
1410 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001412 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413 self.has_description = True
1414 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001415 # Set width to 72 columns + 2 space indent.
1416 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001418 lines = self.description.splitlines()
1419 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001420 return self.description
1421
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001422 def GetDescriptionFooters(self):
1423 """Returns (non_footer_lines, footers) for the commit message.
1424
1425 Returns:
1426 non_footer_lines (list(str)) - Simple list of description lines without
1427 any footer. The lines do not contain newlines, nor does the list contain
1428 the empty line between the message and the footers.
1429 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1430 [("Change-Id", "Ideadbeef...."), ...]
1431 """
1432 raw_description = self.GetDescription()
1433 msg_lines, _, footers = git_footers.split_footers(raw_description)
1434 if footers:
1435 msg_lines = msg_lines[:len(msg_lines)-1]
1436 return msg_lines, footers
1437
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001438 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001439 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001440 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001441 self.patchset = self._GitGetBranchConfigValue(
1442 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001443 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001444 return self.patchset
1445
1446 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001447 """Set this branch's patchset. If patchset=0, clears the patchset."""
1448 assert self.GetBranch()
1449 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001450 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001451 else:
1452 self.patchset = int(patchset)
1453 self._GitSetBranchConfigValue(
1454 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001455
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001456 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001457 """Set this branch's issue. If issue isn't given, clears the issue."""
1458 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001459 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001460 issue = int(issue)
1461 self._GitSetBranchConfigValue(
1462 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001463 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001464 codereview_server = self._codereview_impl.GetCodereviewServer()
1465 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001466 self._GitSetBranchConfigValue(
1467 self._codereview_impl.CodereviewServerConfigKey(),
1468 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001469 else:
tandrii5d48c322016-08-18 16:19:37 -07001470 # Reset all of these just to be clean.
1471 reset_suffixes = [
1472 'last-upload-hash',
1473 self._codereview_impl.IssueConfigKey(),
1474 self._codereview_impl.PatchsetConfigKey(),
1475 self._codereview_impl.CodereviewServerConfigKey(),
1476 ] + self._PostUnsetIssueProperties()
1477 for prop in reset_suffixes:
1478 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001479 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001480 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001481
dnjba1b0f32016-09-02 12:37:42 -07001482 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001483 if not self.GitSanityChecks(upstream_branch):
1484 DieWithError('\nGit sanity check failure')
1485
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001486 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001487 if not root:
1488 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001489 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001490
1491 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001492 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001493 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001494 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001495 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001496 except subprocess2.CalledProcessError:
1497 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001498 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001499 'This branch probably doesn\'t exist anymore. To reset the\n'
1500 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001501 ' git branch --set-upstream-to origin/master %s\n'
1502 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001503 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001504
maruel@chromium.org52424302012-08-29 15:14:30 +00001505 issue = self.GetIssue()
1506 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001507 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001508 description = self.GetDescription()
1509 else:
1510 # If the change was never uploaded, use the log messages of all commits
1511 # up to the branch point, as git cl upload will prefill the description
1512 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001513 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1514 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001515
1516 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001517 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001518 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001519 name,
1520 description,
1521 absroot,
1522 files,
1523 issue,
1524 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001525 author,
1526 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001527
dsansomee2d6fd92016-09-08 00:10:47 -07001528 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001529 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001530 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001531 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001532
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001533 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1534 """Sets the description for this CL remotely.
1535
1536 You can get description_lines and footers with GetDescriptionFooters.
1537
1538 Args:
1539 description_lines (list(str)) - List of CL description lines without
1540 newline characters.
1541 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1542 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1543 `List-Of-Tokens`). It will be case-normalized so that each token is
1544 title-cased.
1545 """
1546 new_description = '\n'.join(description_lines)
1547 if footers:
1548 new_description += '\n'
1549 for k, v in footers:
1550 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1551 if not git_footers.FOOTER_PATTERN.match(foot):
1552 raise ValueError('Invalid footer %r' % foot)
1553 new_description += foot + '\n'
1554 self.UpdateDescription(new_description, force)
1555
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001556 def RunHook(self, committing, may_prompt, verbose, change):
1557 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1558 try:
1559 return presubmit_support.DoPresubmitChecks(change, committing,
1560 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1561 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001562 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1563 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001564 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001565 DieWithError(
1566 ('%s\nMaybe your depot_tools is out of date?\n'
1567 'If all fails, contact maruel@') % e)
1568
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001569 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1570 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001571 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1572 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001573 else:
1574 # Assume url.
1575 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1576 urlparse.urlparse(issue_arg))
1577 if not parsed_issue_arg or not parsed_issue_arg.valid:
1578 DieWithError('Failed to parse issue argument "%s". '
1579 'Must be an issue number or a valid URL.' % issue_arg)
1580 return self._codereview_impl.CMDPatchWithParsedIssue(
1581 parsed_issue_arg, reject, nocommit, directory)
1582
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001583 def CMDUpload(self, options, git_diff_args, orig_args):
1584 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001585 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001587 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001588 else:
1589 if self.GetBranch() is None:
1590 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1591
1592 # Default to diffing against common ancestor of upstream branch
1593 base_branch = self.GetCommonAncestorWithUpstream()
1594 git_diff_args = [base_branch, 'HEAD']
1595
Aaron Gablec4c40d12017-05-22 11:49:53 -07001596 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1597 if not self.IsGerrit() and not self.GetIssue():
1598 print('=====================================')
1599 print('NOTICE: Rietveld is being deprecated. '
1600 'You can upload changes to Gerrit with')
1601 print(' git cl upload --gerrit')
1602 print('or set Gerrit to be your default code review tool with')
1603 print(' git config gerrit.host true')
1604 print('=====================================')
1605
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001606 # Fast best-effort checks to abort before running potentially
1607 # expensive hooks if uploading is likely to fail anyway. Passing these
1608 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001609 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001610 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001611
1612 # Apply watchlists on upload.
1613 change = self.GetChange(base_branch, None)
1614 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1615 files = [f.LocalPath() for f in change.AffectedFiles()]
1616 if not options.bypass_watchlists:
1617 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1618
1619 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001620 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001621 # Set the reviewer list now so that presubmit checks can access it.
1622 change_description = ChangeDescription(change.FullDescriptionText())
1623 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001624 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001625 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001626 change)
1627 change.SetDescriptionText(change_description.description)
1628 hook_results = self.RunHook(committing=False,
1629 may_prompt=not options.force,
1630 verbose=options.verbose,
1631 change=change)
1632 if not hook_results.should_continue():
1633 return 1
1634 if not options.reviewers and hook_results.reviewers:
1635 options.reviewers = hook_results.reviewers.split(',')
1636
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001637 # TODO(tandrii): Checking local patchset against remote patchset is only
1638 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1639 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001640 latest_patchset = self.GetMostRecentPatchset()
1641 local_patchset = self.GetPatchset()
1642 if (latest_patchset and local_patchset and
1643 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001644 print('The last upload made from this repository was patchset #%d but '
1645 'the most recent patchset on the server is #%d.'
1646 % (local_patchset, latest_patchset))
1647 print('Uploading will still work, but if you\'ve uploaded to this '
1648 'issue from another machine or branch the patch you\'re '
1649 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001650 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001651
1652 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001653 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001654 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001655 if options.use_commit_queue:
1656 self.SetCQState(_CQState.COMMIT)
1657 elif options.cq_dry_run:
1658 self.SetCQState(_CQState.DRY_RUN)
1659
tandrii5d48c322016-08-18 16:19:37 -07001660 _git_set_branch_config_value('last-upload-hash',
1661 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001662 # Run post upload hooks, if specified.
1663 if settings.GetRunPostUploadHook():
1664 presubmit_support.DoPostUploadExecuter(
1665 change,
1666 self,
1667 settings.GetRoot(),
1668 options.verbose,
1669 sys.stdout)
1670
1671 # Upload all dependencies if specified.
1672 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001673 print()
1674 print('--dependencies has been specified.')
1675 print('All dependent local branches will be re-uploaded.')
1676 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001677 # Remove the dependencies flag from args so that we do not end up in a
1678 # loop.
1679 orig_args.remove('--dependencies')
1680 ret = upload_branch_deps(self, orig_args)
1681 return ret
1682
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001683 def SetCQState(self, new_state):
1684 """Update the CQ state for latest patchset.
1685
1686 Issue must have been already uploaded and known.
1687 """
1688 assert new_state in _CQState.ALL_STATES
1689 assert self.GetIssue()
1690 return self._codereview_impl.SetCQState(new_state)
1691
qyearsley1fdfcb62016-10-24 13:22:03 -07001692 def TriggerDryRun(self):
1693 """Triggers a dry run and prints a warning on failure."""
1694 # TODO(qyearsley): Either re-use this method in CMDset_commit
1695 # and CMDupload, or change CMDtry to trigger dry runs with
1696 # just SetCQState, and catch keyboard interrupt and other
1697 # errors in that method.
1698 try:
1699 self.SetCQState(_CQState.DRY_RUN)
1700 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1701 return 0
1702 except KeyboardInterrupt:
1703 raise
1704 except:
1705 print('WARNING: failed to trigger CQ Dry Run.\n'
1706 'Either:\n'
1707 ' * your project has no CQ\n'
1708 ' * you don\'t have permission to trigger Dry Run\n'
1709 ' * bug in this code (see stack trace below).\n'
1710 'Consider specifying which bots to trigger manually '
1711 'or asking your project owners for permissions '
1712 'or contacting Chrome Infrastructure team at '
1713 'https://www.chromium.org/infra\n\n')
1714 # Still raise exception so that stack trace is printed.
1715 raise
1716
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001717 # Forward methods to codereview specific implementation.
1718
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001719 def AddComment(self, message):
1720 return self._codereview_impl.AddComment(message)
1721
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001722 def GetCommentsSummary(self):
1723 """Returns list of _CommentSummary for each comment.
1724
1725 Note: comments per file or per line are not included,
1726 only top-level comments are returned.
1727 """
1728 return self._codereview_impl.GetCommentsSummary()
1729
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001730 def CloseIssue(self):
1731 return self._codereview_impl.CloseIssue()
1732
1733 def GetStatus(self):
1734 return self._codereview_impl.GetStatus()
1735
1736 def GetCodereviewServer(self):
1737 return self._codereview_impl.GetCodereviewServer()
1738
tandriide281ae2016-10-12 06:02:30 -07001739 def GetIssueOwner(self):
1740 """Get owner from codereview, which may differ from this checkout."""
1741 return self._codereview_impl.GetIssueOwner()
1742
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001743 def GetMostRecentPatchset(self):
1744 return self._codereview_impl.GetMostRecentPatchset()
1745
tandriide281ae2016-10-12 06:02:30 -07001746 def CannotTriggerTryJobReason(self):
1747 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1748 return self._codereview_impl.CannotTriggerTryJobReason()
1749
tandrii8c5a3532016-11-04 07:52:02 -07001750 def GetTryjobProperties(self, patchset=None):
1751 """Returns dictionary of properties to launch tryjob."""
1752 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1753
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001754 def __getattr__(self, attr):
1755 # This is because lots of untested code accesses Rietveld-specific stuff
1756 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001757 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001758 # Note that child method defines __getattr__ as well, and forwards it here,
1759 # because _RietveldChangelistImpl is not cleaned up yet, and given
1760 # deprecation of Rietveld, it should probably be just removed.
1761 # Until that time, avoid infinite recursion by bypassing __getattr__
1762 # of implementation class.
1763 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764
1765
1766class _ChangelistCodereviewBase(object):
1767 """Abstract base class encapsulating codereview specifics of a changelist."""
1768 def __init__(self, changelist):
1769 self._changelist = changelist # instance of Changelist
1770
1771 def __getattr__(self, attr):
1772 # Forward methods to changelist.
1773 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1774 # _RietveldChangelistImpl to avoid this hack?
1775 return getattr(self._changelist, attr)
1776
1777 def GetStatus(self):
1778 """Apply a rough heuristic to give a simple summary of an issue's review
1779 or CQ status, assuming adherence to a common workflow.
1780
1781 Returns None if no issue for this branch, or specific string keywords.
1782 """
1783 raise NotImplementedError()
1784
1785 def GetCodereviewServer(self):
1786 """Returns server URL without end slash, like "https://codereview.com"."""
1787 raise NotImplementedError()
1788
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001789 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001790 """Fetches and returns description from the codereview server."""
1791 raise NotImplementedError()
1792
tandrii5d48c322016-08-18 16:19:37 -07001793 @classmethod
1794 def IssueConfigKey(cls):
1795 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 raise NotImplementedError()
1797
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001798 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001799 def PatchsetConfigKey(cls):
1800 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 raise NotImplementedError()
1802
tandrii5d48c322016-08-18 16:19:37 -07001803 @classmethod
1804 def CodereviewServerConfigKey(cls):
1805 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001806 raise NotImplementedError()
1807
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001808 def _PostUnsetIssueProperties(self):
1809 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001810 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001811
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001812 def GetRieveldObjForPresubmit(self):
1813 # This is an unfortunate Rietveld-embeddedness in presubmit.
1814 # For non-Rietveld codereviews, this probably should return a dummy object.
1815 raise NotImplementedError()
1816
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
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001825 def AddComment(self, message):
1826 """Posts a comment to the codereview site."""
1827 raise NotImplementedError()
1828
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001829 def GetCommentsSummary(self):
1830 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,
1841 directory):
1842 """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.
1851 """
1852 raise NotImplementedError()
1853
1854 @staticmethod
1855 def ParseIssueURL(parsed_url):
1856 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1857 failed."""
1858 raise NotImplementedError()
1859
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001860 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001861 """Best effort check that user is authenticated with codereview server.
1862
1863 Arguments:
1864 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001865 refresh: whether to attempt to refresh credentials. Ignored if not
1866 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001867 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001868 raise NotImplementedError()
1869
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001870 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001871 """Best effort check that uploading isn't supposed to fail for predictable
1872 reasons.
1873
1874 This method should raise informative exception if uploading shouldn't
1875 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001876
1877 Arguments:
1878 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001879 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001880 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001881
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001882 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001883 """Uploads a change to codereview."""
1884 raise NotImplementedError()
1885
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001886 def SetCQState(self, new_state):
1887 """Update the CQ state for latest patchset.
1888
1889 Issue must have been already uploaded and known.
1890 """
1891 raise NotImplementedError()
1892
tandriie113dfd2016-10-11 10:20:12 -07001893 def CannotTriggerTryJobReason(self):
1894 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1895 raise NotImplementedError()
1896
tandriide281ae2016-10-12 06:02:30 -07001897 def GetIssueOwner(self):
1898 raise NotImplementedError()
1899
tandrii8c5a3532016-11-04 07:52:02 -07001900 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001901 raise NotImplementedError()
1902
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903
1904class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001905 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001906 super(_RietveldChangelistImpl, self).__init__(changelist)
1907 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001908 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001909 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001910
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001911 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001912 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913 self._props = None
1914 self._rpc_server = None
1915
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001916 def GetCodereviewServer(self):
1917 if not self._rietveld_server:
1918 # If we're on a branch then get the server potentially associated
1919 # with that branch.
1920 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001921 self._rietveld_server = gclient_utils.UpgradeToHttps(
1922 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001923 if not self._rietveld_server:
1924 self._rietveld_server = settings.GetDefaultServerUrl()
1925 return self._rietveld_server
1926
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001927 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001928 """Best effort check that user is authenticated with Rietveld server."""
1929 if self._auth_config.use_oauth2:
1930 authenticator = auth.get_authenticator_for_host(
1931 self.GetCodereviewServer(), self._auth_config)
1932 if not authenticator.has_cached_credentials():
1933 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001934 if refresh:
1935 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001936
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001937 def EnsureCanUploadPatchset(self, force):
1938 # No checks for Rietveld because we are deprecating Rietveld.
1939 pass
1940
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001941 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001942 issue = self.GetIssue()
1943 assert issue
1944 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001945 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001946 except urllib2.HTTPError as e:
1947 if e.code == 404:
1948 DieWithError(
1949 ('\nWhile fetching the description for issue %d, received a '
1950 '404 (not found)\n'
1951 'error. It is likely that you deleted this '
1952 'issue on the server. If this is the\n'
1953 'case, please run\n\n'
1954 ' git cl issue 0\n\n'
1955 'to clear the association with the deleted issue. Then run '
1956 'this command again.') % issue)
1957 else:
1958 DieWithError(
1959 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1960 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001961 print('Warning: Failed to retrieve CL description due to network '
1962 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 return ''
1964
1965 def GetMostRecentPatchset(self):
1966 return self.GetIssueProperties()['patchsets'][-1]
1967
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 def GetIssueProperties(self):
1969 if self._props is None:
1970 issue = self.GetIssue()
1971 if not issue:
1972 self._props = {}
1973 else:
1974 self._props = self.RpcServer().get_issue_properties(issue, True)
1975 return self._props
1976
tandriie113dfd2016-10-11 10:20:12 -07001977 def CannotTriggerTryJobReason(self):
1978 props = self.GetIssueProperties()
1979 if not props:
1980 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1981 if props.get('closed'):
1982 return 'CL %s is closed' % self.GetIssue()
1983 if props.get('private'):
1984 return 'CL %s is private' % self.GetIssue()
1985 return None
1986
tandrii8c5a3532016-11-04 07:52:02 -07001987 def GetTryjobProperties(self, patchset=None):
1988 """Returns dictionary of properties to launch tryjob."""
1989 project = (self.GetIssueProperties() or {}).get('project')
1990 return {
1991 'issue': self.GetIssue(),
1992 'patch_project': project,
1993 'patch_storage': 'rietveld',
1994 'patchset': patchset or self.GetPatchset(),
1995 'rietveld': self.GetCodereviewServer(),
1996 }
1997
tandriide281ae2016-10-12 06:02:30 -07001998 def GetIssueOwner(self):
1999 return (self.GetIssueProperties() or {}).get('owner_email')
2000
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002001 def AddComment(self, message):
2002 return self.RpcServer().add_comment(self.GetIssue(), message)
2003
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002004 def GetCommentsSummary(self):
2005 summary = []
2006 for message in self.GetIssueProperties().get('messages', []):
2007 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2008 summary.append(_CommentSummary(
2009 date=date,
2010 disapproval=bool(message['disapproval']),
2011 approval=bool(message['approval']),
2012 sender=message['sender'],
2013 message=message['text'],
2014 ))
2015 return summary
2016
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002017 def GetStatus(self):
2018 """Apply a rough heuristic to give a simple summary of an issue's review
2019 or CQ status, assuming adherence to a common workflow.
2020
2021 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002022 * 'error' - error from review tool (including deleted issues)
2023 * 'unsent' - not sent for review
2024 * 'waiting' - waiting for review
2025 * 'reply' - waiting for owner to reply to review
2026 * 'not lgtm' - Code-Review label has been set negatively
2027 * 'lgtm' - LGTM from at least one approved reviewer
2028 * 'commit' - in the commit queue
2029 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002030 """
2031 if not self.GetIssue():
2032 return None
2033
2034 try:
2035 props = self.GetIssueProperties()
2036 except urllib2.HTTPError:
2037 return 'error'
2038
2039 if props.get('closed'):
2040 # Issue is closed.
2041 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002042 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002043 # Issue is in the commit queue.
2044 return 'commit'
2045
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002046 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002047 if not messages:
2048 # No message was sent.
2049 return 'unsent'
2050
2051 if get_approving_reviewers(props):
2052 return 'lgtm'
2053 elif get_approving_reviewers(props, disapproval=True):
2054 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002055
tandrii9d2c7a32016-06-22 03:42:45 -07002056 # Skip CQ messages that don't require owner's action.
2057 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2058 if 'Dry run:' in messages[-1]['text']:
2059 messages.pop()
2060 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2061 # This message always follows prior messages from CQ,
2062 # so skip this too.
2063 messages.pop()
2064 else:
2065 # This is probably a CQ messages warranting user attention.
2066 break
2067
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002068 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002069 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002070 return 'reply'
2071 return 'waiting'
2072
dsansomee2d6fd92016-09-08 00:10:47 -07002073 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002074 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002075
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002076 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002077 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002078
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002079 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002080 return self.SetFlags({flag: value})
2081
2082 def SetFlags(self, flags):
2083 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002084 """
phajdan.jr68598232016-08-10 03:28:28 -07002085 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002086 try:
tandrii4b233bd2016-07-06 03:50:29 -07002087 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002088 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002089 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002090 if e.code == 404:
2091 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2092 if e.code == 403:
2093 DieWithError(
2094 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002095 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002096 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002097
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002098 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002099 """Returns an upload.RpcServer() to access this review's rietveld instance.
2100 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002101 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002102 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002103 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002104 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002105 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002106
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002107 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002108 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002109 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002110
tandrii5d48c322016-08-18 16:19:37 -07002111 @classmethod
2112 def PatchsetConfigKey(cls):
2113 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002114
tandrii5d48c322016-08-18 16:19:37 -07002115 @classmethod
2116 def CodereviewServerConfigKey(cls):
2117 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002118
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002119 def GetRieveldObjForPresubmit(self):
2120 return self.RpcServer()
2121
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002122 def SetCQState(self, new_state):
2123 props = self.GetIssueProperties()
2124 if props.get('private'):
2125 DieWithError('Cannot set-commit on private issue')
2126
2127 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002128 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002129 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002130 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002131 else:
tandrii4b233bd2016-07-06 03:50:29 -07002132 assert new_state == _CQState.DRY_RUN
2133 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002135 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2136 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002137 # PatchIssue should never be called with a dirty tree. It is up to the
2138 # caller to check this, but just in case we assert here since the
2139 # consequences of the caller not checking this could be dire.
2140 assert(not git_common.is_dirty_git_tree('apply'))
2141 assert(parsed_issue_arg.valid)
2142 self._changelist.issue = parsed_issue_arg.issue
2143 if parsed_issue_arg.hostname:
2144 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2145
skobes6468b902016-10-24 08:45:10 -07002146 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2147 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2148 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002149 try:
skobes6468b902016-10-24 08:45:10 -07002150 scm_obj.apply_patch(patchset_object)
2151 except Exception as e:
2152 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002153 return 1
2154
2155 # If we had an issue, commit the current state and register the issue.
2156 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002157 self.SetIssue(self.GetIssue())
2158 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2160 'patch from issue %(i)s at patchset '
2161 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2162 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002163 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002165 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002166 return 0
2167
2168 @staticmethod
2169 def ParseIssueURL(parsed_url):
2170 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2171 return None
wychen3c1c1722016-08-04 11:46:36 -07002172 # Rietveld patch: https://domain/<number>/#ps<patchset>
2173 match = re.match(r'/(\d+)/$', parsed_url.path)
2174 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2175 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002176 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002177 issue=int(match.group(1)),
2178 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002179 hostname=parsed_url.netloc,
2180 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002181 # Typical url: https://domain/<issue_number>[/[other]]
2182 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2183 if match:
skobes6468b902016-10-24 08:45:10 -07002184 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002185 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002186 hostname=parsed_url.netloc,
2187 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002188 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2189 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2190 if match:
skobes6468b902016-10-24 08:45:10 -07002191 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002192 issue=int(match.group(1)),
2193 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002194 hostname=parsed_url.netloc,
2195 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002196 return None
2197
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002198 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002199 """Upload the patch to Rietveld."""
2200 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2201 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002202 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2203 if options.emulate_svn_auto_props:
2204 upload_args.append('--emulate_svn_auto_props')
2205
2206 change_desc = None
2207
2208 if options.email is not None:
2209 upload_args.extend(['--email', options.email])
2210
2211 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002212 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002213 upload_args.extend(['--title', options.title])
2214 if options.message:
2215 upload_args.extend(['--message', options.message])
2216 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002217 print('This branch is associated with issue %s. '
2218 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002219 else:
nodirca166002016-06-27 10:59:51 -07002220 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002221 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002222 if options.message:
2223 message = options.message
2224 else:
2225 message = CreateDescriptionFromLog(args)
2226 if options.title:
2227 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002229 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002230 change_desc.update_reviewers(options.reviewers, options.tbrs,
2231 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002232 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002233 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002234
2235 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002236 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 return 1
2238
2239 upload_args.extend(['--message', change_desc.description])
2240 if change_desc.get_reviewers():
2241 upload_args.append('--reviewers=%s' % ','.join(
2242 change_desc.get_reviewers()))
2243 if options.send_mail:
2244 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002245 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002246 upload_args.append('--send_mail')
2247
2248 # We check this before applying rietveld.private assuming that in
2249 # rietveld.cc only addresses which we can send private CLs to are listed
2250 # if rietveld.private is set, and so we should ignore rietveld.cc only
2251 # when --private is specified explicitly on the command line.
2252 if options.private:
2253 logging.warn('rietveld.cc is ignored since private flag is specified. '
2254 'You need to review and add them manually if necessary.')
2255 cc = self.GetCCListWithoutDefault()
2256 else:
2257 cc = self.GetCCList()
2258 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002259 if change_desc.get_cced():
2260 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002261 if cc:
2262 upload_args.extend(['--cc', cc])
2263
2264 if options.private or settings.GetDefaultPrivateFlag() == "True":
2265 upload_args.append('--private')
2266
2267 upload_args.extend(['--git_similarity', str(options.similarity)])
2268 if not options.find_copies:
2269 upload_args.extend(['--git_no_find_copies'])
2270
2271 # Include the upstream repo's URL in the change -- this is useful for
2272 # projects that have their source spread across multiple repos.
2273 remote_url = self.GetGitBaseUrlFromConfig()
2274 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002275 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2276 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2277 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002279 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002280 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002281 if target_ref:
2282 upload_args.extend(['--target_ref', target_ref])
2283
2284 # Look for dependent patchsets. See crbug.com/480453 for more details.
2285 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2286 upstream_branch = ShortBranchName(upstream_branch)
2287 if remote is '.':
2288 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002289 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002290 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002291 print()
2292 print('Skipping dependency patchset upload because git config '
2293 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2294 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 else:
2296 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002297 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002298 auth_config=auth_config)
2299 branch_cl_issue_url = branch_cl.GetIssueURL()
2300 branch_cl_issue = branch_cl.GetIssue()
2301 branch_cl_patchset = branch_cl.GetPatchset()
2302 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2303 upload_args.extend(
2304 ['--depends_on_patchset', '%s:%s' % (
2305 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002306 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002307 '\n'
2308 'The current branch (%s) is tracking a local branch (%s) with '
2309 'an associated CL.\n'
2310 'Adding %s/#ps%s as a dependency patchset.\n'
2311 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2312 branch_cl_patchset))
2313
2314 project = settings.GetProject()
2315 if project:
2316 upload_args.extend(['--project', project])
2317
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002318 try:
2319 upload_args = ['upload'] + upload_args + args
2320 logging.info('upload.RealMain(%s)', upload_args)
2321 issue, patchset = upload.RealMain(upload_args)
2322 issue = int(issue)
2323 patchset = int(patchset)
2324 except KeyboardInterrupt:
2325 sys.exit(1)
2326 except:
2327 # If we got an exception after the user typed a description for their
2328 # change, back up the description before re-raising.
2329 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002330 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 raise
2332
2333 if not self.GetIssue():
2334 self.SetIssue(issue)
2335 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002336 return 0
2337
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002338
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002339class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002340 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002341 # auth_config is Rietveld thing, kept here to preserve interface only.
2342 super(_GerritChangelistImpl, self).__init__(changelist)
2343 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002344 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002345 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002346 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002347 # Map from change number (issue) to its detail cache.
2348 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002349
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002350 if codereview_host is not None:
2351 assert not codereview_host.startswith('https://'), codereview_host
2352 self._gerrit_host = codereview_host
2353 self._gerrit_server = 'https://%s' % codereview_host
2354
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002355 def _GetGerritHost(self):
2356 # Lazy load of configs.
2357 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002358 if self._gerrit_host and '.' not in self._gerrit_host:
2359 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2360 # This happens for internal stuff http://crbug.com/614312.
2361 parsed = urlparse.urlparse(self.GetRemoteUrl())
2362 if parsed.scheme == 'sso':
2363 print('WARNING: using non https URLs for remote is likely broken\n'
2364 ' Your current remote is: %s' % self.GetRemoteUrl())
2365 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2366 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002367 return self._gerrit_host
2368
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002369 def _GetGitHost(self):
2370 """Returns git host to be used when uploading change to Gerrit."""
2371 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2372
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002373 def GetCodereviewServer(self):
2374 if not self._gerrit_server:
2375 # If we're on a branch then get the server potentially associated
2376 # with that branch.
2377 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002378 self._gerrit_server = self._GitGetBranchConfigValue(
2379 self.CodereviewServerConfigKey())
2380 if self._gerrit_server:
2381 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002382 if not self._gerrit_server:
2383 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2384 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002385 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002386 parts[0] = parts[0] + '-review'
2387 self._gerrit_host = '.'.join(parts)
2388 self._gerrit_server = 'https://%s' % self._gerrit_host
2389 return self._gerrit_server
2390
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002391 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002392 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002393 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002394
tandrii5d48c322016-08-18 16:19:37 -07002395 @classmethod
2396 def PatchsetConfigKey(cls):
2397 return 'gerritpatchset'
2398
2399 @classmethod
2400 def CodereviewServerConfigKey(cls):
2401 return 'gerritserver'
2402
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002403 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002404 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002405 if settings.GetGerritSkipEnsureAuthenticated():
2406 # For projects with unusual authentication schemes.
2407 # See http://crbug.com/603378.
2408 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002409 # Lazy-loader to identify Gerrit and Git hosts.
2410 if gerrit_util.GceAuthenticator.is_gce():
2411 return
2412 self.GetCodereviewServer()
2413 git_host = self._GetGitHost()
2414 assert self._gerrit_server and self._gerrit_host
2415 cookie_auth = gerrit_util.CookiesAuthenticator()
2416
2417 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2418 git_auth = cookie_auth.get_auth_header(git_host)
2419 if gerrit_auth and git_auth:
2420 if gerrit_auth == git_auth:
2421 return
2422 print((
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002423 'WARNING: you have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002424 ' %s\n'
2425 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002426 ' Consider running the following command:\n'
2427 ' git cl creds-check\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002428 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002429 (git_host, self._gerrit_host,
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002430 cookie_auth.get_new_password_message(git_host)))
2431 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002432 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002433 return
2434 else:
2435 missing = (
2436 [] if gerrit_auth else [self._gerrit_host] +
2437 [] if git_auth else [git_host])
2438 DieWithError('Credentials for the following hosts are required:\n'
2439 ' %s\n'
2440 'These are read from %s (or legacy %s)\n'
2441 '%s' % (
2442 '\n '.join(missing),
2443 cookie_auth.get_gitcookies_path(),
2444 cookie_auth.get_netrc_path(),
2445 cookie_auth.get_new_password_message(git_host)))
2446
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002447 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002448 if not self.GetIssue():
2449 return
2450
2451 # Warm change details cache now to avoid RPCs later, reducing latency for
2452 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002453 self._GetChangeDetail(
2454 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002455
2456 status = self._GetChangeDetail()['status']
2457 if status in ('MERGED', 'ABANDONED'):
2458 DieWithError('Change %s has been %s, new uploads are not allowed' %
2459 (self.GetIssueURL(),
2460 'submitted' if status == 'MERGED' else 'abandoned'))
2461
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002462 if gerrit_util.GceAuthenticator.is_gce():
2463 return
2464 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2465 self._GetGerritHost())
2466 if self.GetIssueOwner() == cookies_user:
2467 return
2468 logging.debug('change %s owner is %s, cookies user is %s',
2469 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2470 # Maybe user has linked accounts or smth like that,
2471 # so ask what Gerrit thinks of this user.
2472 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2473 if details['email'] == self.GetIssueOwner():
2474 return
2475 if not force:
2476 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2477 'as %s.\n'
2478 'Uploading may fail due to lack of permissions.' %
2479 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2480 confirm_or_exit(action='upload')
2481
2482
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002483 def _PostUnsetIssueProperties(self):
2484 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002485 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002486
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002487 def GetRieveldObjForPresubmit(self):
2488 class ThisIsNotRietveldIssue(object):
2489 def __nonzero__(self):
2490 # This is a hack to make presubmit_support think that rietveld is not
2491 # defined, yet still ensure that calls directly result in a decent
2492 # exception message below.
2493 return False
2494
2495 def __getattr__(self, attr):
2496 print(
2497 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2498 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2499 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2500 'or use Rietveld for codereview.\n'
2501 'See also http://crbug.com/579160.' % attr)
2502 raise NotImplementedError()
2503 return ThisIsNotRietveldIssue()
2504
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002505 def GetGerritObjForPresubmit(self):
2506 return presubmit_support.GerritAccessor(self._GetGerritHost())
2507
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002508 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002509 """Apply a rough heuristic to give a simple summary of an issue's review
2510 or CQ status, assuming adherence to a common workflow.
2511
2512 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002513 * 'error' - error from review tool (including deleted issues)
2514 * 'unsent' - no reviewers added
2515 * 'waiting' - waiting for review
2516 * 'reply' - waiting for uploader to reply to review
2517 * 'lgtm' - Code-Review label has been set
2518 * 'commit' - in the commit queue
2519 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002520 """
2521 if not self.GetIssue():
2522 return None
2523
2524 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002525 data = self._GetChangeDetail([
2526 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002527 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002528 return 'error'
2529
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002530 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531 return 'closed'
2532
Aaron Gable9ab38c62017-04-06 14:36:33 -07002533 if data['labels'].get('Commit-Queue', {}).get('approved'):
2534 # The section will have an "approved" subsection if anyone has voted
2535 # the maximum value on the label.
2536 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002537
Aaron Gable9ab38c62017-04-06 14:36:33 -07002538 if data['labels'].get('Code-Review', {}).get('approved'):
2539 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002540
2541 if not data.get('reviewers', {}).get('REVIEWER', []):
2542 return 'unsent'
2543
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002544 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002545 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2546 last_message_author = messages.pop().get('author', {})
2547 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002548 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2549 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002550 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002551 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002552 if last_message_author.get('_account_id') == owner:
2553 # Most recent message was by owner.
2554 return 'waiting'
2555 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002556 # Some reply from non-owner.
2557 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002558
2559 # Somehow there are no messages even though there are reviewers.
2560 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002561
2562 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002563 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002564 return data['revisions'][data['current_revision']]['_number']
2565
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002566 def FetchDescription(self, force=False):
2567 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2568 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002569 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002570 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002571
dsansomee2d6fd92016-09-08 00:10:47 -07002572 def UpdateDescriptionRemote(self, description, force=False):
2573 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2574 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002575 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002576 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002577 'unpublished edit. Either publish the edit in the Gerrit web UI '
2578 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002579
2580 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2581 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002582 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002583 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002584
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002585 def AddComment(self, message):
2586 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2587 msg=message)
2588
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002589 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002590 # DETAILED_ACCOUNTS is to get emails in accounts.
2591 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2592 summary = []
2593 for msg in data.get('messages', []):
2594 # Gerrit spits out nanoseconds.
2595 assert len(msg['date'].split('.')[-1]) == 9
2596 date = datetime.datetime.strptime(msg['date'][:-3],
2597 '%Y-%m-%d %H:%M:%S.%f')
2598 summary.append(_CommentSummary(
2599 date=date,
2600 message=msg['message'],
2601 sender=msg['author']['email'],
2602 # These could be inferred from the text messages and correlated with
2603 # Code-Review label maximum, however this is not reliable.
2604 # Leaving as is until the need arises.
2605 approval=False,
2606 disapproval=False,
2607 ))
2608 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002609
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002610 def CloseIssue(self):
2611 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2612
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002613 def SubmitIssue(self, wait_for_merge=True):
2614 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2615 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002616
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002617 def _GetChangeDetail(self, options=None, issue=None,
2618 no_cache=False):
2619 """Returns details of the issue by querying Gerrit and caching results.
2620
2621 If fresh data is needed, set no_cache=True which will clear cache and
2622 thus new data will be fetched from Gerrit.
2623 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002624 options = options or []
2625 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002626 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002627
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002628 # Optimization to avoid multiple RPCs:
2629 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2630 'CURRENT_COMMIT' not in options):
2631 options.append('CURRENT_COMMIT')
2632
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002633 # Normalize issue and options for consistent keys in cache.
2634 issue = str(issue)
2635 options = [o.upper() for o in options]
2636
2637 # Check in cache first unless no_cache is True.
2638 if no_cache:
2639 self._detail_cache.pop(issue, None)
2640 else:
2641 options_set = frozenset(options)
2642 for cached_options_set, data in self._detail_cache.get(issue, []):
2643 # Assumption: data fetched before with extra options is suitable
2644 # for return for a smaller set of options.
2645 # For example, if we cached data for
2646 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2647 # and request is for options=[CURRENT_REVISION],
2648 # THEN we can return prior cached data.
2649 if options_set.issubset(cached_options_set):
2650 return data
2651
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002652 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002653 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002654 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002655 except gerrit_util.GerritError as e:
2656 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002657 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002658 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002659
2660 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002661 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002662
agable32978d92016-11-01 12:55:02 -07002663 def _GetChangeCommit(self, issue=None):
2664 issue = issue or self.GetIssue()
2665 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002666 try:
2667 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2668 except gerrit_util.GerritError as e:
2669 if e.http_status == 404:
2670 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2671 raise
agable32978d92016-11-01 12:55:02 -07002672 return data
2673
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002674 def CMDLand(self, force, bypass_hooks, verbose):
2675 if git_common.is_dirty_git_tree('land'):
2676 return 1
tandriid60367b2016-06-22 05:25:12 -07002677 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2678 if u'Commit-Queue' in detail.get('labels', {}):
2679 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002680 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2681 'which can test and land changes for you. '
2682 'Are you sure you wish to bypass it?\n',
2683 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002684
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002685 differs = True
tandriic4344b52016-08-29 06:04:54 -07002686 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002687 # Note: git diff outputs nothing if there is no diff.
2688 if not last_upload or RunGit(['diff', last_upload]).strip():
2689 print('WARNING: some changes from local branch haven\'t been uploaded')
2690 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002691 if detail['current_revision'] == last_upload:
2692 differs = False
2693 else:
2694 print('WARNING: local branch contents differ from latest uploaded '
2695 'patchset')
2696 if differs:
2697 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002698 confirm_or_exit(
2699 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2700 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002701 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2702 elif not bypass_hooks:
2703 hook_results = self.RunHook(
2704 committing=True,
2705 may_prompt=not force,
2706 verbose=verbose,
2707 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2708 if not hook_results.should_continue():
2709 return 1
2710
2711 self.SubmitIssue(wait_for_merge=True)
2712 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002713 links = self._GetChangeCommit().get('web_links', [])
2714 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002715 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002716 print('Landed as %s' % link.get('url'))
2717 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002718 return 0
2719
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002720 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2721 directory):
2722 assert not reject
2723 assert not nocommit
2724 assert not directory
2725 assert parsed_issue_arg.valid
2726
2727 self._changelist.issue = parsed_issue_arg.issue
2728
2729 if parsed_issue_arg.hostname:
2730 self._gerrit_host = parsed_issue_arg.hostname
2731 self._gerrit_server = 'https://%s' % self._gerrit_host
2732
tandriic2405f52016-10-10 08:13:15 -07002733 try:
2734 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002735 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002736 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002737
2738 if not parsed_issue_arg.patchset:
2739 # Use current revision by default.
2740 revision_info = detail['revisions'][detail['current_revision']]
2741 patchset = int(revision_info['_number'])
2742 else:
2743 patchset = parsed_issue_arg.patchset
2744 for revision_info in detail['revisions'].itervalues():
2745 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2746 break
2747 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002748 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002749 (parsed_issue_arg.patchset, self.GetIssue()))
2750
2751 fetch_info = revision_info['fetch']['http']
2752 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002753 self.SetIssue(self.GetIssue())
2754 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002755 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002756 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002757 (self.GetIssue(), self.GetPatchset()))
2758 return 0
2759
2760 @staticmethod
2761 def ParseIssueURL(parsed_url):
2762 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2763 return None
2764 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2765 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2766 # Short urls like https://domain/<issue_number> can be used, but don't allow
2767 # specifying the patchset (you'd 404), but we allow that here.
2768 if parsed_url.path == '/':
2769 part = parsed_url.fragment
2770 else:
2771 part = parsed_url.path
2772 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2773 if match:
2774 return _ParsedIssueNumberArgument(
2775 issue=int(match.group(2)),
2776 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002777 hostname=parsed_url.netloc,
2778 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002779 return None
2780
tandrii16e0b4e2016-06-07 10:34:28 -07002781 def _GerritCommitMsgHookCheck(self, offer_removal):
2782 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2783 if not os.path.exists(hook):
2784 return
2785 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2786 # custom developer made one.
2787 data = gclient_utils.FileRead(hook)
2788 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2789 return
2790 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002791 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002792 'and may interfere with it in subtle ways.\n'
2793 'We recommend you remove the commit-msg hook.')
2794 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002795 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002796 gclient_utils.rm_file_or_tree(hook)
2797 print('Gerrit commit-msg hook removed.')
2798 else:
2799 print('OK, will keep Gerrit commit-msg hook in place.')
2800
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002801 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002802 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002803 if options.squash and options.no_squash:
2804 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002805
2806 if not options.squash and not options.no_squash:
2807 # Load default for user, repo, squash=true, in this order.
2808 options.squash = settings.GetSquashGerritUploads()
2809 elif options.no_squash:
2810 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002811
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002812 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002813 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002814
Aaron Gableb56ad332017-01-06 15:24:31 -08002815 # This may be None; default fallback value is determined in logic below.
2816 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002817 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002818
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002819 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002820 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002821 if self.GetIssue():
2822 # Try to get the message from a previous upload.
2823 message = self.GetDescription()
2824 if not message:
2825 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002826 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002827 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002828 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002829 if options.message:
2830 # For compatibility with Rietveld, if -m|--message is given on
2831 # command line, title should be the first line of that message,
2832 # which shouldn't be confused with CL description.
2833 default_title = options.message.strip().split()[0]
2834 else:
2835 default_title = RunGit(
2836 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002837 if options.force:
2838 title = default_title
2839 else:
2840 title = ask_for_data(
2841 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002842 if title == default_title:
2843 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002844 change_id = self._GetChangeDetail()['change_id']
2845 while True:
2846 footer_change_ids = git_footers.get_footer_change_id(message)
2847 if footer_change_ids == [change_id]:
2848 break
2849 if not footer_change_ids:
2850 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002851 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002852 continue
2853 # There is already a valid footer but with different or several ids.
2854 # Doing this automatically is non-trivial as we don't want to lose
2855 # existing other footers, yet we want to append just 1 desired
2856 # Change-Id. Thus, just create a new footer, but let user verify the
2857 # new description.
2858 message = '%s\n\nChange-Id: %s' % (message, change_id)
2859 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002860 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002861 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002862 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002863 'Please, check the proposed correction to the description, '
2864 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2865 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2866 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002867 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002868 if not options.force:
2869 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002870 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002871 message = change_desc.description
2872 if not message:
2873 DieWithError("Description is empty. Aborting...")
2874 # Continue the while loop.
2875 # Sanity check of this code - we should end up with proper message
2876 # footer.
2877 assert [change_id] == git_footers.get_footer_change_id(message)
2878 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002879 else: # if not self.GetIssue()
2880 if options.message:
2881 message = options.message
2882 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002883 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002884 if options.title:
2885 message = options.title + '\n\n' + message
2886 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002887
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002889 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002890 # On first upload, patchset title is always this string, while
2891 # --title flag gets converted to first line of message.
2892 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002893 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002894 if not change_desc.description:
2895 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002896 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002897 if len(change_ids) > 1:
2898 DieWithError('too many Change-Id footers, at most 1 allowed.')
2899 if not change_ids:
2900 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002901 change_desc.set_description(git_footers.add_footer_change_id(
2902 change_desc.description,
2903 GenerateGerritChangeId(change_desc.description)))
2904 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002905 assert len(change_ids) == 1
2906 change_id = change_ids[0]
2907
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002908 if options.reviewers or options.tbrs or options.add_owners_to:
2909 change_desc.update_reviewers(options.reviewers, options.tbrs,
2910 options.add_owners_to, change)
2911
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002912 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002913 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2914 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002915 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2916 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002917 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002918 else:
2919 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002920 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002921 if not change_desc.description:
2922 DieWithError("Description is empty. Aborting...")
2923
2924 if not git_footers.get_footer_change_id(change_desc.description):
2925 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002926 change_desc.set_description(
2927 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002928 if options.reviewers or options.tbrs or options.add_owners_to:
2929 change_desc.update_reviewers(options.reviewers, options.tbrs,
2930 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002931 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002932 # For no-squash mode, we assume the remote called "origin" is the one we
2933 # want. It is not worthwhile to support different workflows for
2934 # no-squash mode.
2935 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002936 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2937
2938 assert change_desc
2939 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2940 ref_to_push)]).splitlines()
2941 if len(commits) > 1:
2942 print('WARNING: This will upload %d commits. Run the following command '
2943 'to see which commits will be uploaded: ' % len(commits))
2944 print('git log %s..%s' % (parent, ref_to_push))
2945 print('You can also use `git squash-branch` to squash these into a '
2946 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002947 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002948
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002949 if options.reviewers or options.tbrs or options.add_owners_to:
2950 change_desc.update_reviewers(options.reviewers, options.tbrs,
2951 options.add_owners_to, change)
2952
2953 if options.send_mail:
2954 if not change_desc.get_reviewers():
2955 DieWithError('Must specify reviewers to send email.', change_desc)
2956
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002957 # Extra options that can be specified at push time. Doc:
2958 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002959 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002960 if change_desc.get_reviewers(tbr_only=True):
2961 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002962 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002963
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002964
2965 # TODO(tandrii): options.message should be posted as a comment
2966 # if --send-email is set on non-initial upload as Rietveld used to do it.
2967
Aaron Gable9b713dd2016-12-14 16:04:21 -08002968 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002969 if not re.match(r'^[\w ]+$', title):
2970 title = re.sub(r'[^\w ]', '', title)
2971 if not automatic_title:
2972 print('WARNING: Patchset title may only contain alphanumeric chars '
2973 'and spaces. You can edit it in the UI. '
2974 'See https://crbug.com/663787.\n'
2975 'Cleaned up title: %s' % title)
2976 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2977 # reverse on its side.
2978 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002979
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002980 # Never notify now because no one is on the review. Notify when we add
2981 # reviewers and CCs below.
2982 refspec_opts.append('notify=NONE')
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002983
agablec6787972016-09-09 16:13:34 -07002984 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002985 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002986
rmistry9eadede2016-09-19 11:22:43 -07002987 if options.topic:
2988 # Documentation on Gerrit topics is here:
2989 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002990 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002991
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002992 refspec_suffix = ''
2993 if refspec_opts:
2994 refspec_suffix = '%' + ','.join(refspec_opts)
2995 assert ' ' not in refspec_suffix, (
2996 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2997 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2998
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002999 try:
3000 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003001 ['git', 'push', self.GetRemoteUrl(), refspec],
3002 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003003 # Flush after every line: useful for seeing progress when running as
3004 # recipe.
3005 filter_fn=lambda _: sys.stdout.flush())
3006 except subprocess2.CalledProcessError:
3007 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003008 'for the reason of the failure.\n'
3009 'Hint: run command below to diangose common Git/Gerrit '
3010 'credential problems:\n'
3011 ' git cl creds-check\n',
3012 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003013
3014 if options.squash:
3015 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3016 change_numbers = [m.group(1)
3017 for m in map(regex.match, push_stdout.splitlines())
3018 if m]
3019 if len(change_numbers) != 1:
3020 DieWithError(
3021 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003022 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003023 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003024 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003025
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003026 reviewers = sorted(change_desc.get_reviewers())
3027
tandrii88189772016-09-29 04:29:57 -07003028 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003029 if not options.private:
3030 cc = self.GetCCList().split(',')
3031 else:
3032 cc = []
tandrii88189772016-09-29 04:29:57 -07003033 if options.cc:
3034 cc.extend(options.cc)
3035 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003036 if change_desc.get_cced():
3037 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003038
3039 gerrit_util.AddReviewers(
3040 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3041 notify=bool(options.send_mail))
3042
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003043 return 0
3044
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003045 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3046 change_desc):
3047 """Computes parent of the generated commit to be uploaded to Gerrit.
3048
3049 Returns revision or a ref name.
3050 """
3051 if custom_cl_base:
3052 # Try to avoid creating additional unintended CLs when uploading, unless
3053 # user wants to take this risk.
3054 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3055 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3056 local_ref_of_target_remote])
3057 if code == 1:
3058 print('\nWARNING: manually specified base of this CL `%s` '
3059 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3060 'If you proceed with upload, more than 1 CL may be created by '
3061 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3062 'If you are certain that specified base `%s` has already been '
3063 'uploaded to Gerrit as another CL, you may proceed.\n' %
3064 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3065 if not force:
3066 confirm_or_exit(
3067 'Do you take responsibility for cleaning up potential mess '
3068 'resulting from proceeding with upload?',
3069 action='upload')
3070 return custom_cl_base
3071
Aaron Gablef97e33d2017-03-30 15:44:27 -07003072 if remote != '.':
3073 return self.GetCommonAncestorWithUpstream()
3074
3075 # If our upstream branch is local, we base our squashed commit on its
3076 # squashed version.
3077 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3078
Aaron Gablef97e33d2017-03-30 15:44:27 -07003079 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003080 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003081
3082 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003083 # TODO(tandrii): consider checking parent change in Gerrit and using its
3084 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3085 # the tree hash of the parent branch. The upside is less likely bogus
3086 # requests to reupload parent change just because it's uploadhash is
3087 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003088 parent = RunGit(['config',
3089 'branch.%s.gerritsquashhash' % upstream_branch_name],
3090 error_ok=True).strip()
3091 # Verify that the upstream branch has been uploaded too, otherwise
3092 # Gerrit will create additional CLs when uploading.
3093 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3094 RunGitSilent(['rev-parse', parent + ':'])):
3095 DieWithError(
3096 '\nUpload upstream branch %s first.\n'
3097 'It is likely that this branch has been rebased since its last '
3098 'upload, so you just need to upload it again.\n'
3099 '(If you uploaded it with --no-squash, then branch dependencies '
3100 'are not supported, and you should reupload with --squash.)'
3101 % upstream_branch_name,
3102 change_desc)
3103 return parent
3104
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003105 def _AddChangeIdToCommitMessage(self, options, args):
3106 """Re-commits using the current message, assumes the commit hook is in
3107 place.
3108 """
3109 log_desc = options.message or CreateDescriptionFromLog(args)
3110 git_command = ['commit', '--amend', '-m', log_desc]
3111 RunGit(git_command)
3112 new_log_desc = CreateDescriptionFromLog(args)
3113 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003114 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003115 return new_log_desc
3116 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003117 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003118
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003119 def SetCQState(self, new_state):
3120 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003121 vote_map = {
3122 _CQState.NONE: 0,
3123 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003124 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003125 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003126 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3127 if new_state == _CQState.DRY_RUN:
3128 # Don't spam everybody reviewer/owner.
3129 kwargs['notify'] = 'NONE'
3130 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003131
tandriie113dfd2016-10-11 10:20:12 -07003132 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003133 try:
3134 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003135 except GerritChangeNotExists:
3136 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003137
3138 if data['status'] in ('ABANDONED', 'MERGED'):
3139 return 'CL %s is closed' % self.GetIssue()
3140
3141 def GetTryjobProperties(self, patchset=None):
3142 """Returns dictionary of properties to launch tryjob."""
3143 data = self._GetChangeDetail(['ALL_REVISIONS'])
3144 patchset = int(patchset or self.GetPatchset())
3145 assert patchset
3146 revision_data = None # Pylint wants it to be defined.
3147 for revision_data in data['revisions'].itervalues():
3148 if int(revision_data['_number']) == patchset:
3149 break
3150 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003151 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003152 (patchset, self.GetIssue()))
3153 return {
3154 'patch_issue': self.GetIssue(),
3155 'patch_set': patchset or self.GetPatchset(),
3156 'patch_project': data['project'],
3157 'patch_storage': 'gerrit',
3158 'patch_ref': revision_data['fetch']['http']['ref'],
3159 'patch_repository_url': revision_data['fetch']['http']['url'],
3160 'patch_gerrit_url': self.GetCodereviewServer(),
3161 }
tandriie113dfd2016-10-11 10:20:12 -07003162
tandriide281ae2016-10-12 06:02:30 -07003163 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003164 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003165
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003166
3167_CODEREVIEW_IMPLEMENTATIONS = {
3168 'rietveld': _RietveldChangelistImpl,
3169 'gerrit': _GerritChangelistImpl,
3170}
3171
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003172
iannuccie53c9352016-08-17 14:40:40 -07003173def _add_codereview_issue_select_options(parser, extra=""):
3174 _add_codereview_select_options(parser)
3175
3176 text = ('Operate on this issue number instead of the current branch\'s '
3177 'implicit issue.')
3178 if extra:
3179 text += ' '+extra
3180 parser.add_option('-i', '--issue', type=int, help=text)
3181
3182
3183def _process_codereview_issue_select_options(parser, options):
3184 _process_codereview_select_options(parser, options)
3185 if options.issue is not None and not options.forced_codereview:
3186 parser.error('--issue must be specified with either --rietveld or --gerrit')
3187
3188
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003189def _add_codereview_select_options(parser):
3190 """Appends --gerrit and --rietveld options to force specific codereview."""
3191 parser.codereview_group = optparse.OptionGroup(
3192 parser, 'EXPERIMENTAL! Codereview override options')
3193 parser.add_option_group(parser.codereview_group)
3194 parser.codereview_group.add_option(
3195 '--gerrit', action='store_true',
3196 help='Force the use of Gerrit for codereview')
3197 parser.codereview_group.add_option(
3198 '--rietveld', action='store_true',
3199 help='Force the use of Rietveld for codereview')
3200
3201
3202def _process_codereview_select_options(parser, options):
3203 if options.gerrit and options.rietveld:
3204 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3205 options.forced_codereview = None
3206 if options.gerrit:
3207 options.forced_codereview = 'gerrit'
3208 elif options.rietveld:
3209 options.forced_codereview = 'rietveld'
3210
3211
tandriif9aefb72016-07-01 09:06:51 -07003212def _get_bug_line_values(default_project, bugs):
3213 """Given default_project and comma separated list of bugs, yields bug line
3214 values.
3215
3216 Each bug can be either:
3217 * a number, which is combined with default_project
3218 * string, which is left as is.
3219
3220 This function may produce more than one line, because bugdroid expects one
3221 project per line.
3222
3223 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3224 ['v8:123', 'chromium:789']
3225 """
3226 default_bugs = []
3227 others = []
3228 for bug in bugs.split(','):
3229 bug = bug.strip()
3230 if bug:
3231 try:
3232 default_bugs.append(int(bug))
3233 except ValueError:
3234 others.append(bug)
3235
3236 if default_bugs:
3237 default_bugs = ','.join(map(str, default_bugs))
3238 if default_project:
3239 yield '%s:%s' % (default_project, default_bugs)
3240 else:
3241 yield default_bugs
3242 for other in sorted(others):
3243 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3244 yield other
3245
3246
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003247class ChangeDescription(object):
3248 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003249 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003250 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003251 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003252 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003253
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003254 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003255 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003256
agable@chromium.org42c20792013-09-12 17:34:49 +00003257 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003258 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003259 return '\n'.join(self._description_lines)
3260
3261 def set_description(self, desc):
3262 if isinstance(desc, basestring):
3263 lines = desc.splitlines()
3264 else:
3265 lines = [line.rstrip() for line in desc]
3266 while lines and not lines[0]:
3267 lines.pop(0)
3268 while lines and not lines[-1]:
3269 lines.pop(-1)
3270 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003271
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003272 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3273 """Rewrites the R=/TBR= line(s) as a single line each.
3274
3275 Args:
3276 reviewers (list(str)) - list of additional emails to use for reviewers.
3277 tbrs (list(str)) - list of additional emails to use for TBRs.
3278 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3279 the change that are missing OWNER coverage. If this is not None, you
3280 must also pass a value for `change`.
3281 change (Change) - The Change that should be used for OWNERS lookups.
3282 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003283 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003284 assert isinstance(tbrs, list), tbrs
3285
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003286 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003287 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003288
3289 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003290 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003291
3292 reviewers = set(reviewers)
3293 tbrs = set(tbrs)
3294 LOOKUP = {
3295 'TBR': tbrs,
3296 'R': reviewers,
3297 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003298
agable@chromium.org42c20792013-09-12 17:34:49 +00003299 # Get the set of R= and TBR= lines and remove them from the desciption.
3300 regexp = re.compile(self.R_LINE)
3301 matches = [regexp.match(line) for line in self._description_lines]
3302 new_desc = [l for i, l in enumerate(self._description_lines)
3303 if not matches[i]]
3304 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003305
agable@chromium.org42c20792013-09-12 17:34:49 +00003306 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003307
3308 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003309 for match in matches:
3310 if not match:
3311 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003312 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3313
3314 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003315 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003316 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003317 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003318 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003319 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003320 LOOKUP[add_owners_to].update(
3321 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003322
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003323 # If any folks ended up in both groups, remove them from tbrs.
3324 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003325
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003326 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3327 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003328
3329 # Put the new lines in the description where the old first R= line was.
3330 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3331 if 0 <= line_loc < len(self._description_lines):
3332 if new_tbr_line:
3333 self._description_lines.insert(line_loc, new_tbr_line)
3334 if new_r_line:
3335 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003336 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003337 if new_r_line:
3338 self.append_footer(new_r_line)
3339 if new_tbr_line:
3340 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003341
Aaron Gable3a16ed12017-03-23 10:51:55 -07003342 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003343 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003344 self.set_description([
3345 '# Enter a description of the change.',
3346 '# This will be displayed on the codereview site.',
3347 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003348 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003349 '--------------------',
3350 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003351
agable@chromium.org42c20792013-09-12 17:34:49 +00003352 regexp = re.compile(self.BUG_LINE)
3353 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003354 prefix = settings.GetBugPrefix()
3355 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003356 if git_footer:
3357 self.append_footer('Bug: %s' % ', '.join(values))
3358 else:
3359 for value in values:
3360 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003361
agable@chromium.org42c20792013-09-12 17:34:49 +00003362 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003363 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003364 if not content:
3365 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003366 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003367
3368 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003369 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3370 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003371 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003372 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003373
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003374 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003375 """Adds a footer line to the description.
3376
3377 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3378 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3379 that Gerrit footers are always at the end.
3380 """
3381 parsed_footer_line = git_footers.parse_footer(line)
3382 if parsed_footer_line:
3383 # Line is a gerrit footer in the form: Footer-Key: any value.
3384 # Thus, must be appended observing Gerrit footer rules.
3385 self.set_description(
3386 git_footers.add_footer(self.description,
3387 key=parsed_footer_line[0],
3388 value=parsed_footer_line[1]))
3389 return
3390
3391 if not self._description_lines:
3392 self._description_lines.append(line)
3393 return
3394
3395 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3396 if gerrit_footers:
3397 # git_footers.split_footers ensures that there is an empty line before
3398 # actual (gerrit) footers, if any. We have to keep it that way.
3399 assert top_lines and top_lines[-1] == ''
3400 top_lines, separator = top_lines[:-1], top_lines[-1:]
3401 else:
3402 separator = [] # No need for separator if there are no gerrit_footers.
3403
3404 prev_line = top_lines[-1] if top_lines else ''
3405 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3406 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3407 top_lines.append('')
3408 top_lines.append(line)
3409 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003410
tandrii99a72f22016-08-17 14:33:24 -07003411 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003412 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003413 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003414 reviewers = [match.group(2).strip()
3415 for match in matches
3416 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003417 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003418
bradnelsond975b302016-10-23 12:20:23 -07003419 def get_cced(self):
3420 """Retrieves the list of reviewers."""
3421 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3422 cced = [match.group(2).strip() for match in matches if match]
3423 return cleanup_list(cced)
3424
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003425 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3426 """Updates this commit description given the parent.
3427
3428 This is essentially what Gnumbd used to do.
3429 Consult https://goo.gl/WMmpDe for more details.
3430 """
3431 assert parent_msg # No, orphan branch creation isn't supported.
3432 assert parent_hash
3433 assert dest_ref
3434 parent_footer_map = git_footers.parse_footers(parent_msg)
3435 # This will also happily parse svn-position, which GnumbD is no longer
3436 # supporting. While we'd generate correct footers, the verifier plugin
3437 # installed in Gerrit will block such commit (ie git push below will fail).
3438 parent_position = git_footers.get_position(parent_footer_map)
3439
3440 # Cherry-picks may have last line obscuring their prior footers,
3441 # from git_footers perspective. This is also what Gnumbd did.
3442 cp_line = None
3443 if (self._description_lines and
3444 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3445 cp_line = self._description_lines.pop()
3446
3447 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3448
3449 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3450 # user interference with actual footers we'd insert below.
3451 for i, (k, v) in enumerate(parsed_footers):
3452 if k.startswith('Cr-'):
3453 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3454
3455 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003456 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003457 if parent_position[0] == dest_ref:
3458 # Same branch as parent.
3459 number = int(parent_position[1]) + 1
3460 else:
3461 number = 1 # New branch, and extra lineage.
3462 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3463 int(parent_position[1])))
3464
3465 parsed_footers.append(('Cr-Commit-Position',
3466 '%s@{#%d}' % (dest_ref, number)))
3467 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3468
3469 self._description_lines = top_lines
3470 if cp_line:
3471 self._description_lines.append(cp_line)
3472 if self._description_lines[-1] != '':
3473 self._description_lines.append('') # Ensure footer separator.
3474 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3475
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003476
Aaron Gablea1bab272017-04-11 16:38:18 -07003477def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003478 """Retrieves the reviewers that approved a CL from the issue properties with
3479 messages.
3480
3481 Note that the list may contain reviewers that are not committer, thus are not
3482 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003483
3484 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003485 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003486 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003487 return sorted(
3488 set(
3489 message['sender']
3490 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003491 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003492 )
3493 )
3494
3495
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003496def FindCodereviewSettingsFile(filename='codereview.settings'):
3497 """Finds the given file starting in the cwd and going up.
3498
3499 Only looks up to the top of the repository unless an
3500 'inherit-review-settings-ok' file exists in the root of the repository.
3501 """
3502 inherit_ok_file = 'inherit-review-settings-ok'
3503 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003504 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003505 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3506 root = '/'
3507 while True:
3508 if filename in os.listdir(cwd):
3509 if os.path.isfile(os.path.join(cwd, filename)):
3510 return open(os.path.join(cwd, filename))
3511 if cwd == root:
3512 break
3513 cwd = os.path.dirname(cwd)
3514
3515
3516def LoadCodereviewSettingsFromFile(fileobj):
3517 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003518 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003519
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003520 def SetProperty(name, setting, unset_error_ok=False):
3521 fullname = 'rietveld.' + name
3522 if setting in keyvals:
3523 RunGit(['config', fullname, keyvals[setting]])
3524 else:
3525 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3526
tandrii48df5812016-10-17 03:55:37 -07003527 if not keyvals.get('GERRIT_HOST', False):
3528 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003529 # Only server setting is required. Other settings can be absent.
3530 # In that case, we ignore errors raised during option deletion attempt.
3531 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003532 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003533 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3534 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003535 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003536 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3537 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003538 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003539 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3540 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003541
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003542 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003543 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003544
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003545 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003546 RunGit(['config', 'gerrit.squash-uploads',
3547 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003548
tandrii@chromium.org28253532016-04-14 13:46:56 +00003549 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003550 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003551 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3552
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003553 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003554 # should be of the form
3555 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3556 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003557 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3558 keyvals['ORIGIN_URL_CONFIG']])
3559
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003560
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003561def urlretrieve(source, destination):
3562 """urllib is broken for SSL connections via a proxy therefore we
3563 can't use urllib.urlretrieve()."""
3564 with open(destination, 'w') as f:
3565 f.write(urllib2.urlopen(source).read())
3566
3567
ukai@chromium.org712d6102013-11-27 00:52:58 +00003568def hasSheBang(fname):
3569 """Checks fname is a #! script."""
3570 with open(fname) as f:
3571 return f.read(2).startswith('#!')
3572
3573
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003574# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3575def DownloadHooks(*args, **kwargs):
3576 pass
3577
3578
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003579def DownloadGerritHook(force):
3580 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003581
3582 Args:
3583 force: True to update hooks. False to install hooks if not present.
3584 """
3585 if not settings.GetIsGerrit():
3586 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003587 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003588 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3589 if not os.access(dst, os.X_OK):
3590 if os.path.exists(dst):
3591 if not force:
3592 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003593 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003594 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003595 if not hasSheBang(dst):
3596 DieWithError('Not a script: %s\n'
3597 'You need to download from\n%s\n'
3598 'into .git/hooks/commit-msg and '
3599 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003600 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3601 except Exception:
3602 if os.path.exists(dst):
3603 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003604 DieWithError('\nFailed to download hooks.\n'
3605 'You need to download from\n%s\n'
3606 'into .git/hooks/commit-msg and '
3607 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003608
3609
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003610def GetRietveldCodereviewSettingsInteractively():
3611 """Prompt the user for settings."""
3612 server = settings.GetDefaultServerUrl(error_ok=True)
3613 prompt = 'Rietveld server (host[:port])'
3614 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3615 newserver = ask_for_data(prompt + ':')
3616 if not server and not newserver:
3617 newserver = DEFAULT_SERVER
3618 if newserver:
3619 newserver = gclient_utils.UpgradeToHttps(newserver)
3620 if newserver != server:
3621 RunGit(['config', 'rietveld.server', newserver])
3622
3623 def SetProperty(initial, caption, name, is_url):
3624 prompt = caption
3625 if initial:
3626 prompt += ' ("x" to clear) [%s]' % initial
3627 new_val = ask_for_data(prompt + ':')
3628 if new_val == 'x':
3629 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3630 elif new_val:
3631 if is_url:
3632 new_val = gclient_utils.UpgradeToHttps(new_val)
3633 if new_val != initial:
3634 RunGit(['config', 'rietveld.' + name, new_val])
3635
3636 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3637 SetProperty(settings.GetDefaultPrivateFlag(),
3638 'Private flag (rietveld only)', 'private', False)
3639 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3640 'tree-status-url', False)
3641 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3642 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3643 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3644 'run-post-upload-hook', False)
3645
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003646
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003647class _GitCookiesChecker(object):
3648 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003649
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003650 _GOOGLESOURCE = 'googlesource.com'
3651
3652 def __init__(self):
3653 # Cached list of [host, identity, source], where source is either
3654 # .gitcookies or .netrc.
3655 self._all_hosts = None
3656
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003657 def ensure_configured_gitcookies(self):
3658 """Runs checks and suggests fixes to make git use .gitcookies from default
3659 path."""
3660 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3661 configured_path = RunGitSilent(
3662 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003663 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003664 if configured_path:
3665 self._ensure_default_gitcookies_path(configured_path, default)
3666 else:
3667 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003668
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003669 @staticmethod
3670 def _ensure_default_gitcookies_path(configured_path, default_path):
3671 assert configured_path
3672 if configured_path == default_path:
3673 print('git is already configured to use your .gitcookies from %s' %
3674 configured_path)
3675 return
3676
3677 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3678 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3679 (configured_path, default_path))
3680
3681 if not os.path.exists(configured_path):
3682 print('However, your configured .gitcookies file is missing.')
3683 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3684 action='reconfigure')
3685 RunGit(['config', '--global', 'http.cookiefile', default_path])
3686 return
3687
3688 if os.path.exists(default_path):
3689 print('WARNING: default .gitcookies file already exists %s' %
3690 default_path)
3691 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3692 default_path)
3693
3694 confirm_or_exit('Move existing .gitcookies to default location?',
3695 action='move')
3696 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003697 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003698 print('Moved and reconfigured git to use .gitcookies from %s' %
3699 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003700
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003701 @staticmethod
3702 def _configure_gitcookies_path(default_path):
3703 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3704 if os.path.exists(netrc_path):
3705 print('You seem to be using outdated .netrc for git credentials: %s' %
3706 netrc_path)
3707 print('This tool will guide you through setting up recommended '
3708 '.gitcookies store for git credentials.\n'
3709 '\n'
3710 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3711 ' git config --global --unset http.cookiefile\n'
3712 ' mv %s %s.backup\n\n' % (default_path, default_path))
3713 confirm_or_exit(action='setup .gitcookies')
3714 RunGit(['config', '--global', 'http.cookiefile', default_path])
3715 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003716
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003717 def get_hosts_with_creds(self, include_netrc=False):
3718 if self._all_hosts is None:
3719 a = gerrit_util.CookiesAuthenticator()
3720 self._all_hosts = [
3721 (h, u, s)
3722 for h, u, s in itertools.chain(
3723 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3724 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3725 )
3726 if h.endswith(self._GOOGLESOURCE)
3727 ]
3728
3729 if include_netrc:
3730 return self._all_hosts
3731 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3732
3733 def print_current_creds(self, include_netrc=False):
3734 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3735 if not hosts:
3736 print('No Git/Gerrit credentials found')
3737 return
3738 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3739 header = [('Host', 'User', 'Which file'),
3740 ['=' * l for l in lengths]]
3741 for row in (header + hosts):
3742 print('\t'.join((('%%+%ds' % l) % s)
3743 for l, s in zip(lengths, row)))
3744
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003745 @staticmethod
3746 def _parse_identity(identity):
3747 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3748 username, domain = identity.split('.', 1)
3749 if username.startswith('git-'):
3750 username = username[len('git-'):]
3751 return username, domain
3752
3753 def _get_usernames_of_domain(self, domain):
3754 """Returns list of usernames referenced by .gitcookies in a given domain."""
3755 identities_by_domain = {}
3756 for _, identity, _ in self.get_hosts_with_creds():
3757 username, domain = self._parse_identity(identity)
3758 identities_by_domain.setdefault(domain, []).append(username)
3759 return identities_by_domain.get(domain)
3760
3761 def _canonical_git_googlesource_host(self, host):
3762 """Normalizes Gerrit hosts (with '-review') to Git host."""
3763 assert host.endswith(self._GOOGLESOURCE)
3764 # Prefix doesn't include '.' at the end.
3765 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3766 if prefix.endswith('-review'):
3767 prefix = prefix[:-len('-review')]
3768 return prefix + '.' + self._GOOGLESOURCE
3769
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003770 def _canonical_gerrit_googlesource_host(self, host):
3771 git_host = self._canonical_git_googlesource_host(host)
3772 prefix = git_host.split('.', 1)[0]
3773 return prefix + '-review.' + self._GOOGLESOURCE
3774
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003775 def has_generic_host(self):
3776 """Returns whether generic .googlesource.com has been configured.
3777
3778 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3779 """
3780 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3781 if host == '.' + self._GOOGLESOURCE:
3782 return True
3783 return False
3784
3785 def _get_git_gerrit_identity_pairs(self):
3786 """Returns map from canonic host to pair of identities (Git, Gerrit).
3787
3788 One of identities might be None, meaning not configured.
3789 """
3790 host_to_identity_pairs = {}
3791 for host, identity, _ in self.get_hosts_with_creds():
3792 canonical = self._canonical_git_googlesource_host(host)
3793 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3794 idx = 0 if canonical == host else 1
3795 pair[idx] = identity
3796 return host_to_identity_pairs
3797
3798 def get_partially_configured_hosts(self):
3799 return set(
3800 host for host, identities_pair in
3801 self._get_git_gerrit_identity_pairs().iteritems()
3802 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3803
3804 def get_conflicting_hosts(self):
3805 return set(
3806 host for host, (i1, i2) in
3807 self._get_git_gerrit_identity_pairs().iteritems()
3808 if None not in (i1, i2) and i1 != i2)
3809
3810 def get_duplicated_hosts(self):
3811 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3812 return set(host for host, count in counters.iteritems() if count > 1)
3813
3814 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3815 'chromium.googlesource.com': 'chromium.org',
3816 'chrome-internal.googlesource.com': 'google.com',
3817 }
3818
3819 def get_hosts_with_wrong_identities(self):
3820 """Finds hosts which **likely** reference wrong identities.
3821
3822 Note: skips hosts which have conflicting identities for Git and Gerrit.
3823 """
3824 hosts = set()
3825 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3826 pair = self._get_git_gerrit_identity_pairs().get(host)
3827 if pair and pair[0] == pair[1]:
3828 _, domain = self._parse_identity(pair[0])
3829 if domain != expected:
3830 hosts.add(host)
3831 return hosts
3832
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003833 @staticmethod
3834 def print_hosts(hosts, extra_column_func=None):
3835 hosts = sorted(hosts)
3836 assert hosts
3837 if extra_column_func is None:
3838 extras = [''] * len(hosts)
3839 else:
3840 extras = [extra_column_func(host) for host in hosts]
3841 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3842 for he in zip(hosts, extras):
3843 print(tmpl % he)
3844 print()
3845
3846 def find_and_report_problems(self):
3847 """Returns True if there was at least one problem, else False."""
3848 problems = [False]
3849 def add_problem():
3850 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003851 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003852 problems[0] = True
3853
3854 if self.has_generic_host():
3855 add_problem()
3856 print(' .googlesource.com record detected\n'
3857 ' Chrome Infrastructure team recommends to list full host names '
3858 'explicitly.\n')
3859
3860 dups = self.get_duplicated_hosts()
3861 if dups:
3862 add_problem()
3863 print(' The following hosts were defined twice:\n')
3864 self.print_hosts(dups)
3865
3866 partial = self.get_partially_configured_hosts()
3867 if partial:
3868 add_problem()
3869 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3870 'These hosts are missing:')
3871 self.print_hosts(partial)
3872
3873 conflicting = self.get_conflicting_hosts()
3874 if conflicting:
3875 add_problem()
3876 print(' The following Git hosts have differing credentials from their '
3877 'Gerrit counterparts:\n')
3878 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3879 tuple(self._get_git_gerrit_identity_pairs()[host]))
3880
3881 wrong = self.get_hosts_with_wrong_identities()
3882 if wrong:
3883 add_problem()
3884 print(' These hosts likely use wrong identity:\n')
3885 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3886 (self._get_git_gerrit_identity_pairs()[host][0],
3887 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3888 return problems[0]
3889
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003890
3891def CMDcreds_check(parser, args):
3892 """Checks credentials and suggests changes."""
3893 _, _ = parser.parse_args(args)
3894
3895 if gerrit_util.GceAuthenticator.is_gce():
3896 DieWithError('this command is not designed for GCE, are you on a bot?')
3897
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003898 checker = _GitCookiesChecker()
3899 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003900
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003901 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003902 checker.print_current_creds(include_netrc=True)
3903
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003904 if not checker.find_and_report_problems():
3905 print('\nNo problems detected in your .gitcookies')
3906 return 0
3907 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003908
3909
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003910@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003911def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003912 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003913
tandrii5d0a0422016-09-14 06:24:35 -07003914 print('WARNING: git cl config works for Rietveld only')
3915 # TODO(tandrii): remove this once we switch to Gerrit.
3916 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003917 parser.add_option('--activate-update', action='store_true',
3918 help='activate auto-updating [rietveld] section in '
3919 '.git/config')
3920 parser.add_option('--deactivate-update', action='store_true',
3921 help='deactivate auto-updating [rietveld] section in '
3922 '.git/config')
3923 options, args = parser.parse_args(args)
3924
3925 if options.deactivate_update:
3926 RunGit(['config', 'rietveld.autoupdate', 'false'])
3927 return
3928
3929 if options.activate_update:
3930 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3931 return
3932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003933 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003934 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003935 return 0
3936
3937 url = args[0]
3938 if not url.endswith('codereview.settings'):
3939 url = os.path.join(url, 'codereview.settings')
3940
3941 # Load code review settings and download hooks (if available).
3942 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3943 return 0
3944
3945
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003946def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003947 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003948 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3949 branch = ShortBranchName(branchref)
3950 _, args = parser.parse_args(args)
3951 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003952 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003953 return RunGit(['config', 'branch.%s.base-url' % branch],
3954 error_ok=False).strip()
3955 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003956 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003957 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3958 error_ok=False).strip()
3959
3960
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003961def color_for_status(status):
3962 """Maps a Changelist status to color, for CMDstatus and other tools."""
3963 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003964 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003965 'waiting': Fore.BLUE,
3966 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003967 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003968 'lgtm': Fore.GREEN,
3969 'commit': Fore.MAGENTA,
3970 'closed': Fore.CYAN,
3971 'error': Fore.WHITE,
3972 }.get(status, Fore.WHITE)
3973
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003974
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003975def get_cl_statuses(changes, fine_grained, max_processes=None):
3976 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003977
3978 If fine_grained is true, this will fetch CL statuses from the server.
3979 Otherwise, simply indicate if there's a matching url for the given branches.
3980
3981 If max_processes is specified, it is used as the maximum number of processes
3982 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3983 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003984
3985 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003986 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003987 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003988 upload.verbosity = 0
3989
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003990 if not changes:
3991 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003992
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003993 if not fine_grained:
3994 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003995 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003996 for cl in changes:
3997 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003998 return
3999
4000 # First, sort out authentication issues.
4001 logging.debug('ensuring credentials exist')
4002 for cl in changes:
4003 cl.EnsureAuthenticated(force=False, refresh=True)
4004
4005 def fetch(cl):
4006 try:
4007 return (cl, cl.GetStatus())
4008 except:
4009 # See http://crbug.com/629863.
4010 logging.exception('failed to fetch status for %s:', cl)
4011 raise
4012
4013 threads_count = len(changes)
4014 if max_processes:
4015 threads_count = max(1, min(threads_count, max_processes))
4016 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4017
4018 pool = ThreadPool(threads_count)
4019 fetched_cls = set()
4020 try:
4021 it = pool.imap_unordered(fetch, changes).__iter__()
4022 while True:
4023 try:
4024 cl, status = it.next(timeout=5)
4025 except multiprocessing.TimeoutError:
4026 break
4027 fetched_cls.add(cl)
4028 yield cl, status
4029 finally:
4030 pool.close()
4031
4032 # Add any branches that failed to fetch.
4033 for cl in set(changes) - fetched_cls:
4034 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004035
rmistry@google.com2dd99862015-06-22 12:22:18 +00004036
4037def upload_branch_deps(cl, args):
4038 """Uploads CLs of local branches that are dependents of the current branch.
4039
4040 If the local branch dependency tree looks like:
4041 test1 -> test2.1 -> test3.1
4042 -> test3.2
4043 -> test2.2 -> test3.3
4044
4045 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4046 run on the dependent branches in this order:
4047 test2.1, test3.1, test3.2, test2.2, test3.3
4048
4049 Note: This function does not rebase your local dependent branches. Use it when
4050 you make a change to the parent branch that will not conflict with its
4051 dependent branches, and you would like their dependencies updated in
4052 Rietveld.
4053 """
4054 if git_common.is_dirty_git_tree('upload-branch-deps'):
4055 return 1
4056
4057 root_branch = cl.GetBranch()
4058 if root_branch is None:
4059 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4060 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004061 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004062 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4063 'patchset dependencies without an uploaded CL.')
4064
4065 branches = RunGit(['for-each-ref',
4066 '--format=%(refname:short) %(upstream:short)',
4067 'refs/heads'])
4068 if not branches:
4069 print('No local branches found.')
4070 return 0
4071
4072 # Create a dictionary of all local branches to the branches that are dependent
4073 # on it.
4074 tracked_to_dependents = collections.defaultdict(list)
4075 for b in branches.splitlines():
4076 tokens = b.split()
4077 if len(tokens) == 2:
4078 branch_name, tracked = tokens
4079 tracked_to_dependents[tracked].append(branch_name)
4080
vapiera7fbd5a2016-06-16 09:17:49 -07004081 print()
4082 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004083 dependents = []
4084 def traverse_dependents_preorder(branch, padding=''):
4085 dependents_to_process = tracked_to_dependents.get(branch, [])
4086 padding += ' '
4087 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004088 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004089 dependents.append(dependent)
4090 traverse_dependents_preorder(dependent, padding)
4091 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004092 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004093
4094 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004095 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004096 return 0
4097
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004098 confirm_or_exit('This command will checkout all dependent branches and run '
4099 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004100
andybons@chromium.org962f9462016-02-03 20:00:42 +00004101 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004102 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004103 args.extend(['-t', 'Updated patchset dependency'])
4104
rmistry@google.com2dd99862015-06-22 12:22:18 +00004105 # Record all dependents that failed to upload.
4106 failures = {}
4107 # Go through all dependents, checkout the branch and upload.
4108 try:
4109 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004110 print()
4111 print('--------------------------------------')
4112 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004113 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004114 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004115 try:
4116 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004117 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004118 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004119 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004120 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004121 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004122 finally:
4123 # Swap back to the original root branch.
4124 RunGit(['checkout', '-q', root_branch])
4125
vapiera7fbd5a2016-06-16 09:17:49 -07004126 print()
4127 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004128 for dependent_branch in dependents:
4129 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004130 print(' %s : %s' % (dependent_branch, upload_status))
4131 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004132
4133 return 0
4134
4135
kmarshall3bff56b2016-06-06 18:31:47 -07004136def CMDarchive(parser, args):
4137 """Archives and deletes branches associated with closed changelists."""
4138 parser.add_option(
4139 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004140 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004141 parser.add_option(
4142 '-f', '--force', action='store_true',
4143 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004144 parser.add_option(
4145 '-d', '--dry-run', action='store_true',
4146 help='Skip the branch tagging and removal steps.')
4147 parser.add_option(
4148 '-t', '--notags', action='store_true',
4149 help='Do not tag archived branches. '
4150 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004151
4152 auth.add_auth_options(parser)
4153 options, args = parser.parse_args(args)
4154 if args:
4155 parser.error('Unsupported args: %s' % ' '.join(args))
4156 auth_config = auth.extract_auth_config_from_options(options)
4157
4158 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4159 if not branches:
4160 return 0
4161
vapiera7fbd5a2016-06-16 09:17:49 -07004162 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004163 changes = [Changelist(branchref=b, auth_config=auth_config)
4164 for b in branches.splitlines()]
4165 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4166 statuses = get_cl_statuses(changes,
4167 fine_grained=True,
4168 max_processes=options.maxjobs)
4169 proposal = [(cl.GetBranch(),
4170 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4171 for cl, status in statuses
4172 if status == 'closed']
4173 proposal.sort()
4174
4175 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004177 return 0
4178
4179 current_branch = GetCurrentBranch()
4180
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004182 if options.notags:
4183 for next_item in proposal:
4184 print(' ' + next_item[0])
4185 else:
4186 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4187 for next_item in proposal:
4188 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004189
kmarshall9249e012016-08-23 12:02:16 -07004190 # Quit now on precondition failure or if instructed by the user, either
4191 # via an interactive prompt or by command line flags.
4192 if options.dry_run:
4193 print('\nNo changes were made (dry run).\n')
4194 return 0
4195 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004196 print('You are currently on a branch \'%s\' which is associated with a '
4197 'closed codereview issue, so archive cannot proceed. Please '
4198 'checkout another branch and run this command again.' %
4199 current_branch)
4200 return 1
kmarshall9249e012016-08-23 12:02:16 -07004201 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004202 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4203 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004204 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004205 return 1
4206
4207 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004208 if not options.notags:
4209 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004210 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004211
vapiera7fbd5a2016-06-16 09:17:49 -07004212 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004213
4214 return 0
4215
4216
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004217def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004218 """Show status of changelists.
4219
4220 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004221 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004222 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004223 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004224 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004225 - Magenta in the commit queue
4226 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004227 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004228
4229 Also see 'git cl comments'.
4230 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004231 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004232 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004233 parser.add_option('-f', '--fast', action='store_true',
4234 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004235 parser.add_option(
4236 '-j', '--maxjobs', action='store', type=int,
4237 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004238
4239 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004240 _add_codereview_issue_select_options(
4241 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004242 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004243 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004244 if args:
4245 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004246 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004247
iannuccie53c9352016-08-17 14:40:40 -07004248 if options.issue is not None and not options.field:
4249 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004250
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004251 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004252 cl = Changelist(auth_config=auth_config, issue=options.issue,
4253 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004254 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004255 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256 elif options.field == 'id':
4257 issueid = cl.GetIssue()
4258 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004259 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004260 elif options.field == 'patch':
4261 patchset = cl.GetPatchset()
4262 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004263 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004264 elif options.field == 'status':
4265 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004266 elif options.field == 'url':
4267 url = cl.GetIssueURL()
4268 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004269 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004270 return 0
4271
4272 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4273 if not branches:
4274 print('No local branch found.')
4275 return 0
4276
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004277 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004278 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004279 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004280 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004281 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004282 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004283 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004284
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004285 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004286 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4287 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4288 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004289 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004290 c, status = output.next()
4291 branch_statuses[c.GetBranch()] = status
4292 status = branch_statuses.pop(branch)
4293 url = cl.GetIssueURL()
4294 if url and (not status or status == 'error'):
4295 # The issue probably doesn't exist anymore.
4296 url += ' (broken)'
4297
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004298 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004299 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004300 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004301 color = ''
4302 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004303 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004304 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004305 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004306 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004307
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004308
4309 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004310 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004311 print('Current branch: %s' % branch)
4312 for cl in changes:
4313 if cl.GetBranch() == branch:
4314 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004315 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004316 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004317 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004318 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004319 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004320 print('Issue description:')
4321 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004322 return 0
4323
4324
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004325def colorize_CMDstatus_doc():
4326 """To be called once in main() to add colors to git cl status help."""
4327 colors = [i for i in dir(Fore) if i[0].isupper()]
4328
4329 def colorize_line(line):
4330 for color in colors:
4331 if color in line.upper():
4332 # Extract whitespaces first and the leading '-'.
4333 indent = len(line) - len(line.lstrip(' ')) + 1
4334 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4335 return line
4336
4337 lines = CMDstatus.__doc__.splitlines()
4338 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4339
4340
phajdan.jre328cf92016-08-22 04:12:17 -07004341def write_json(path, contents):
4342 with open(path, 'w') as f:
4343 json.dump(contents, f)
4344
4345
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004346@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004347def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004348 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004349
4350 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004351 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004352 parser.add_option('-r', '--reverse', action='store_true',
4353 help='Lookup the branch(es) for the specified issues. If '
4354 'no issues are specified, all branches with mapped '
4355 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004356 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004357 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004358 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004359 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004360
dnj@chromium.org406c4402015-03-03 17:22:28 +00004361 if options.reverse:
4362 branches = RunGit(['for-each-ref', 'refs/heads',
4363 '--format=%(refname:short)']).splitlines()
4364
4365 # Reverse issue lookup.
4366 issue_branch_map = {}
4367 for branch in branches:
4368 cl = Changelist(branchref=branch)
4369 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4370 if not args:
4371 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004372 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004373 for issue in args:
4374 if not issue:
4375 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004376 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004377 print('Branch for issue number %s: %s' % (
4378 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004379 if options.json:
4380 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004381 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004382 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004383 if len(args) > 0:
4384 try:
4385 issue = int(args[0])
4386 except ValueError:
4387 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004388 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004389 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004390 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004391 if options.json:
4392 write_json(options.json, {
4393 'issue': cl.GetIssue(),
4394 'issue_url': cl.GetIssueURL(),
4395 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004396 return 0
4397
4398
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004399def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004400 """Shows or posts review comments for any changelist."""
4401 parser.add_option('-a', '--add-comment', dest='comment',
4402 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004403 parser.add_option('-i', '--issue', dest='issue',
4404 help='review issue id (defaults to current issue). '
4405 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004406 parser.add_option('-j', '--json-file',
4407 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004408 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004409 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004410 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004411 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004412 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004413
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004414 issue = None
4415 if options.issue:
4416 try:
4417 issue = int(options.issue)
4418 except ValueError:
4419 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004420 if not options.forced_codereview:
4421 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004422
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004423 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004424 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004425 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004426
4427 if options.comment:
4428 cl.AddComment(options.comment)
4429 return 0
4430
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004431 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4432 for comment in summary:
4433 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004434 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004435 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004436 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004437 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004438 color = Fore.MAGENTA
4439 else:
4440 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004441 print('\n%s%s %s%s\n%s' % (
4442 color,
4443 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4444 comment.sender,
4445 Fore.RESET,
4446 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4447
smut@google.comc85ac942015-09-15 16:34:43 +00004448 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004449 def pre_serialize(c):
4450 dct = c.__dict__.copy()
4451 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4452 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004453 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004454 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004455 return 0
4456
4457
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004458@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004459def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004460 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004461 parser.add_option('-d', '--display', action='store_true',
4462 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004463 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004464 help='New description to set for this issue (- for stdin, '
4465 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004466 parser.add_option('-f', '--force', action='store_true',
4467 help='Delete any unpublished Gerrit edits for this issue '
4468 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004469
4470 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004471 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004472 options, args = parser.parse_args(args)
4473 _process_codereview_select_options(parser, options)
4474
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004475 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004476 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004477 target_issue_arg = ParseIssueNumberArgument(args[0],
4478 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004479 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004480 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004481
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004482 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004483
martiniss6eda05f2016-06-30 10:18:35 -07004484 kwargs = {
4485 'auth_config': auth_config,
4486 'codereview': options.forced_codereview,
4487 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004488 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004489 if target_issue_arg:
4490 kwargs['issue'] = target_issue_arg.issue
4491 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004492 if target_issue_arg.codereview and not options.forced_codereview:
4493 detected_codereview_from_url = True
4494 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004495
4496 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004497 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004498 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004499 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004500
4501 if detected_codereview_from_url:
4502 logging.info('canonical issue/change URL: %s (type: %s)\n',
4503 cl.GetIssueURL(), target_issue_arg.codereview)
4504
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004505 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004506
smut@google.com34fb6b12015-07-13 20:03:26 +00004507 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004508 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004509 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004510
4511 if options.new_description:
4512 text = options.new_description
4513 if text == '-':
4514 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004515 elif text == '+':
4516 base_branch = cl.GetCommonAncestorWithUpstream()
4517 change = cl.GetChange(base_branch, None, local_description=True)
4518 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004519
4520 description.set_description(text)
4521 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004522 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004523
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004524 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004525 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004526 return 0
4527
4528
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004529def CreateDescriptionFromLog(args):
4530 """Pulls out the commit log to use as a base for the CL description."""
4531 log_args = []
4532 if len(args) == 1 and not args[0].endswith('.'):
4533 log_args = [args[0] + '..']
4534 elif len(args) == 1 and args[0].endswith('...'):
4535 log_args = [args[0][:-1]]
4536 elif len(args) == 2:
4537 log_args = [args[0] + '..' + args[1]]
4538 else:
4539 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004540 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004541
4542
thestig@chromium.org44202a22014-03-11 19:22:18 +00004543def CMDlint(parser, args):
4544 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004545 parser.add_option('--filter', action='append', metavar='-x,+y',
4546 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004547 auth.add_auth_options(parser)
4548 options, args = parser.parse_args(args)
4549 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004550
4551 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004552 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004553 try:
4554 import cpplint
4555 import cpplint_chromium
4556 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004557 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004558 return 1
4559
4560 # Change the current working directory before calling lint so that it
4561 # shows the correct base.
4562 previous_cwd = os.getcwd()
4563 os.chdir(settings.GetRoot())
4564 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004565 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004566 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4567 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004568 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004569 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004570 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004571
4572 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004573 command = args + files
4574 if options.filter:
4575 command = ['--filter=' + ','.join(options.filter)] + command
4576 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004577
4578 white_regex = re.compile(settings.GetLintRegex())
4579 black_regex = re.compile(settings.GetLintIgnoreRegex())
4580 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4581 for filename in filenames:
4582 if white_regex.match(filename):
4583 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004584 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004585 else:
4586 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4587 extra_check_functions)
4588 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004589 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004590 finally:
4591 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004592 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004593 if cpplint._cpplint_state.error_count != 0:
4594 return 1
4595 return 0
4596
4597
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004599 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004600 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004601 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004602 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004603 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004604 auth.add_auth_options(parser)
4605 options, args = parser.parse_args(args)
4606 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004607
sbc@chromium.org71437c02015-04-09 19:29:40 +00004608 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004609 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004610 return 1
4611
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004612 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613 if args:
4614 base_branch = args[0]
4615 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004616 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004617 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004618
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004619 cl.RunHook(
4620 committing=not options.upload,
4621 may_prompt=False,
4622 verbose=options.verbose,
4623 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004624 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004625
4626
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004627def GenerateGerritChangeId(message):
4628 """Returns Ixxxxxx...xxx change id.
4629
4630 Works the same way as
4631 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4632 but can be called on demand on all platforms.
4633
4634 The basic idea is to generate git hash of a state of the tree, original commit
4635 message, author/committer info and timestamps.
4636 """
4637 lines = []
4638 tree_hash = RunGitSilent(['write-tree'])
4639 lines.append('tree %s' % tree_hash.strip())
4640 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4641 if code == 0:
4642 lines.append('parent %s' % parent.strip())
4643 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4644 lines.append('author %s' % author.strip())
4645 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4646 lines.append('committer %s' % committer.strip())
4647 lines.append('')
4648 # Note: Gerrit's commit-hook actually cleans message of some lines and
4649 # whitespace. This code is not doing this, but it clearly won't decrease
4650 # entropy.
4651 lines.append(message)
4652 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4653 stdin='\n'.join(lines))
4654 return 'I%s' % change_hash.strip()
4655
4656
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004657def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004658 """Computes the remote branch ref to use for the CL.
4659
4660 Args:
4661 remote (str): The git remote for the CL.
4662 remote_branch (str): The git remote branch for the CL.
4663 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004664 """
4665 if not (remote and remote_branch):
4666 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004667
wittman@chromium.org455dc922015-01-26 20:15:50 +00004668 if target_branch:
4669 # Cannonicalize branch references to the equivalent local full symbolic
4670 # refs, which are then translated into the remote full symbolic refs
4671 # below.
4672 if '/' not in target_branch:
4673 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4674 else:
4675 prefix_replacements = (
4676 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4677 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4678 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4679 )
4680 match = None
4681 for regex, replacement in prefix_replacements:
4682 match = re.search(regex, target_branch)
4683 if match:
4684 remote_branch = target_branch.replace(match.group(0), replacement)
4685 break
4686 if not match:
4687 # This is a branch path but not one we recognize; use as-is.
4688 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004689 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4690 # Handle the refs that need to land in different refs.
4691 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004692
wittman@chromium.org455dc922015-01-26 20:15:50 +00004693 # Create the true path to the remote branch.
4694 # Does the following translation:
4695 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4696 # * refs/remotes/origin/master -> refs/heads/master
4697 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4698 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4699 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4700 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4701 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4702 'refs/heads/')
4703 elif remote_branch.startswith('refs/remotes/branch-heads'):
4704 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004705
wittman@chromium.org455dc922015-01-26 20:15:50 +00004706 return remote_branch
4707
4708
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004709def cleanup_list(l):
4710 """Fixes a list so that comma separated items are put as individual items.
4711
4712 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4713 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4714 """
4715 items = sum((i.split(',') for i in l), [])
4716 stripped_items = (i.strip() for i in items)
4717 return sorted(filter(None, stripped_items))
4718
4719
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004720@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004721def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004722 """Uploads the current changelist to codereview.
4723
4724 Can skip dependency patchset uploads for a branch by running:
4725 git config branch.branch_name.skip-deps-uploads True
4726 To unset run:
4727 git config --unset branch.branch_name.skip-deps-uploads
4728 Can also set the above globally by using the --global flag.
4729 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004730 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4731 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004732 parser.add_option('--bypass-watchlists', action='store_true',
4733 dest='bypass_watchlists',
4734 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004735 parser.add_option('-f', action='store_true', dest='force',
4736 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004737 parser.add_option('--message', '-m', dest='message',
4738 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004739 parser.add_option('-b', '--bug',
4740 help='pre-populate the bug number(s) for this issue. '
4741 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004742 parser.add_option('--message-file', dest='message_file',
4743 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004744 parser.add_option('--title', '-t', dest='title',
4745 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004746 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004747 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004748 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004749 parser.add_option('--tbrs',
4750 action='append', default=[],
4751 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004752 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004753 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004754 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004755 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004756 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004757 parser.add_option('--emulate_svn_auto_props',
4758 '--emulate-svn-auto-props',
4759 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004760 dest="emulate_svn_auto_props",
4761 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004762 parser.add_option('-c', '--use-commit-queue', action='store_true',
4763 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004764 parser.add_option('--private', action='store_true',
4765 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004766 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004767 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004768 metavar='TARGET',
4769 help='Apply CL to remote ref TARGET. ' +
4770 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004771 parser.add_option('--squash', action='store_true',
4772 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004773 parser.add_option('--no-squash', action='store_true',
4774 help='Don\'t squash multiple commits into one ' +
4775 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004776 parser.add_option('--topic', default=None,
4777 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004778 parser.add_option('--email', default=None,
4779 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004780 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4781 const='TBR', help='add a set of OWNERS to TBR')
4782 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4783 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004784 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4785 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004786 help='Send the patchset to do a CQ dry run right after '
4787 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004788 parser.add_option('--dependencies', action='store_true',
4789 help='Uploads CLs of all the local branches that depend on '
4790 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004791
rmistry@google.com2dd99862015-06-22 12:22:18 +00004792 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004793 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004794 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004795 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004796 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004797 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004798 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004799
sbc@chromium.org71437c02015-04-09 19:29:40 +00004800 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004801 return 1
4802
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004803 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004804 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004805 options.cc = cleanup_list(options.cc)
4806
tandriib80458a2016-06-23 12:20:07 -07004807 if options.message_file:
4808 if options.message:
4809 parser.error('only one of --message and --message-file allowed.')
4810 options.message = gclient_utils.FileRead(options.message_file)
4811 options.message_file = None
4812
tandrii4d0545a2016-07-06 03:56:49 -07004813 if options.cq_dry_run and options.use_commit_queue:
4814 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4815
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004816 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4817 settings.GetIsGerrit()
4818
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004819 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004820 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004821
4822
Francois Dorayd42c6812017-05-30 15:10:20 -04004823@subcommand.usage('--description=<description file>')
4824def CMDsplit(parser, args):
4825 """Splits a branch into smaller branches and uploads CLs.
4826
4827 Creates a branch and uploads a CL for each group of files modified in the
4828 current branch that share a common OWNERS file. In the CL description and
4829 commment, the string '$directory', is replaced with the directory containing
4830 the shared OWNERS file.
4831 """
4832 parser.add_option("-d", "--description", dest="description_file",
4833 help="A text file containing a CL description. ")
4834 parser.add_option("-c", "--comment", dest="comment_file",
4835 help="A text file containing a CL comment.")
4836 options, _ = parser.parse_args(args)
4837
4838 if not options.description_file:
4839 parser.error('No --description flag specified.')
4840
4841 def WrappedCMDupload(args):
4842 return CMDupload(OptionParser(), args)
4843
4844 return split_cl.SplitCl(options.description_file, options.comment_file,
4845 Changelist, WrappedCMDupload)
4846
4847
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004848@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004849def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004850 """DEPRECATED: Used to commit the current changelist via git-svn."""
4851 message = ('git-cl no longer supports committing to SVN repositories via '
4852 'git-svn. You probably want to use `git cl land` instead.')
4853 print(message)
4854 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004855
4856
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004857# Two special branches used by git cl land.
4858MERGE_BRANCH = 'git-cl-commit'
4859CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4860
4861
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004862@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004863def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004864 """Commits the current changelist via git.
4865
4866 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4867 upstream and closes the issue automatically and atomically.
4868
4869 Otherwise (in case of Rietveld):
4870 Squashes branch into a single commit.
4871 Updates commit message with metadata (e.g. pointer to review).
4872 Pushes the code upstream.
4873 Updates review and closes.
4874 """
4875 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4876 help='bypass upload presubmit hook')
4877 parser.add_option('-m', dest='message',
4878 help="override review description")
4879 parser.add_option('-f', action='store_true', dest='force',
4880 help="force yes to questions (don't prompt)")
4881 parser.add_option('-c', dest='contributor',
4882 help="external contributor for patch (appended to " +
4883 "description and used as author for git). Should be " +
4884 "formatted as 'First Last <email@example.com>'")
4885 add_git_similarity(parser)
4886 auth.add_auth_options(parser)
4887 (options, args) = parser.parse_args(args)
4888 auth_config = auth.extract_auth_config_from_options(options)
4889
4890 cl = Changelist(auth_config=auth_config)
4891
4892 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4893 if cl.IsGerrit():
4894 if options.message:
4895 # This could be implemented, but it requires sending a new patch to
4896 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4897 # Besides, Gerrit has the ability to change the commit message on submit
4898 # automatically, thus there is no need to support this option (so far?).
4899 parser.error('-m MESSAGE option is not supported for Gerrit.')
4900 if options.contributor:
4901 parser.error(
4902 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4903 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4904 'the contributor\'s "name <email>". If you can\'t upload such a '
4905 'commit for review, contact your repository admin and request'
4906 '"Forge-Author" permission.')
4907 if not cl.GetIssue():
4908 DieWithError('You must upload the change first to Gerrit.\n'
4909 ' If you would rather have `git cl land` upload '
4910 'automatically for you, see http://crbug.com/642759')
4911 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4912 options.verbose)
4913
4914 current = cl.GetBranch()
4915 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4916 if remote == '.':
4917 print()
4918 print('Attempting to push branch %r into another local branch!' % current)
4919 print()
4920 print('Either reparent this branch on top of origin/master:')
4921 print(' git reparent-branch --root')
4922 print()
4923 print('OR run `git rebase-update` if you think the parent branch is ')
4924 print('already committed.')
4925 print()
4926 print(' Current parent: %r' % upstream_branch)
4927 return 1
4928
4929 if not args:
4930 # Default to merging against our best guess of the upstream branch.
4931 args = [cl.GetUpstreamBranch()]
4932
4933 if options.contributor:
4934 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4935 print("Please provide contibutor as 'First Last <email@example.com>'")
4936 return 1
4937
4938 base_branch = args[0]
4939
4940 if git_common.is_dirty_git_tree('land'):
4941 return 1
4942
4943 # This rev-list syntax means "show all commits not in my branch that
4944 # are in base_branch".
4945 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4946 base_branch]).splitlines()
4947 if upstream_commits:
4948 print('Base branch "%s" has %d commits '
4949 'not in this branch.' % (base_branch, len(upstream_commits)))
4950 print('Run "git merge %s" before attempting to land.' % base_branch)
4951 return 1
4952
4953 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4954 if not options.bypass_hooks:
4955 author = None
4956 if options.contributor:
4957 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4958 hook_results = cl.RunHook(
4959 committing=True,
4960 may_prompt=not options.force,
4961 verbose=options.verbose,
4962 change=cl.GetChange(merge_base, author))
4963 if not hook_results.should_continue():
4964 return 1
4965
4966 # Check the tree status if the tree status URL is set.
4967 status = GetTreeStatus()
4968 if 'closed' == status:
4969 print('The tree is closed. Please wait for it to reopen. Use '
4970 '"git cl land --bypass-hooks" to commit on a closed tree.')
4971 return 1
4972 elif 'unknown' == status:
4973 print('Unable to determine tree status. Please verify manually and '
4974 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4975 return 1
4976
4977 change_desc = ChangeDescription(options.message)
4978 if not change_desc.description and cl.GetIssue():
4979 change_desc = ChangeDescription(cl.GetDescription())
4980
4981 if not change_desc.description:
4982 if not cl.GetIssue() and options.bypass_hooks:
4983 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4984 else:
4985 print('No description set.')
4986 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4987 return 1
4988
4989 # Keep a separate copy for the commit message, because the commit message
4990 # contains the link to the Rietveld issue, while the Rietveld message contains
4991 # the commit viewvc url.
4992 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07004993 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004994 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004995
4996 commit_desc = ChangeDescription(change_desc.description)
4997 if cl.GetIssue():
4998 # Xcode won't linkify this URL unless there is a non-whitespace character
4999 # after it. Add a period on a new line to circumvent this. Also add a space
5000 # before the period to make sure that Gitiles continues to correctly resolve
5001 # the URL.
5002 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5003 if options.contributor:
5004 commit_desc.append_footer('Patch from %s.' % options.contributor)
5005
5006 print('Description:')
5007 print(commit_desc.description)
5008
5009 branches = [merge_base, cl.GetBranchRef()]
5010 if not options.force:
5011 print_stats(options.similarity, options.find_copies, branches)
5012
5013 # We want to squash all this branch's commits into one commit with the proper
5014 # description. We do this by doing a "reset --soft" to the base branch (which
5015 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005016 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005017 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5018 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5019 result = RunGitWithCode(showref_cmd)
5020 if result[0] == 0:
5021 RunGit(['branch', '-D', branch])
5022
5023 # We might be in a directory that's present in this branch but not in the
5024 # trunk. Move up to the top of the tree so that git commands that expect a
5025 # valid CWD won't fail after we check out the merge branch.
5026 rel_base_path = settings.GetRelativeRoot()
5027 if rel_base_path:
5028 os.chdir(rel_base_path)
5029
5030 # Stuff our change into the merge branch.
5031 # We wrap in a try...finally block so if anything goes wrong,
5032 # we clean up the branches.
5033 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005034 revision = None
5035 try:
5036 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5037 RunGit(['reset', '--soft', merge_base])
5038 if options.contributor:
5039 RunGit(
5040 [
5041 'commit', '--author', options.contributor,
5042 '-m', commit_desc.description,
5043 ])
5044 else:
5045 RunGit(['commit', '-m', commit_desc.description])
5046
5047 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5048 mirror = settings.GetGitMirror(remote)
5049 if mirror:
5050 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005051 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005052 else:
5053 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005054 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005055 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5056
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005057 retcode = PushToGitWithAutoRebase(
5058 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005059 if retcode == 0:
5060 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005061 if git_numberer_enabled:
5062 change_desc = ChangeDescription(
5063 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005064 except: # pylint: disable=bare-except
5065 if _IS_BEING_TESTED:
5066 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5067 + '-' * 30 + '8<' + '-' * 30)
5068 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5069 raise
5070 finally:
5071 # And then swap back to the original branch and clean up.
5072 RunGit(['checkout', '-q', cl.GetBranch()])
5073 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005074 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005075
5076 if not revision:
5077 print('Failed to push. If this persists, please file a bug.')
5078 return 1
5079
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005080 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005081 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005082 if viewvc_url and revision:
5083 change_desc.append_footer(
5084 'Committed: %s%s' % (viewvc_url, revision))
5085 elif revision:
5086 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005087 print('Closing issue '
5088 '(you may be prompted for your codereview password)...')
5089 cl.UpdateDescription(change_desc.description)
5090 cl.CloseIssue()
5091 props = cl.GetIssueProperties()
5092 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005093 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5094 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005095 if options.bypass_hooks:
5096 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5097 else:
5098 comment += ' (presubmit successful).'
5099 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5100
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005101 if os.path.isfile(POSTUPSTREAM_HOOK):
5102 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5103
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005104 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005105
5106
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005107def PushToGitWithAutoRebase(remote, branch, original_description,
5108 git_numberer_enabled, max_attempts=3):
5109 """Pushes current HEAD commit on top of remote's branch.
5110
5111 Attempts to fetch and autorebase on push failures.
5112 Adds git number footers on the fly.
5113
5114 Returns integer code from last command.
5115 """
5116 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5117 code = 0
5118 attempts_left = max_attempts
5119 while attempts_left:
5120 attempts_left -= 1
5121 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5122
5123 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5124 # If fetch fails, retry.
5125 print('Fetching %s/%s...' % (remote, branch))
5126 code, out = RunGitWithCode(
5127 ['retry', 'fetch', remote,
5128 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5129 if code:
5130 print('Fetch failed with exit code %d.' % code)
5131 print(out.strip())
5132 continue
5133
5134 print('Cherry-picking commit on top of latest %s' % branch)
5135 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5136 suppress_stderr=True)
5137 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5138 code, out = RunGitWithCode(['cherry-pick', cherry])
5139 if code:
5140 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5141 'the following files have merge conflicts:' %
5142 (branch, parent_hash))
5143 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5144 print('Please rebase your patch and try again.')
5145 RunGitWithCode(['cherry-pick', '--abort'])
5146 break
5147
5148 commit_desc = ChangeDescription(original_description)
5149 if git_numberer_enabled:
5150 logging.debug('Adding git number footers')
5151 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5152 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5153 branch)
5154 # Ensure timestamps are monotonically increasing.
5155 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5156 _get_committer_timestamp('HEAD'))
5157 _git_amend_head(commit_desc.description, timestamp)
5158
5159 code, out = RunGitWithCode(
5160 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5161 print(out)
5162 if code == 0:
5163 break
5164 if IsFatalPushFailure(out):
5165 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005166 'user.email are correct and you have push access to the repo.\n'
5167 'Hint: run command below to diangose common Git/Gerrit credential '
5168 'problems:\n'
5169 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005170 break
5171 return code
5172
5173
5174def IsFatalPushFailure(push_stdout):
5175 """True if retrying push won't help."""
5176 return '(prohibited by Gerrit)' in push_stdout
5177
5178
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005179@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005180def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005181 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005182 parser.add_option('-b', dest='newbranch',
5183 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005184 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005185 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005186 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5187 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005188 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005189 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005190 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005191 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005192 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005193 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005194
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005195
5196 group = optparse.OptionGroup(
5197 parser,
5198 'Options for continuing work on the current issue uploaded from a '
5199 'different clone (e.g. different machine). Must be used independently '
5200 'from the other options. No issue number should be specified, and the '
5201 'branch must have an issue number associated with it')
5202 group.add_option('--reapply', action='store_true', dest='reapply',
5203 help='Reset the branch and reapply the issue.\n'
5204 'CAUTION: This will undo any local changes in this '
5205 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005206
5207 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005208 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005209 parser.add_option_group(group)
5210
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005211 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005212 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005213 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005214 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005215 auth_config = auth.extract_auth_config_from_options(options)
5216
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005217 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005218 if options.newbranch:
5219 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005220 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005221 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005222
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005223 cl = Changelist(auth_config=auth_config,
5224 codereview=options.forced_codereview)
5225 if not cl.GetIssue():
5226 parser.error('current branch must have an associated issue')
5227
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005228 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005229 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005230 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005231
5232 RunGit(['reset', '--hard', upstream])
5233 if options.pull:
5234 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005235
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005236 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5237 options.directory)
5238
5239 if len(args) != 1 or not args[0]:
5240 parser.error('Must specify issue number or url')
5241
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005242 target_issue_arg = ParseIssueNumberArgument(args[0],
5243 options.forced_codereview)
5244 if not target_issue_arg.valid:
5245 parser.error('invalid codereview url or CL id')
5246
5247 cl_kwargs = {
5248 'auth_config': auth_config,
5249 'codereview_host': target_issue_arg.hostname,
5250 'codereview': options.forced_codereview,
5251 }
5252 detected_codereview_from_url = False
5253 if target_issue_arg.codereview and not options.forced_codereview:
5254 detected_codereview_from_url = True
5255 cl_kwargs['codereview'] = target_issue_arg.codereview
5256 cl_kwargs['issue'] = target_issue_arg.issue
5257
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005258 # We don't want uncommitted changes mixed up with the patch.
5259 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005260 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005261
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005262 if options.newbranch:
5263 if options.force:
5264 RunGit(['branch', '-D', options.newbranch],
5265 stderr=subprocess2.PIPE, error_ok=True)
5266 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005267 elif not GetCurrentBranch():
5268 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005269
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005270 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005271
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005272 if cl.IsGerrit():
5273 if options.reject:
5274 parser.error('--reject is not supported with Gerrit codereview.')
5275 if options.nocommit:
5276 parser.error('--nocommit is not supported with Gerrit codereview.')
5277 if options.directory:
5278 parser.error('--directory is not supported with Gerrit codereview.')
5279
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005280 if detected_codereview_from_url:
5281 print('canonical issue/change URL: %s (type: %s)\n' %
5282 (cl.GetIssueURL(), target_issue_arg.codereview))
5283
5284 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
5285 options.nocommit, options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005286
5287
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005288def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005289 """Fetches the tree status and returns either 'open', 'closed',
5290 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005291 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005292 if url:
5293 status = urllib2.urlopen(url).read().lower()
5294 if status.find('closed') != -1 or status == '0':
5295 return 'closed'
5296 elif status.find('open') != -1 or status == '1':
5297 return 'open'
5298 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005299 return 'unset'
5300
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302def GetTreeStatusReason():
5303 """Fetches the tree status from a json url and returns the message
5304 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005305 url = settings.GetTreeStatusUrl()
5306 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005307 connection = urllib2.urlopen(json_url)
5308 status = json.loads(connection.read())
5309 connection.close()
5310 return status['message']
5311
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005312
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005313def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005314 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005315 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005316 status = GetTreeStatus()
5317 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005318 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005319 return 2
5320
vapiera7fbd5a2016-06-16 09:17:49 -07005321 print('The tree is %s' % status)
5322 print()
5323 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005324 if status != 'open':
5325 return 1
5326 return 0
5327
5328
maruel@chromium.org15192402012-09-06 12:38:29 +00005329def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005330 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005331 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005332 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005333 '-b', '--bot', action='append',
5334 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5335 'times to specify multiple builders. ex: '
5336 '"-b win_rel -b win_layout". See '
5337 'the try server waterfall for the builders name and the tests '
5338 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005339 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005340 '-B', '--bucket', default='',
5341 help=('Buildbucket bucket to send the try requests.'))
5342 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005343 '-m', '--master', default='',
5344 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005345 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005346 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005347 help='Revision to use for the try job; default: the revision will '
5348 'be determined by the try recipe that builder runs, which usually '
5349 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005350 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005351 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005352 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005353 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005354 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005355 '--project',
5356 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005357 'in recipe to determine to which repository or directory to '
5358 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005359 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005360 '-p', '--property', dest='properties', action='append', default=[],
5361 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005362 'key2=value2 etc. The value will be treated as '
5363 'json if decodable, or as string otherwise. '
5364 'NOTE: using this may make your try job not usable for CQ, '
5365 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005366 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005367 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5368 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005369 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005370 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005371 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005372 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005373
machenbach@chromium.org45453142015-09-15 08:45:22 +00005374 # Make sure that all properties are prop=value pairs.
5375 bad_params = [x for x in options.properties if '=' not in x]
5376 if bad_params:
5377 parser.error('Got properties with missing "=": %s' % bad_params)
5378
maruel@chromium.org15192402012-09-06 12:38:29 +00005379 if args:
5380 parser.error('Unknown arguments: %s' % args)
5381
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005382 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005383 if not cl.GetIssue():
5384 parser.error('Need to upload first')
5385
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005386 if cl.IsGerrit():
5387 # HACK: warm up Gerrit change detail cache to save on RPCs.
5388 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5389
tandriie113dfd2016-10-11 10:20:12 -07005390 error_message = cl.CannotTriggerTryJobReason()
5391 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005392 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005393
borenet6c0efe62016-10-19 08:13:29 -07005394 if options.bucket and options.master:
5395 parser.error('Only one of --bucket and --master may be used.')
5396
qyearsley1fdfcb62016-10-24 13:22:03 -07005397 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005398
qyearsleydd49f942016-10-28 11:57:22 -07005399 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5400 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005401 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005402 if options.verbose:
5403 print('git cl try with no bots now defaults to CQ Dry Run.')
5404 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005405
borenet6c0efe62016-10-19 08:13:29 -07005406 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005407 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005408 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005409 'of bot requires an initial job from a parent (usually a builder). '
5410 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005411 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005412 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005413
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005414 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005415 # TODO(tandrii): Checking local patchset against remote patchset is only
5416 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5417 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005418 print('Warning: Codereview server has newer patchsets (%s) than most '
5419 'recent upload from local checkout (%s). Did a previous upload '
5420 'fail?\n'
5421 'By default, git cl try uses the latest patchset from '
5422 'codereview, continuing to use patchset %s.\n' %
5423 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005424
tandrii568043b2016-10-11 07:49:18 -07005425 try:
borenet6c0efe62016-10-19 08:13:29 -07005426 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5427 patchset)
tandrii568043b2016-10-11 07:49:18 -07005428 except BuildbucketResponseException as ex:
5429 print('ERROR: %s' % ex)
5430 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005431 return 0
5432
5433
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005434def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005435 """Prints info about try jobs associated with current CL."""
5436 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005437 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005438 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005439 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005440 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005441 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005442 '--color', action='store_true', default=setup_color.IS_TTY,
5443 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005444 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005445 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5446 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005447 group.add_option(
5448 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005449 parser.add_option_group(group)
5450 auth.add_auth_options(parser)
5451 options, args = parser.parse_args(args)
5452 if args:
5453 parser.error('Unrecognized args: %s' % ' '.join(args))
5454
5455 auth_config = auth.extract_auth_config_from_options(options)
5456 cl = Changelist(auth_config=auth_config)
5457 if not cl.GetIssue():
5458 parser.error('Need to upload first')
5459
tandrii221ab252016-10-06 08:12:04 -07005460 patchset = options.patchset
5461 if not patchset:
5462 patchset = cl.GetMostRecentPatchset()
5463 if not patchset:
5464 parser.error('Codereview doesn\'t know about issue %s. '
5465 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005466 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005467 cl.GetIssue())
5468
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005469 # TODO(tandrii): Checking local patchset against remote patchset is only
5470 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5471 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005472 print('Warning: Codereview server has newer patchsets (%s) than most '
5473 'recent upload from local checkout (%s). Did a previous upload '
5474 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005475 'By default, git cl try-results uses the latest patchset from '
5476 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005477 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005478 try:
tandrii221ab252016-10-06 08:12:04 -07005479 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005480 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005481 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005482 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005483 if options.json:
5484 write_try_results_json(options.json, jobs)
5485 else:
5486 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005487 return 0
5488
5489
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005490@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005491def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005492 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005493 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005494 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005495 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005496
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005497 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005498 if args:
5499 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005500 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005501 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005502 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005503 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005504
5505 # Clear configured merge-base, if there is one.
5506 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005507 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005508 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005509 return 0
5510
5511
thestig@chromium.org00858c82013-12-02 23:08:03 +00005512def CMDweb(parser, args):
5513 """Opens the current CL in the web browser."""
5514 _, args = parser.parse_args(args)
5515 if args:
5516 parser.error('Unrecognized args: %s' % ' '.join(args))
5517
5518 issue_url = Changelist().GetIssueURL()
5519 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005520 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005521 return 1
5522
5523 webbrowser.open(issue_url)
5524 return 0
5525
5526
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005527def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005528 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005529 parser.add_option('-d', '--dry-run', action='store_true',
5530 help='trigger in dry run mode')
5531 parser.add_option('-c', '--clear', action='store_true',
5532 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005533 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005534 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005535 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005536 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005537 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005538 if args:
5539 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005540 if options.dry_run and options.clear:
5541 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5542
iannuccie53c9352016-08-17 14:40:40 -07005543 cl = Changelist(auth_config=auth_config, issue=options.issue,
5544 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005545 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005546 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005547 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005548 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005549 state = _CQState.DRY_RUN
5550 else:
5551 state = _CQState.COMMIT
5552 if not cl.GetIssue():
5553 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005554 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005555 return 0
5556
5557
groby@chromium.org411034a2013-02-26 15:12:01 +00005558def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005559 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005560 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005561 auth.add_auth_options(parser)
5562 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005563 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005564 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005565 if args:
5566 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005567 cl = Changelist(auth_config=auth_config, issue=options.issue,
5568 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005569 # Ensure there actually is an issue to close.
5570 cl.GetDescription()
5571 cl.CloseIssue()
5572 return 0
5573
5574
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005575def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005576 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005577 parser.add_option(
5578 '--stat',
5579 action='store_true',
5580 dest='stat',
5581 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005582 auth.add_auth_options(parser)
5583 options, args = parser.parse_args(args)
5584 auth_config = auth.extract_auth_config_from_options(options)
5585 if args:
5586 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005587
5588 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005589 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005590 # Staged changes would be committed along with the patch from last
5591 # upload, hence counted toward the "last upload" side in the final
5592 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005593 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005594 return 1
5595
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005596 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005597 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005598 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005599 if not issue:
5600 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005601 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005602 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005603
5604 # Create a new branch based on the merge-base
5605 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005606 # Clear cached branch in cl object, to avoid overwriting original CL branch
5607 # properties.
5608 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005609 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005610 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005611 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005612 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005613 return rtn
5614
wychen@chromium.org06928532015-02-03 02:11:29 +00005615 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005616 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005617 cmd = ['git', 'diff']
5618 if options.stat:
5619 cmd.append('--stat')
5620 cmd.extend([TMP_BRANCH, branch, '--'])
5621 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005622 finally:
5623 RunGit(['checkout', '-q', branch])
5624 RunGit(['branch', '-D', TMP_BRANCH])
5625
5626 return 0
5627
5628
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005629def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005630 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005631 parser.add_option(
5632 '--no-color',
5633 action='store_true',
5634 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005635 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005636 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005637 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005638
5639 author = RunGit(['config', 'user.email']).strip() or None
5640
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005641 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005642
5643 if args:
5644 if len(args) > 1:
5645 parser.error('Unknown args')
5646 base_branch = args[0]
5647 else:
5648 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005649 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005650
5651 change = cl.GetChange(base_branch, None)
5652 return owners_finder.OwnersFinder(
5653 [f.LocalPath() for f in
5654 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005655 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005656 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005657 disable_color=options.no_color,
5658 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005659
5660
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005661def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005662 """Generates a diff command."""
5663 # Generate diff for the current branch's changes.
5664 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005665 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005666
5667 if args:
5668 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005669 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005670 diff_cmd.append(arg)
5671 else:
5672 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005673
5674 return diff_cmd
5675
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005676
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005677def MatchingFileType(file_name, extensions):
5678 """Returns true if the file name ends with one of the given extensions."""
5679 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005680
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005681
enne@chromium.org555cfe42014-01-29 18:21:39 +00005682@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005683def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005684 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005685 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005686 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005687 parser.add_option('--full', action='store_true',
5688 help='Reformat the full content of all touched files')
5689 parser.add_option('--dry-run', action='store_true',
5690 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005691 parser.add_option('--python', action='store_true',
5692 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005693 parser.add_option('--js', action='store_true',
5694 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005695 parser.add_option('--diff', action='store_true',
5696 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005697 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005698
Daniel Chengc55eecf2016-12-30 03:11:02 -08005699 # Normalize any remaining args against the current path, so paths relative to
5700 # the current directory are still resolved as expected.
5701 args = [os.path.join(os.getcwd(), arg) for arg in args]
5702
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005703 # git diff generates paths against the root of the repository. Change
5704 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005705 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005706 if rel_base_path:
5707 os.chdir(rel_base_path)
5708
digit@chromium.org29e47272013-05-17 17:01:46 +00005709 # Grab the merge-base commit, i.e. the upstream commit of the current
5710 # branch when it was created or the last time it was rebased. This is
5711 # to cover the case where the user may have called "git fetch origin",
5712 # moving the origin branch to a newer commit, but hasn't rebased yet.
5713 upstream_commit = None
5714 cl = Changelist()
5715 upstream_branch = cl.GetUpstreamBranch()
5716 if upstream_branch:
5717 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5718 upstream_commit = upstream_commit.strip()
5719
5720 if not upstream_commit:
5721 DieWithError('Could not find base commit for this branch. '
5722 'Are you in detached state?')
5723
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005724 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5725 diff_output = RunGit(changed_files_cmd)
5726 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005727 # Filter out files deleted by this CL
5728 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005729
Christopher Lamc5ba6922017-01-24 11:19:14 +11005730 if opts.js:
5731 CLANG_EXTS.append('.js')
5732
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005733 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5734 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5735 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005736 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005737
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005738 top_dir = os.path.normpath(
5739 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5740
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005741 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5742 # formatted. This is used to block during the presubmit.
5743 return_value = 0
5744
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005745 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005746 # Locate the clang-format binary in the checkout
5747 try:
5748 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005749 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005750 DieWithError(e)
5751
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005752 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005753 cmd = [clang_format_tool]
5754 if not opts.dry_run and not opts.diff:
5755 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005756 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005757 if opts.diff:
5758 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005759 else:
5760 env = os.environ.copy()
5761 env['PATH'] = str(os.path.dirname(clang_format_tool))
5762 try:
5763 script = clang_format.FindClangFormatScriptInChromiumTree(
5764 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005765 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005766 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005767
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005768 cmd = [sys.executable, script, '-p0']
5769 if not opts.dry_run and not opts.diff:
5770 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005771
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005772 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5773 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005774
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005775 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5776 if opts.diff:
5777 sys.stdout.write(stdout)
5778 if opts.dry_run and len(stdout) > 0:
5779 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005780
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005781 # Similar code to above, but using yapf on .py files rather than clang-format
5782 # on C/C++ files
5783 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005784 yapf_tool = gclient_utils.FindExecutable('yapf')
5785 if yapf_tool is None:
5786 DieWithError('yapf not found in PATH')
5787
5788 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005789 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005790 cmd = [yapf_tool]
5791 if not opts.dry_run and not opts.diff:
5792 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005793 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005794 if opts.diff:
5795 sys.stdout.write(stdout)
5796 else:
5797 # TODO(sbc): yapf --lines mode still has some issues.
5798 # https://github.com/google/yapf/issues/154
5799 DieWithError('--python currently only works with --full')
5800
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005801 # Dart's formatter does not have the nice property of only operating on
5802 # modified chunks, so hard code full.
5803 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005804 try:
5805 command = [dart_format.FindDartFmtToolInChromiumTree()]
5806 if not opts.dry_run and not opts.diff:
5807 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005808 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005809
ppi@chromium.org6593d932016-03-03 15:41:15 +00005810 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005811 if opts.dry_run and stdout:
5812 return_value = 2
5813 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005814 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5815 'found in this checkout. Files in other languages are still '
5816 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005817
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005818 # Format GN build files. Always run on full build files for canonical form.
5819 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005820 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005821 if opts.dry_run or opts.diff:
5822 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005823 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005824 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5825 shell=sys.platform == 'win32',
5826 cwd=top_dir)
5827 if opts.dry_run and gn_ret == 2:
5828 return_value = 2 # Not formatted.
5829 elif opts.diff and gn_ret == 2:
5830 # TODO this should compute and print the actual diff.
5831 print("This change has GN build file diff for " + gn_diff_file)
5832 elif gn_ret != 0:
5833 # For non-dry run cases (and non-2 return values for dry-run), a
5834 # nonzero error code indicates a failure, probably because the file
5835 # doesn't parse.
5836 DieWithError("gn format failed on " + gn_diff_file +
5837 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005838
Steven Holte2e664bf2017-04-21 13:10:47 -07005839 for xml_dir in GetDirtyMetricsDirs(diff_files):
5840 tool_dir = os.path.join(top_dir, xml_dir)
5841 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5842 if opts.dry_run or opts.diff:
5843 cmd.append('--diff')
5844 stdout = RunCommand(cmd, cwd=top_dir)
5845 if opts.diff:
5846 sys.stdout.write(stdout)
5847 if opts.dry_run and stdout:
5848 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005849
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005850 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005851
Steven Holte2e664bf2017-04-21 13:10:47 -07005852def GetDirtyMetricsDirs(diff_files):
5853 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5854 metrics_xml_dirs = [
5855 os.path.join('tools', 'metrics', 'actions'),
5856 os.path.join('tools', 'metrics', 'histograms'),
5857 os.path.join('tools', 'metrics', 'rappor'),
5858 os.path.join('tools', 'metrics', 'ukm')]
5859 for xml_dir in metrics_xml_dirs:
5860 if any(file.startswith(xml_dir) for file in xml_diff_files):
5861 yield xml_dir
5862
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005863
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005864@subcommand.usage('<codereview url or issue id>')
5865def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005866 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005867 _, args = parser.parse_args(args)
5868
5869 if len(args) != 1:
5870 parser.print_help()
5871 return 1
5872
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005873 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005874 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005875 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005876
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005877 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005878
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005879 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005880 output = RunGit(['config', '--local', '--get-regexp',
5881 r'branch\..*\.%s' % issueprefix],
5882 error_ok=True)
5883 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005884 if issue == target_issue:
5885 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005886
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005887 branches = []
5888 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005889 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005890 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005891 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005892 return 1
5893 if len(branches) == 1:
5894 RunGit(['checkout', branches[0]])
5895 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005896 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005897 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005898 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005899 which = raw_input('Choose by index: ')
5900 try:
5901 RunGit(['checkout', branches[int(which)]])
5902 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005903 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005904 return 1
5905
5906 return 0
5907
5908
maruel@chromium.org29404b52014-09-08 22:58:00 +00005909def CMDlol(parser, args):
5910 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005911 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005912 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5913 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5914 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005915 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005916 return 0
5917
5918
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005919class OptionParser(optparse.OptionParser):
5920 """Creates the option parse and add --verbose support."""
5921 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005922 optparse.OptionParser.__init__(
5923 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005924 self.add_option(
5925 '-v', '--verbose', action='count', default=0,
5926 help='Use 2 times for more debugging info')
5927
5928 def parse_args(self, args=None, values=None):
5929 options, args = optparse.OptionParser.parse_args(self, args, values)
5930 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005931 logging.basicConfig(
5932 level=levels[min(options.verbose, len(levels) - 1)],
5933 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5934 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005935 return options, args
5936
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005937
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005938def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005939 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005940 print('\nYour python version %s is unsupported, please upgrade.\n' %
5941 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005942 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005943
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005944 # Reload settings.
5945 global settings
5946 settings = Settings()
5947
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005948 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005949 dispatcher = subcommand.CommandDispatcher(__name__)
5950 try:
5951 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005952 except auth.AuthenticationError as e:
5953 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005954 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005955 if e.code != 500:
5956 raise
5957 DieWithError(
5958 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5959 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005960 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005961
5962
5963if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005964 # These affect sys.stdout so do it outside of main() to simplify mocks in
5965 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005966 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005967 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005968 try:
5969 sys.exit(main(sys.argv[1:]))
5970 except KeyboardInterrupt:
5971 sys.stderr.write('interrupted\n')
5972 sys.exit(1)