blob: e794150f4f197c7c30f9bc3525240b75be5add92 [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
maruel@chromium.org0633fb42013-08-16 20:06:14 +000062import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000063import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064import watchlists
65
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
tandrii9d2c7a32016-06-22 03:42:45 -070068COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070069DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080070POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000071DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000072REFS_THAT_ALIAS_TO_OTHER_REFS = {
73 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
74 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
75}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000076
thestig@chromium.org44202a22014-03-11 19:22:18 +000077# Valid extensions for files we want to lint.
78DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
79DEFAULT_LINT_IGNORE_REGEX = r"$^"
80
borenet6c0efe62016-10-19 08:13:29 -070081# Buildbucket master name prefix.
82MASTER_PREFIX = 'master.'
83
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000084# Shortcut since it quickly becomes redundant.
85Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000086
maruel@chromium.orgddd59412011-11-30 14:20:38 +000087# Initialized in main()
88settings = None
89
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010090# Used by tests/git_cl_test.py to add extra logging.
91# Inside the weirdly failing test, add this:
92# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
93# And scroll up to see the strack trace printed.
94_IS_BEING_TESTED = False
95
maruel@chromium.orgddd59412011-11-30 14:20:38 +000096
Christopher Lamf732cd52017-01-24 12:40:11 +110097def DieWithError(message, change_desc=None):
98 if change_desc:
99 SaveDescriptionBackup(change_desc)
100
vapiera7fbd5a2016-06-16 09:17:49 -0700101 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102 sys.exit(1)
103
104
Christopher Lamf732cd52017-01-24 12:40:11 +1100105def SaveDescriptionBackup(change_desc):
106 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
107 print('\nError after CL description prompt -- saving description to %s\n' %
108 backup_path)
109 backup_file = open(backup_path, 'w')
110 backup_file.write(change_desc.description)
111 backup_file.close()
112
113
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000114def GetNoGitPagerEnv():
115 env = os.environ.copy()
116 # 'cat' is a magical git string that disables pagers on all platforms.
117 env['GIT_PAGER'] = 'cat'
118 return env
119
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000120
bsep@chromium.org627d9002016-04-29 00:00:52 +0000121def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000122 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000123 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000124 except subprocess2.CalledProcessError as e:
125 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000126 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000127 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000128 'Command "%s" failed.\n%s' % (
129 ' '.join(args), error_message or e.stdout or ''))
130 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131
132
133def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000134 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000135 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136
137
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000138def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000139 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700140 if suppress_stderr:
141 stderr = subprocess2.VOID
142 else:
143 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000144 try:
tandrii5d48c322016-08-18 16:19:37 -0700145 (out, _), code = subprocess2.communicate(['git'] + args,
146 env=GetNoGitPagerEnv(),
147 stdout=subprocess2.PIPE,
148 stderr=stderr)
149 return code, out
150 except subprocess2.CalledProcessError as e:
151 logging.debug('Failed running %s', args)
152 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000153
154
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000155def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000156 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000157 return RunGitWithCode(args, suppress_stderr=True)[1]
158
159
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000160def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000161 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000162 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000163 return (version.startswith(prefix) and
164 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000165
166
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000167def BranchExists(branch):
168 """Return True if specified branch exists."""
169 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
170 suppress_stderr=True)
171 return not code
172
173
tandrii2a16b952016-10-19 07:09:44 -0700174def time_sleep(seconds):
175 # Use this so that it can be mocked in tests without interfering with python
176 # system machinery.
177 import time # Local import to discourage others from importing time globally.
178 return time.sleep(seconds)
179
180
maruel@chromium.org90541732011-04-01 17:54:18 +0000181def ask_for_data(prompt):
182 try:
183 return raw_input(prompt)
184 except KeyboardInterrupt:
185 # Hide the exception.
186 sys.exit(1)
187
188
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100189def confirm_or_exit(prefix='', action='confirm'):
190 """Asks user to press enter to continue or press Ctrl+C to abort."""
191 if not prefix or prefix.endswith('\n'):
192 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100193 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100194 mid = ' Press'
195 elif prefix.endswith(' '):
196 mid = 'press'
197 else:
198 mid = ' press'
199 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
200
201
202def ask_for_explicit_yes(prompt):
203 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
204 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
205 while True:
206 if 'yes'.startswith(result):
207 return True
208 if 'no'.startswith(result):
209 return False
210 result = ask_for_data('Please, type yes or no: ').lower()
211
212
tandrii5d48c322016-08-18 16:19:37 -0700213def _git_branch_config_key(branch, key):
214 """Helper method to return Git config key for a branch."""
215 assert branch, 'branch name is required to set git config for it'
216 return 'branch.%s.%s' % (branch, key)
217
218
219def _git_get_branch_config_value(key, default=None, value_type=str,
220 branch=False):
221 """Returns git config value of given or current branch if any.
222
223 Returns default in all other cases.
224 """
225 assert value_type in (int, str, bool)
226 if branch is False: # Distinguishing default arg value from None.
227 branch = GetCurrentBranch()
228
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000229 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700230 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000231
tandrii5d48c322016-08-18 16:19:37 -0700232 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700233 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700234 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700235 # git config also has --int, but apparently git config suffers from integer
236 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700237 args.append(_git_branch_config_key(branch, key))
238 code, out = RunGitWithCode(args)
239 if code == 0:
240 value = out.strip()
241 if value_type == int:
242 return int(value)
243 if value_type == bool:
244 return bool(value.lower() == 'true')
245 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000246 return default
247
248
tandrii5d48c322016-08-18 16:19:37 -0700249def _git_set_branch_config_value(key, value, branch=None, **kwargs):
250 """Sets the value or unsets if it's None of a git branch config.
251
252 Valid, though not necessarily existing, branch must be provided,
253 otherwise currently checked out branch is used.
254 """
255 if not branch:
256 branch = GetCurrentBranch()
257 assert branch, 'a branch name OR currently checked out branch is required'
258 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700259 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700260 if value is None:
261 args.append('--unset')
262 elif isinstance(value, bool):
263 args.append('--bool')
264 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700265 else:
tandrii33a46ff2016-08-23 05:53:40 -0700266 # git config also has --int, but apparently git config suffers from integer
267 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700268 value = str(value)
269 args.append(_git_branch_config_key(branch, key))
270 if value is not None:
271 args.append(value)
272 RunGit(args, **kwargs)
273
274
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100275def _get_committer_timestamp(commit):
276 """Returns unix timestamp as integer of a committer in a commit.
277
278 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
279 """
280 # Git also stores timezone offset, but it only affects visual display,
281 # actual point in time is defined by this timestamp only.
282 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
283
284
285def _git_amend_head(message, committer_timestamp):
286 """Amends commit with new message and desired committer_timestamp.
287
288 Sets committer timezone to UTC.
289 """
290 env = os.environ.copy()
291 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
292 return RunGit(['commit', '--amend', '-m', message], env=env)
293
294
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000295def add_git_similarity(parser):
296 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700297 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000298 help='Sets the percentage that a pair of files need to match in order to'
299 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000300 parser.add_option(
301 '--find-copies', action='store_true',
302 help='Allows git to look for copies.')
303 parser.add_option(
304 '--no-find-copies', action='store_false', dest='find_copies',
305 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000306
307 old_parser_args = parser.parse_args
308 def Parse(args):
309 options, args = old_parser_args(args)
310
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000311 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700312 options.similarity = _git_get_branch_config_value(
313 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000315 print('Note: Saving similarity of %d%% in git config.'
316 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700317 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000318
iannucci@chromium.org79540052012-10-19 23:15:26 +0000319 options.similarity = max(0, min(options.similarity, 100))
320
321 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700322 options.find_copies = _git_get_branch_config_value(
323 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000324 else:
tandrii5d48c322016-08-18 16:19:37 -0700325 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000326
327 print('Using %d%% similarity for rename/copy detection. '
328 'Override with --similarity.' % options.similarity)
329
330 return options, args
331 parser.parse_args = Parse
332
333
machenbach@chromium.org45453142015-09-15 08:45:22 +0000334def _get_properties_from_options(options):
335 properties = dict(x.split('=', 1) for x in options.properties)
336 for key, val in properties.iteritems():
337 try:
338 properties[key] = json.loads(val)
339 except ValueError:
340 pass # If a value couldn't be evaluated, treat it as a string.
341 return properties
342
343
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000344def _prefix_master(master):
345 """Convert user-specified master name to full master name.
346
347 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
348 name, while the developers always use shortened master name
349 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
350 function does the conversion for buildbucket migration.
351 """
borenet6c0efe62016-10-19 08:13:29 -0700352 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000353 return master
borenet6c0efe62016-10-19 08:13:29 -0700354 return '%s%s' % (MASTER_PREFIX, master)
355
356
357def _unprefix_master(bucket):
358 """Convert bucket name to shortened master name.
359
360 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
361 name, while the developers always use shortened master name
362 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
363 function does the conversion for buildbucket migration.
364 """
365 if bucket.startswith(MASTER_PREFIX):
366 return bucket[len(MASTER_PREFIX):]
367 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000368
369
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370def _buildbucket_retry(operation_name, http, *args, **kwargs):
371 """Retries requests to buildbucket service and returns parsed json content."""
372 try_count = 0
373 while True:
374 response, content = http.request(*args, **kwargs)
375 try:
376 content_json = json.loads(content)
377 except ValueError:
378 content_json = None
379
380 # Buildbucket could return an error even if status==200.
381 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000382 error = content_json.get('error')
383 if error.get('code') == 403:
384 raise BuildbucketResponseException(
385 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000386 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000387 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000388 raise BuildbucketResponseException(msg)
389
390 if response.status == 200:
391 if not content_json:
392 raise BuildbucketResponseException(
393 'Buildbucket returns invalid json content: %s.\n'
394 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
395 content)
396 return content_json
397 if response.status < 500 or try_count >= 2:
398 raise httplib2.HttpLib2Error(content)
399
400 # status >= 500 means transient failures.
401 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700402 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 try_count += 1
404 assert False, 'unreachable'
405
406
qyearsley1fdfcb62016-10-24 13:22:03 -0700407def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700408 """Returns a dict mapping bucket names to builders and tests,
409 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 """
qyearsleydd49f942016-10-28 11:57:22 -0700411 # If no bots are listed, we try to get a set of builders and tests based
412 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 if not options.bot:
414 change = changelist.GetChange(
415 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700416 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700417 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 change=change,
419 changed_files=change.LocalPaths(),
420 repository_root=settings.GetRoot(),
421 default_presubmit=None,
422 project=None,
423 verbose=options.verbose,
424 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700425 if masters is None:
426 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100427 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700428
qyearsley1fdfcb62016-10-24 13:22:03 -0700429 if options.bucket:
430 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700431 if options.master:
432 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700433
qyearsleydd49f942016-10-28 11:57:22 -0700434 # If bots are listed but no master or bucket, then we need to find out
435 # the corresponding master for each bot.
436 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
437 if error_message:
438 option_parser.error(
439 'Tryserver master cannot be found because: %s\n'
440 'Please manually specify the tryserver master, e.g. '
441 '"-m tryserver.chromium.linux".' % error_message)
442 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700443
444
qyearsley123a4682016-10-26 09:12:17 -0700445def _get_bucket_map_for_builders(builders):
446 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700447 map_url = 'https://builders-map.appspot.com/'
448 try:
qyearsley123a4682016-10-26 09:12:17 -0700449 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700450 except urllib2.URLError as e:
451 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
452 (map_url, e))
453 except ValueError as e:
454 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700455 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 return None, 'Failed to build master map.'
457
qyearsley123a4682016-10-26 09:12:17 -0700458 bucket_map = {}
459 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700460 masters = builders_map.get(builder, [])
461 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700463 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700464 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700465 (builder, masters))
466 bucket = _prefix_master(masters[0])
467 bucket_map.setdefault(bucket, {})[builder] = []
468
469 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700470
471
borenet6c0efe62016-10-19 08:13:29 -0700472def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700473 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700474 """Sends a request to Buildbucket to trigger try jobs for a changelist.
475
476 Args:
477 auth_config: AuthConfig for Rietveld.
478 changelist: Changelist that the try jobs are associated with.
479 buckets: A nested dict mapping bucket names to builders to tests.
480 options: Command-line options.
481 """
tandriide281ae2016-10-12 06:02:30 -0700482 assert changelist.GetIssue(), 'CL must be uploaded first'
483 codereview_url = changelist.GetCodereviewServer()
484 assert codereview_url, 'CL must be uploaded first'
485 patchset = patchset or changelist.GetMostRecentPatchset()
486 assert patchset, 'CL must be uploaded first'
487
488 codereview_host = urlparse.urlparse(codereview_url).hostname
489 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000490 http = authenticator.authorize(httplib2.Http())
491 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700492
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493 buildbucket_put_url = (
494 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000495 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700496 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
497 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
498 hostname=codereview_host,
499 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700501
502 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
503 shared_parameters_properties['category'] = category
504 if options.clobber:
505 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700506 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700507 if extra_properties:
508 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000509
510 batch_req_body = {'builds': []}
511 print_text = []
512 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700513 for bucket, builders_and_tests in sorted(buckets.iteritems()):
514 print_text.append('Bucket: %s' % bucket)
515 master = None
516 if bucket.startswith(MASTER_PREFIX):
517 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000518 for builder, tests in sorted(builders_and_tests.iteritems()):
519 print_text.append(' %s: %s' % (builder, tests))
520 parameters = {
521 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000522 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100523 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000524 'revision': options.revision,
525 }],
tandrii8c5a3532016-11-04 07:52:02 -0700526 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000527 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000528 if 'presubmit' in builder.lower():
529 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000530 if tests:
531 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700532
533 tags = [
534 'builder:%s' % builder,
535 'buildset:%s' % buildset,
536 'user_agent:git_cl_try',
537 ]
538 if master:
539 parameters['properties']['master'] = master
540 tags.append('master:%s' % master)
541
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000542 batch_req_body['builds'].append(
543 {
544 'bucket': bucket,
545 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700547 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000548 }
549 )
550
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700552 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 http,
554 buildbucket_put_url,
555 'PUT',
556 body=json.dumps(batch_req_body),
557 headers={'Content-Type': 'application/json'}
558 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000559 print_text.append('To see results here, run: git cl try-results')
560 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700561 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000562
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000563
tandrii221ab252016-10-06 08:12:04 -0700564def fetch_try_jobs(auth_config, changelist, buildbucket_host,
565 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700566 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
qyearsley53f48a12016-09-01 10:45:13 -0700568 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 """
tandrii221ab252016-10-06 08:12:04 -0700570 assert buildbucket_host
571 assert changelist.GetIssue(), 'CL must be uploaded first'
572 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
573 patchset = patchset or changelist.GetMostRecentPatchset()
574 assert patchset, 'CL must be uploaded first'
575
576 codereview_url = changelist.GetCodereviewServer()
577 codereview_host = urlparse.urlparse(codereview_url).hostname
578 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 if authenticator.has_cached_credentials():
580 http = authenticator.authorize(httplib2.Http())
581 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700582 print('Warning: Some results might be missing because %s' %
583 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700584 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 http = httplib2.Http()
586
587 http.force_exception_to_status_code = True
588
tandrii221ab252016-10-06 08:12:04 -0700589 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
590 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
591 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700593 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 params = {'tag': 'buildset:%s' % buildset}
595
596 builds = {}
597 while True:
598 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700599 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700601 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000602 for build in content.get('builds', []):
603 builds[build['id']] = build
604 if 'next_cursor' in content:
605 params['start_cursor'] = content['next_cursor']
606 else:
607 break
608 return builds
609
610
qyearsleyeab3c042016-08-24 09:18:28 -0700611def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 """Prints nicely result of fetch_try_jobs."""
613 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700614 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 return
616
617 # Make a copy, because we'll be modifying builds dictionary.
618 builds = builds.copy()
619 builder_names_cache = {}
620
621 def get_builder(b):
622 try:
623 return builder_names_cache[b['id']]
624 except KeyError:
625 try:
626 parameters = json.loads(b['parameters_json'])
627 name = parameters['builder_name']
628 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700629 print('WARNING: failed to get builder name for build %s: %s' % (
630 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 name = None
632 builder_names_cache[b['id']] = name
633 return name
634
635 def get_bucket(b):
636 bucket = b['bucket']
637 if bucket.startswith('master.'):
638 return bucket[len('master.'):]
639 return bucket
640
641 if options.print_master:
642 name_fmt = '%%-%ds %%-%ds' % (
643 max(len(str(get_bucket(b))) for b in builds.itervalues()),
644 max(len(str(get_builder(b))) for b in builds.itervalues()))
645 def get_name(b):
646 return name_fmt % (get_bucket(b), get_builder(b))
647 else:
648 name_fmt = '%%-%ds' % (
649 max(len(str(get_builder(b))) for b in builds.itervalues()))
650 def get_name(b):
651 return name_fmt % get_builder(b)
652
653 def sort_key(b):
654 return b['status'], b.get('result'), get_name(b), b.get('url')
655
656 def pop(title, f, color=None, **kwargs):
657 """Pop matching builds from `builds` dict and print them."""
658
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000659 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 colorize = str
661 else:
662 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
663
664 result = []
665 for b in builds.values():
666 if all(b.get(k) == v for k, v in kwargs.iteritems()):
667 builds.pop(b['id'])
668 result.append(b)
669 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700670 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700672 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674 total = len(builds)
675 pop(status='COMPLETED', result='SUCCESS',
676 title='Successes:', color=Fore.GREEN,
677 f=lambda b: (get_name(b), b.get('url')))
678 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
679 title='Infra Failures:', color=Fore.MAGENTA,
680 f=lambda b: (get_name(b), b.get('url')))
681 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
682 title='Failures:', color=Fore.RED,
683 f=lambda b: (get_name(b), b.get('url')))
684 pop(status='COMPLETED', result='CANCELED',
685 title='Canceled:', color=Fore.MAGENTA,
686 f=lambda b: (get_name(b),))
687 pop(status='COMPLETED', result='FAILURE',
688 failure_reason='INVALID_BUILD_DEFINITION',
689 title='Wrong master/builder name:', color=Fore.MAGENTA,
690 f=lambda b: (get_name(b),))
691 pop(status='COMPLETED', result='FAILURE',
692 title='Other failures:',
693 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
694 pop(status='COMPLETED',
695 title='Other finished:',
696 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
697 pop(status='STARTED',
698 title='Started:', color=Fore.YELLOW,
699 f=lambda b: (get_name(b), b.get('url')))
700 pop(status='SCHEDULED',
701 title='Scheduled:',
702 f=lambda b: (get_name(b), 'id=%s' % b['id']))
703 # The last section is just in case buildbucket API changes OR there is a bug.
704 pop(title='Other:',
705 f=lambda b: (get_name(b), 'id=%s' % b['id']))
706 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700707 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000708
709
qyearsley53f48a12016-09-01 10:45:13 -0700710def write_try_results_json(output_file, builds):
711 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
712
713 The input |builds| dict is assumed to be generated by Buildbucket.
714 Buildbucket documentation: http://goo.gl/G0s101
715 """
716
717 def convert_build_dict(build):
718 return {
719 'buildbucket_id': build.get('id'),
720 'status': build.get('status'),
721 'result': build.get('result'),
722 'bucket': build.get('bucket'),
723 'builder_name': json.loads(
724 build.get('parameters_json', '{}')).get('builder_name'),
725 'failure_reason': build.get('failure_reason'),
726 'url': build.get('url'),
727 }
728
729 converted = []
730 for _, build in sorted(builds.items()):
731 converted.append(convert_build_dict(build))
732 write_json(output_file, converted)
733
734
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 """Prints statistics about the change to the user."""
737 # --no-ext-diff is broken in some versions of Git, so try to work around
738 # this by overriding the environment (but there is still a problem if the
739 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 if 'GIT_EXTERNAL_DIFF' in env:
742 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
744 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800745 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746 else:
747 similarity_options = ['-M%s' % similarity]
748
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000749 try:
750 stdout = sys.stdout.fileno()
751 except AttributeError:
752 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000755 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000756 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
765 self.default_server = None
766 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000767 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.tree_status_url = None
769 self.viewvc_url = None
770 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000771 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000773 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000775 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000776 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
778 def LazyUpdateIfNeeded(self):
779 """Updates the settings from a codereview.settings file, if available."""
780 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000783 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000784 error_ok=True
785 ).strip().lower()
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 self.updated = True
791
792 def GetDefaultServerUrl(self, error_ok=False):
793 if not self.default_server:
794 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000795 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 if error_ok:
798 return self.default_server
799 if not self.default_server:
800 error_message = ('Could not find settings file. You must configure '
801 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000802 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000803 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804 return self.default_server
805
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 @staticmethod
807 def GetRelativeRoot():
808 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 if self.root is None:
812 self.root = os.path.abspath(self.GetRelativeRoot())
813 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000815 def GetGitMirror(self, remote='origin'):
816 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000817 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000818 if not os.path.isdir(local_url):
819 return None
820 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
821 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100822 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100823 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000824 if mirror.exists():
825 return mirror
826 return None
827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 def GetTreeStatusUrl(self, error_ok=False):
829 if not self.tree_status_url:
830 error_message = ('You must configure your tree status URL by running '
831 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000832 self.tree_status_url = self._GetRietveldConfig(
833 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.tree_status_url
835
836 def GetViewVCUrl(self):
837 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000838 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.viewvc_url
840
rmistry@google.com90752582014-01-14 21:04:50 +0000841 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000842 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000843
rmistry@google.com78948ed2015-07-08 23:09:57 +0000844 def GetIsSkipDependencyUpload(self, branch_name):
845 """Returns true if specified branch should skip dep uploads."""
846 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
847 error_ok=True)
848
rmistry@google.com5626a922015-02-26 14:03:30 +0000849 def GetRunPostUploadHook(self):
850 run_post_upload_hook = self._GetRietveldConfig(
851 'run-post-upload-hook', error_ok=True)
852 return run_post_upload_hook == "True"
853
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000854 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000856
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000858 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000859
ukai@chromium.orge8077812012-02-03 03:41:46 +0000860 def GetIsGerrit(self):
861 """Return true if this repo is assosiated with gerrit code review system."""
862 if self.is_gerrit is None:
863 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
864 return self.is_gerrit
865
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000866 def GetSquashGerritUploads(self):
867 """Return true if uploads to Gerrit should be squashed by default."""
868 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700869 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
870 if self.squash_gerrit_uploads is None:
871 # Default is squash now (http://crbug.com/611892#c23).
872 self.squash_gerrit_uploads = not (
873 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
874 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000875 return self.squash_gerrit_uploads
876
tandriia60502f2016-06-20 02:01:53 -0700877 def GetSquashGerritUploadsOverride(self):
878 """Return True or False if codereview.settings should be overridden.
879
880 Returns None if no override has been defined.
881 """
882 # See also http://crbug.com/611892#c23
883 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
884 error_ok=True).strip()
885 if result == 'true':
886 return True
887 if result == 'false':
888 return False
889 return None
890
tandrii@chromium.org28253532016-04-14 13:46:56 +0000891 def GetGerritSkipEnsureAuthenticated(self):
892 """Return True if EnsureAuthenticated should not be done for Gerrit
893 uploads."""
894 if self.gerrit_skip_ensure_authenticated is None:
895 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000896 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000897 error_ok=True).strip() == 'true')
898 return self.gerrit_skip_ensure_authenticated
899
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000900 def GetGitEditor(self):
901 """Return the editor specified in the git config, or None if none is."""
902 if self.git_editor is None:
903 self.git_editor = self._GetConfig('core.editor', error_ok=True)
904 return self.git_editor or None
905
thestig@chromium.org44202a22014-03-11 19:22:18 +0000906 def GetLintRegex(self):
907 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
908 DEFAULT_LINT_REGEX)
909
910 def GetLintIgnoreRegex(self):
911 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
912 DEFAULT_LINT_IGNORE_REGEX)
913
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000914 def GetProject(self):
915 if not self.project:
916 self.project = self._GetRietveldConfig('project', error_ok=True)
917 return self.project
918
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000919 def _GetRietveldConfig(self, param, **kwargs):
920 return self._GetConfig('rietveld.' + param, **kwargs)
921
rmistry@google.com78948ed2015-07-08 23:09:57 +0000922 def _GetBranchConfig(self, branch_name, param, **kwargs):
923 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
924
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000925 def _GetConfig(self, param, **kwargs):
926 self.LazyUpdateIfNeeded()
927 return RunGit(['config', param], **kwargs).strip()
928
929
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100930@contextlib.contextmanager
931def _get_gerrit_project_config_file(remote_url):
932 """Context manager to fetch and store Gerrit's project.config from
933 refs/meta/config branch and store it in temp file.
934
935 Provides a temporary filename or None if there was error.
936 """
937 error, _ = RunGitWithCode([
938 'fetch', remote_url,
939 '+refs/meta/config:refs/git_cl/meta/config'])
940 if error:
941 # Ref doesn't exist or isn't accessible to current user.
942 print('WARNING: failed to fetch project config for %s: %s' %
943 (remote_url, error))
944 yield None
945 return
946
947 error, project_config_data = RunGitWithCode(
948 ['show', 'refs/git_cl/meta/config:project.config'])
949 if error:
950 print('WARNING: project.config file not found')
951 yield None
952 return
953
954 with gclient_utils.temporary_directory() as tempdir:
955 project_config_file = os.path.join(tempdir, 'project.config')
956 gclient_utils.FileWrite(project_config_file, project_config_data)
957 yield project_config_file
958
959
960def _is_git_numberer_enabled(remote_url, remote_ref):
961 """Returns True if Git Numberer is enabled on this ref."""
962 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100963 KNOWN_PROJECTS_WHITELIST = [
964 'chromium/src',
965 'external/webrtc',
966 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100967 'infra/experimental',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100968 ]
969
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100970 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
971 url_parts = urlparse.urlparse(remote_url)
972 project_name = url_parts.path.lstrip('/').rstrip('git./')
973 for known in KNOWN_PROJECTS_WHITELIST:
974 if project_name.endswith(known):
975 break
976 else:
977 # Early exit to avoid extra fetches for repos that aren't using Git
978 # Numberer.
979 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100980
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100981 with _get_gerrit_project_config_file(remote_url) as project_config_file:
982 if project_config_file is None:
983 # Failed to fetch project.config, which shouldn't happen on open source
984 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100985 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100986 def get_opts(x):
987 code, out = RunGitWithCode(
988 ['config', '-f', project_config_file, '--get-all',
989 'plugin.git-numberer.validate-%s-refglob' % x])
990 if code == 0:
991 return out.strip().splitlines()
992 return []
993 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100994
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100995 logging.info('validator config enabled %s disabled %s refglobs for '
996 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000997
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100998 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100999 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001000 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001001 return True
1002 return False
1003
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001004 if match_refglobs(disabled):
1005 return False
1006 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001007
1008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009def ShortBranchName(branch):
1010 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 return branch.replace('refs/heads/', '', 1)
1012
1013
1014def GetCurrentBranchRef():
1015 """Returns branch ref (e.g., refs/heads/master) or None."""
1016 return RunGit(['symbolic-ref', 'HEAD'],
1017 stderr=subprocess2.VOID, error_ok=True).strip() or None
1018
1019
1020def GetCurrentBranch():
1021 """Returns current branch or None.
1022
1023 For refs/heads/* branches, returns just last part. For others, full ref.
1024 """
1025 branchref = GetCurrentBranchRef()
1026 if branchref:
1027 return ShortBranchName(branchref)
1028 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029
1030
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001031class _CQState(object):
1032 """Enum for states of CL with respect to Commit Queue."""
1033 NONE = 'none'
1034 DRY_RUN = 'dry_run'
1035 COMMIT = 'commit'
1036
1037 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1038
1039
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001041 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001042 self.issue = issue
1043 self.patchset = patchset
1044 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001045 assert codereview in (None, 'rietveld', 'gerrit')
1046 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001047
1048 @property
1049 def valid(self):
1050 return self.issue is not None
1051
1052
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001053def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001054 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1055 fail_result = _ParsedIssueNumberArgument()
1056
1057 if arg.isdigit():
1058 return _ParsedIssueNumberArgument(issue=int(arg))
1059 if not arg.startswith('http'):
1060 return fail_result
1061 url = gclient_utils.UpgradeToHttps(arg)
1062 try:
1063 parsed_url = urlparse.urlparse(url)
1064 except ValueError:
1065 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001066
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001067 if codereview is not None:
1068 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1069 return parsed or fail_result
1070
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001071 results = {}
1072 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1073 parsed = cls.ParseIssueURL(parsed_url)
1074 if parsed is not None:
1075 results[name] = parsed
1076
1077 if not results:
1078 return fail_result
1079 if len(results) == 1:
1080 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001081
1082 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1083 # This is likely Gerrit.
1084 return results['gerrit']
1085 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001086 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001087
1088
Aaron Gablea45ee112016-11-22 15:14:38 -08001089class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001090 def __init__(self, issue, url):
1091 self.issue = issue
1092 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001093 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001094
1095 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001096 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001097 self.issue, self.url)
1098
1099
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001100_CommentSummary = collections.namedtuple(
1101 '_CommentSummary', ['date', 'message', 'sender',
1102 # TODO(tandrii): these two aren't known in Gerrit.
1103 'approval', 'disapproval'])
1104
1105
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001106class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001107 """Changelist works with one changelist in local branch.
1108
1109 Supports two codereview backends: Rietveld or Gerrit, selected at object
1110 creation.
1111
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001112 Notes:
1113 * Not safe for concurrent multi-{thread,process} use.
1114 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001115 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001116 """
1117
1118 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1119 """Create a new ChangeList instance.
1120
1121 If issue is given, the codereview must be given too.
1122
1123 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1124 Otherwise, it's decided based on current configuration of the local branch,
1125 with default being 'rietveld' for backwards compatibility.
1126 See _load_codereview_impl for more details.
1127
1128 **kwargs will be passed directly to codereview implementation.
1129 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001130 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001131 global settings
1132 if not settings:
1133 # Happens when git_cl.py is used as a utility library.
1134 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001135
1136 if issue:
1137 assert codereview, 'codereview must be known, if issue is known'
1138
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001139 self.branchref = branchref
1140 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001141 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001142 self.branch = ShortBranchName(self.branchref)
1143 else:
1144 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001145 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001146 self.lookedup_issue = False
1147 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001148 self.has_description = False
1149 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001150 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001151 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001152 self.cc = None
1153 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001154 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001155
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001156 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001157 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001159 assert self._codereview_impl
1160 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161
1162 def _load_codereview_impl(self, codereview=None, **kwargs):
1163 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001164 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1165 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1166 self._codereview = codereview
1167 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001168 return
1169
1170 # Automatic selection based on issue number set for a current branch.
1171 # Rietveld takes precedence over Gerrit.
1172 assert not self.issue
1173 # Whether we find issue or not, we are doing the lookup.
1174 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001175 if self.GetBranch():
1176 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1177 issue = _git_get_branch_config_value(
1178 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1179 if issue:
1180 self._codereview = codereview
1181 self._codereview_impl = cls(self, **kwargs)
1182 self.issue = int(issue)
1183 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001184
1185 # No issue is set for this branch, so decide based on repo-wide settings.
1186 return self._load_codereview_impl(
1187 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1188 **kwargs)
1189
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001190 def IsGerrit(self):
1191 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001192
1193 def GetCCList(self):
1194 """Return the users cc'd on this CL.
1195
agable92bec4f2016-08-24 09:27:27 -07001196 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197 """
1198 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001199 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200 more_cc = ','.join(self.watchers)
1201 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1202 return self.cc
1203
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001204 def GetCCListWithoutDefault(self):
1205 """Return the users cc'd on this CL excluding default ones."""
1206 if self.cc is None:
1207 self.cc = ','.join(self.watchers)
1208 return self.cc
1209
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001210 def SetWatchers(self, watchers):
1211 """Set the list of email addresses that should be cc'd based on the changed
1212 files in this CL.
1213 """
1214 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215
1216 def GetBranch(self):
1217 """Returns the short branch name, e.g. 'master'."""
1218 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001219 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001220 if not branchref:
1221 return None
1222 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 self.branch = ShortBranchName(self.branchref)
1224 return self.branch
1225
1226 def GetBranchRef(self):
1227 """Returns the full branch name, e.g. 'refs/heads/master'."""
1228 self.GetBranch() # Poke the lazy loader.
1229 return self.branchref
1230
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001231 def ClearBranch(self):
1232 """Clears cached branch data of this object."""
1233 self.branch = self.branchref = None
1234
tandrii5d48c322016-08-18 16:19:37 -07001235 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1236 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1237 kwargs['branch'] = self.GetBranch()
1238 return _git_get_branch_config_value(key, default, **kwargs)
1239
1240 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1241 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1242 assert self.GetBranch(), (
1243 'this CL must have an associated branch to %sset %s%s' %
1244 ('un' if value is None else '',
1245 key,
1246 '' if value is None else ' to %r' % value))
1247 kwargs['branch'] = self.GetBranch()
1248 return _git_set_branch_config_value(key, value, **kwargs)
1249
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001250 @staticmethod
1251 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001252 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001253 e.g. 'origin', 'refs/heads/master'
1254 """
1255 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001256 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1257
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001259 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001261 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1262 error_ok=True).strip()
1263 if upstream_branch:
1264 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001266 # Else, try to guess the origin remote.
1267 remote_branches = RunGit(['branch', '-r']).split()
1268 if 'origin/master' in remote_branches:
1269 # Fall back on origin/master if it exits.
1270 remote = 'origin'
1271 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001272 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001273 DieWithError(
1274 'Unable to determine default branch to diff against.\n'
1275 'Either pass complete "git diff"-style arguments, like\n'
1276 ' git cl upload origin/master\n'
1277 'or verify this branch is set up to track another \n'
1278 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001279
1280 return remote, upstream_branch
1281
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001282 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001283 upstream_branch = self.GetUpstreamBranch()
1284 if not BranchExists(upstream_branch):
1285 DieWithError('The upstream for the current branch (%s) does not exist '
1286 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001287 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001288 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001289
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290 def GetUpstreamBranch(self):
1291 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001292 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001294 upstream_branch = upstream_branch.replace('refs/heads/',
1295 'refs/remotes/%s/' % remote)
1296 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1297 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 self.upstream_branch = upstream_branch
1299 return self.upstream_branch
1300
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001301 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001302 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001303 remote, branch = None, self.GetBranch()
1304 seen_branches = set()
1305 while branch not in seen_branches:
1306 seen_branches.add(branch)
1307 remote, branch = self.FetchUpstreamTuple(branch)
1308 branch = ShortBranchName(branch)
1309 if remote != '.' or branch.startswith('refs/remotes'):
1310 break
1311 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001312 remotes = RunGit(['remote'], error_ok=True).split()
1313 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001314 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001315 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001316 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001317 logging.warn('Could not determine which remote this change is '
1318 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001319 else:
1320 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001321 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 branch = 'HEAD'
1323 if branch.startswith('refs/remotes'):
1324 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001325 elif branch.startswith('refs/branch-heads/'):
1326 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001327 else:
1328 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001329 return self._remote
1330
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001331 def GitSanityChecks(self, upstream_git_obj):
1332 """Checks git repo status and ensures diff is from local commits."""
1333
sbc@chromium.org79706062015-01-14 21:18:12 +00001334 if upstream_git_obj is None:
1335 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001336 print('ERROR: unable to determine current branch (detached HEAD?)',
1337 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001338 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001339 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001340 return False
1341
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001342 # Verify the commit we're diffing against is in our current branch.
1343 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1344 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1345 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001346 print('ERROR: %s is not in the current branch. You may need to rebase '
1347 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001348 return False
1349
1350 # List the commits inside the diff, and verify they are all local.
1351 commits_in_diff = RunGit(
1352 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1353 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1354 remote_branch = remote_branch.strip()
1355 if code != 0:
1356 _, remote_branch = self.GetRemoteBranch()
1357
1358 commits_in_remote = RunGit(
1359 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1360
1361 common_commits = set(commits_in_diff) & set(commits_in_remote)
1362 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001363 print('ERROR: Your diff contains %d commits already in %s.\n'
1364 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1365 'the diff. If you are using a custom git flow, you can override'
1366 ' the reference used for this check with "git config '
1367 'gitcl.remotebranch <git-ref>".' % (
1368 len(common_commits), remote_branch, upstream_git_obj),
1369 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001370 return False
1371 return True
1372
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001373 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001374 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001375
1376 Returns None if it is not set.
1377 """
tandrii5d48c322016-08-18 16:19:37 -07001378 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001379
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001380 def GetRemoteUrl(self):
1381 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1382
1383 Returns None if there is no remote.
1384 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001385 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001386 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1387
1388 # If URL is pointing to a local directory, it is probably a git cache.
1389 if os.path.isdir(url):
1390 url = RunGit(['config', 'remote.%s.url' % remote],
1391 error_ok=True,
1392 cwd=url).strip()
1393 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001395 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001396 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001397 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001398 self.issue = self._GitGetBranchConfigValue(
1399 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001400 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001401 return self.issue
1402
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 def GetIssueURL(self):
1404 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001405 issue = self.GetIssue()
1406 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001407 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001408 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001410 def GetDescription(self, pretty=False, force=False):
1411 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001413 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414 self.has_description = True
1415 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001416 # Set width to 72 columns + 2 space indent.
1417 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001419 lines = self.description.splitlines()
1420 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 return self.description
1422
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001423 def GetDescriptionFooters(self):
1424 """Returns (non_footer_lines, footers) for the commit message.
1425
1426 Returns:
1427 non_footer_lines (list(str)) - Simple list of description lines without
1428 any footer. The lines do not contain newlines, nor does the list contain
1429 the empty line between the message and the footers.
1430 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1431 [("Change-Id", "Ideadbeef...."), ...]
1432 """
1433 raw_description = self.GetDescription()
1434 msg_lines, _, footers = git_footers.split_footers(raw_description)
1435 if footers:
1436 msg_lines = msg_lines[:len(msg_lines)-1]
1437 return msg_lines, footers
1438
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001439 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001440 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001441 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001442 self.patchset = self._GitGetBranchConfigValue(
1443 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001444 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001445 return self.patchset
1446
1447 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001448 """Set this branch's patchset. If patchset=0, clears the patchset."""
1449 assert self.GetBranch()
1450 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001451 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001452 else:
1453 self.patchset = int(patchset)
1454 self._GitSetBranchConfigValue(
1455 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001456
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001457 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001458 """Set this branch's issue. If issue isn't given, clears the issue."""
1459 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001461 issue = int(issue)
1462 self._GitSetBranchConfigValue(
1463 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001464 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001465 codereview_server = self._codereview_impl.GetCodereviewServer()
1466 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001467 self._GitSetBranchConfigValue(
1468 self._codereview_impl.CodereviewServerConfigKey(),
1469 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001470 else:
tandrii5d48c322016-08-18 16:19:37 -07001471 # Reset all of these just to be clean.
1472 reset_suffixes = [
1473 'last-upload-hash',
1474 self._codereview_impl.IssueConfigKey(),
1475 self._codereview_impl.PatchsetConfigKey(),
1476 self._codereview_impl.CodereviewServerConfigKey(),
1477 ] + self._PostUnsetIssueProperties()
1478 for prop in reset_suffixes:
1479 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001480 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001481 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001482
dnjba1b0f32016-09-02 12:37:42 -07001483 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001484 if not self.GitSanityChecks(upstream_branch):
1485 DieWithError('\nGit sanity check failure')
1486
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001487 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001488 if not root:
1489 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001490 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001491
1492 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001493 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001494 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001495 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001496 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001497 except subprocess2.CalledProcessError:
1498 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001499 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001500 'This branch probably doesn\'t exist anymore. To reset the\n'
1501 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001502 ' git branch --set-upstream-to origin/master %s\n'
1503 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001504 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001505
maruel@chromium.org52424302012-08-29 15:14:30 +00001506 issue = self.GetIssue()
1507 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001508 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001509 description = self.GetDescription()
1510 else:
1511 # If the change was never uploaded, use the log messages of all commits
1512 # up to the branch point, as git cl upload will prefill the description
1513 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001514 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1515 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001516
1517 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001518 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001519 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001520 name,
1521 description,
1522 absroot,
1523 files,
1524 issue,
1525 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001526 author,
1527 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001528
dsansomee2d6fd92016-09-08 00:10:47 -07001529 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001530 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001531 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001532 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001533
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001534 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1535 """Sets the description for this CL remotely.
1536
1537 You can get description_lines and footers with GetDescriptionFooters.
1538
1539 Args:
1540 description_lines (list(str)) - List of CL description lines without
1541 newline characters.
1542 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1543 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1544 `List-Of-Tokens`). It will be case-normalized so that each token is
1545 title-cased.
1546 """
1547 new_description = '\n'.join(description_lines)
1548 if footers:
1549 new_description += '\n'
1550 for k, v in footers:
1551 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1552 if not git_footers.FOOTER_PATTERN.match(foot):
1553 raise ValueError('Invalid footer %r' % foot)
1554 new_description += foot + '\n'
1555 self.UpdateDescription(new_description, force)
1556
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001557 def RunHook(self, committing, may_prompt, verbose, change):
1558 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1559 try:
1560 return presubmit_support.DoPresubmitChecks(change, committing,
1561 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1562 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001563 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1564 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001565 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001566 DieWithError(
1567 ('%s\nMaybe your depot_tools is out of date?\n'
1568 'If all fails, contact maruel@') % e)
1569
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001570 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1571 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001572 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1573 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001574 else:
1575 # Assume url.
1576 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1577 urlparse.urlparse(issue_arg))
1578 if not parsed_issue_arg or not parsed_issue_arg.valid:
1579 DieWithError('Failed to parse issue argument "%s". '
1580 'Must be an issue number or a valid URL.' % issue_arg)
1581 return self._codereview_impl.CMDPatchWithParsedIssue(
1582 parsed_issue_arg, reject, nocommit, directory)
1583
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584 def CMDUpload(self, options, git_diff_args, orig_args):
1585 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001586 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001588 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001589 else:
1590 if self.GetBranch() is None:
1591 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1592
1593 # Default to diffing against common ancestor of upstream branch
1594 base_branch = self.GetCommonAncestorWithUpstream()
1595 git_diff_args = [base_branch, 'HEAD']
1596
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001597 # Fast best-effort checks to abort before running potentially
1598 # expensive hooks if uploading is likely to fail anyway. Passing these
1599 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001600 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001601 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001602
1603 # Apply watchlists on upload.
1604 change = self.GetChange(base_branch, None)
1605 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1606 files = [f.LocalPath() for f in change.AffectedFiles()]
1607 if not options.bypass_watchlists:
1608 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1609
1610 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001611 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001612 # Set the reviewer list now so that presubmit checks can access it.
1613 change_description = ChangeDescription(change.FullDescriptionText())
1614 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001615 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001616 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001617 change)
1618 change.SetDescriptionText(change_description.description)
1619 hook_results = self.RunHook(committing=False,
1620 may_prompt=not options.force,
1621 verbose=options.verbose,
1622 change=change)
1623 if not hook_results.should_continue():
1624 return 1
1625 if not options.reviewers and hook_results.reviewers:
1626 options.reviewers = hook_results.reviewers.split(',')
1627
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001628 # TODO(tandrii): Checking local patchset against remote patchset is only
1629 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1630 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001631 latest_patchset = self.GetMostRecentPatchset()
1632 local_patchset = self.GetPatchset()
1633 if (latest_patchset and local_patchset and
1634 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001635 print('The last upload made from this repository was patchset #%d but '
1636 'the most recent patchset on the server is #%d.'
1637 % (local_patchset, latest_patchset))
1638 print('Uploading will still work, but if you\'ve uploaded to this '
1639 'issue from another machine or branch the patch you\'re '
1640 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001641 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001642
1643 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001644 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001645 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001646 if options.use_commit_queue:
1647 self.SetCQState(_CQState.COMMIT)
1648 elif options.cq_dry_run:
1649 self.SetCQState(_CQState.DRY_RUN)
1650
tandrii5d48c322016-08-18 16:19:37 -07001651 _git_set_branch_config_value('last-upload-hash',
1652 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001653 # Run post upload hooks, if specified.
1654 if settings.GetRunPostUploadHook():
1655 presubmit_support.DoPostUploadExecuter(
1656 change,
1657 self,
1658 settings.GetRoot(),
1659 options.verbose,
1660 sys.stdout)
1661
1662 # Upload all dependencies if specified.
1663 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001664 print()
1665 print('--dependencies has been specified.')
1666 print('All dependent local branches will be re-uploaded.')
1667 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001668 # Remove the dependencies flag from args so that we do not end up in a
1669 # loop.
1670 orig_args.remove('--dependencies')
1671 ret = upload_branch_deps(self, orig_args)
1672 return ret
1673
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001674 def SetCQState(self, new_state):
1675 """Update the CQ state for latest patchset.
1676
1677 Issue must have been already uploaded and known.
1678 """
1679 assert new_state in _CQState.ALL_STATES
1680 assert self.GetIssue()
1681 return self._codereview_impl.SetCQState(new_state)
1682
qyearsley1fdfcb62016-10-24 13:22:03 -07001683 def TriggerDryRun(self):
1684 """Triggers a dry run and prints a warning on failure."""
1685 # TODO(qyearsley): Either re-use this method in CMDset_commit
1686 # and CMDupload, or change CMDtry to trigger dry runs with
1687 # just SetCQState, and catch keyboard interrupt and other
1688 # errors in that method.
1689 try:
1690 self.SetCQState(_CQState.DRY_RUN)
1691 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1692 return 0
1693 except KeyboardInterrupt:
1694 raise
1695 except:
1696 print('WARNING: failed to trigger CQ Dry Run.\n'
1697 'Either:\n'
1698 ' * your project has no CQ\n'
1699 ' * you don\'t have permission to trigger Dry Run\n'
1700 ' * bug in this code (see stack trace below).\n'
1701 'Consider specifying which bots to trigger manually '
1702 'or asking your project owners for permissions '
1703 'or contacting Chrome Infrastructure team at '
1704 'https://www.chromium.org/infra\n\n')
1705 # Still raise exception so that stack trace is printed.
1706 raise
1707
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001708 # Forward methods to codereview specific implementation.
1709
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001710 def AddComment(self, message):
1711 return self._codereview_impl.AddComment(message)
1712
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001713 def GetCommentsSummary(self):
1714 """Returns list of _CommentSummary for each comment.
1715
1716 Note: comments per file or per line are not included,
1717 only top-level comments are returned.
1718 """
1719 return self._codereview_impl.GetCommentsSummary()
1720
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001721 def CloseIssue(self):
1722 return self._codereview_impl.CloseIssue()
1723
1724 def GetStatus(self):
1725 return self._codereview_impl.GetStatus()
1726
1727 def GetCodereviewServer(self):
1728 return self._codereview_impl.GetCodereviewServer()
1729
tandriide281ae2016-10-12 06:02:30 -07001730 def GetIssueOwner(self):
1731 """Get owner from codereview, which may differ from this checkout."""
1732 return self._codereview_impl.GetIssueOwner()
1733
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001734 def GetMostRecentPatchset(self):
1735 return self._codereview_impl.GetMostRecentPatchset()
1736
tandriide281ae2016-10-12 06:02:30 -07001737 def CannotTriggerTryJobReason(self):
1738 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1739 return self._codereview_impl.CannotTriggerTryJobReason()
1740
tandrii8c5a3532016-11-04 07:52:02 -07001741 def GetTryjobProperties(self, patchset=None):
1742 """Returns dictionary of properties to launch tryjob."""
1743 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1744
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001745 def __getattr__(self, attr):
1746 # This is because lots of untested code accesses Rietveld-specific stuff
1747 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001748 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001749 # Note that child method defines __getattr__ as well, and forwards it here,
1750 # because _RietveldChangelistImpl is not cleaned up yet, and given
1751 # deprecation of Rietveld, it should probably be just removed.
1752 # Until that time, avoid infinite recursion by bypassing __getattr__
1753 # of implementation class.
1754 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001755
1756
1757class _ChangelistCodereviewBase(object):
1758 """Abstract base class encapsulating codereview specifics of a changelist."""
1759 def __init__(self, changelist):
1760 self._changelist = changelist # instance of Changelist
1761
1762 def __getattr__(self, attr):
1763 # Forward methods to changelist.
1764 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1765 # _RietveldChangelistImpl to avoid this hack?
1766 return getattr(self._changelist, attr)
1767
1768 def GetStatus(self):
1769 """Apply a rough heuristic to give a simple summary of an issue's review
1770 or CQ status, assuming adherence to a common workflow.
1771
1772 Returns None if no issue for this branch, or specific string keywords.
1773 """
1774 raise NotImplementedError()
1775
1776 def GetCodereviewServer(self):
1777 """Returns server URL without end slash, like "https://codereview.com"."""
1778 raise NotImplementedError()
1779
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001780 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001781 """Fetches and returns description from the codereview server."""
1782 raise NotImplementedError()
1783
tandrii5d48c322016-08-18 16:19:37 -07001784 @classmethod
1785 def IssueConfigKey(cls):
1786 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001787 raise NotImplementedError()
1788
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001789 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001790 def PatchsetConfigKey(cls):
1791 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001792 raise NotImplementedError()
1793
tandrii5d48c322016-08-18 16:19:37 -07001794 @classmethod
1795 def CodereviewServerConfigKey(cls):
1796 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797 raise NotImplementedError()
1798
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001799 def _PostUnsetIssueProperties(self):
1800 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001801 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001802
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001803 def GetRieveldObjForPresubmit(self):
1804 # This is an unfortunate Rietveld-embeddedness in presubmit.
1805 # For non-Rietveld codereviews, this probably should return a dummy object.
1806 raise NotImplementedError()
1807
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001808 def GetGerritObjForPresubmit(self):
1809 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1810 return None
1811
dsansomee2d6fd92016-09-08 00:10:47 -07001812 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001813 """Update the description on codereview site."""
1814 raise NotImplementedError()
1815
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001816 def AddComment(self, message):
1817 """Posts a comment to the codereview site."""
1818 raise NotImplementedError()
1819
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001820 def GetCommentsSummary(self):
1821 raise NotImplementedError()
1822
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823 def CloseIssue(self):
1824 """Closes the issue."""
1825 raise NotImplementedError()
1826
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001827 def GetMostRecentPatchset(self):
1828 """Returns the most recent patchset number from the codereview site."""
1829 raise NotImplementedError()
1830
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001831 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1832 directory):
1833 """Fetches and applies the issue.
1834
1835 Arguments:
1836 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1837 reject: if True, reject the failed patch instead of switching to 3-way
1838 merge. Rietveld only.
1839 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1840 only.
1841 directory: switch to directory before applying the patch. Rietveld only.
1842 """
1843 raise NotImplementedError()
1844
1845 @staticmethod
1846 def ParseIssueURL(parsed_url):
1847 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1848 failed."""
1849 raise NotImplementedError()
1850
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001851 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001852 """Best effort check that user is authenticated with codereview server.
1853
1854 Arguments:
1855 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001856 refresh: whether to attempt to refresh credentials. Ignored if not
1857 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001858 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001859 raise NotImplementedError()
1860
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001861 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001862 """Best effort check that uploading isn't supposed to fail for predictable
1863 reasons.
1864
1865 This method should raise informative exception if uploading shouldn't
1866 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001867
1868 Arguments:
1869 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001870 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001871 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001872
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001873 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001874 """Uploads a change to codereview."""
1875 raise NotImplementedError()
1876
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001877 def SetCQState(self, new_state):
1878 """Update the CQ state for latest patchset.
1879
1880 Issue must have been already uploaded and known.
1881 """
1882 raise NotImplementedError()
1883
tandriie113dfd2016-10-11 10:20:12 -07001884 def CannotTriggerTryJobReason(self):
1885 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1886 raise NotImplementedError()
1887
tandriide281ae2016-10-12 06:02:30 -07001888 def GetIssueOwner(self):
1889 raise NotImplementedError()
1890
tandrii8c5a3532016-11-04 07:52:02 -07001891 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001892 raise NotImplementedError()
1893
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001894
1895class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001896 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001897 super(_RietveldChangelistImpl, self).__init__(changelist)
1898 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001899 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001900 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001901
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001902 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001903 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001904 self._props = None
1905 self._rpc_server = None
1906
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001907 def GetCodereviewServer(self):
1908 if not self._rietveld_server:
1909 # If we're on a branch then get the server potentially associated
1910 # with that branch.
1911 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001912 self._rietveld_server = gclient_utils.UpgradeToHttps(
1913 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001914 if not self._rietveld_server:
1915 self._rietveld_server = settings.GetDefaultServerUrl()
1916 return self._rietveld_server
1917
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001918 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001919 """Best effort check that user is authenticated with Rietveld server."""
1920 if self._auth_config.use_oauth2:
1921 authenticator = auth.get_authenticator_for_host(
1922 self.GetCodereviewServer(), self._auth_config)
1923 if not authenticator.has_cached_credentials():
1924 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001925 if refresh:
1926 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001927
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001928 def EnsureCanUploadPatchset(self, force):
1929 # No checks for Rietveld because we are deprecating Rietveld.
1930 pass
1931
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001932 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001933 issue = self.GetIssue()
1934 assert issue
1935 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001936 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937 except urllib2.HTTPError as e:
1938 if e.code == 404:
1939 DieWithError(
1940 ('\nWhile fetching the description for issue %d, received a '
1941 '404 (not found)\n'
1942 'error. It is likely that you deleted this '
1943 'issue on the server. If this is the\n'
1944 'case, please run\n\n'
1945 ' git cl issue 0\n\n'
1946 'to clear the association with the deleted issue. Then run '
1947 'this command again.') % issue)
1948 else:
1949 DieWithError(
1950 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1951 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001952 print('Warning: Failed to retrieve CL description due to network '
1953 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001954 return ''
1955
1956 def GetMostRecentPatchset(self):
1957 return self.GetIssueProperties()['patchsets'][-1]
1958
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001959 def GetIssueProperties(self):
1960 if self._props is None:
1961 issue = self.GetIssue()
1962 if not issue:
1963 self._props = {}
1964 else:
1965 self._props = self.RpcServer().get_issue_properties(issue, True)
1966 return self._props
1967
tandriie113dfd2016-10-11 10:20:12 -07001968 def CannotTriggerTryJobReason(self):
1969 props = self.GetIssueProperties()
1970 if not props:
1971 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1972 if props.get('closed'):
1973 return 'CL %s is closed' % self.GetIssue()
1974 if props.get('private'):
1975 return 'CL %s is private' % self.GetIssue()
1976 return None
1977
tandrii8c5a3532016-11-04 07:52:02 -07001978 def GetTryjobProperties(self, patchset=None):
1979 """Returns dictionary of properties to launch tryjob."""
1980 project = (self.GetIssueProperties() or {}).get('project')
1981 return {
1982 'issue': self.GetIssue(),
1983 'patch_project': project,
1984 'patch_storage': 'rietveld',
1985 'patchset': patchset or self.GetPatchset(),
1986 'rietveld': self.GetCodereviewServer(),
1987 }
1988
tandriide281ae2016-10-12 06:02:30 -07001989 def GetIssueOwner(self):
1990 return (self.GetIssueProperties() or {}).get('owner_email')
1991
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001992 def AddComment(self, message):
1993 return self.RpcServer().add_comment(self.GetIssue(), message)
1994
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001995 def GetCommentsSummary(self):
1996 summary = []
1997 for message in self.GetIssueProperties().get('messages', []):
1998 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
1999 summary.append(_CommentSummary(
2000 date=date,
2001 disapproval=bool(message['disapproval']),
2002 approval=bool(message['approval']),
2003 sender=message['sender'],
2004 message=message['text'],
2005 ))
2006 return summary
2007
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002008 def GetStatus(self):
2009 """Apply a rough heuristic to give a simple summary of an issue's review
2010 or CQ status, assuming adherence to a common workflow.
2011
2012 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002013 * 'error' - error from review tool (including deleted issues)
2014 * 'unsent' - not sent for review
2015 * 'waiting' - waiting for review
2016 * 'reply' - waiting for owner to reply to review
2017 * 'not lgtm' - Code-Review label has been set negatively
2018 * 'lgtm' - LGTM from at least one approved reviewer
2019 * 'commit' - in the commit queue
2020 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002021 """
2022 if not self.GetIssue():
2023 return None
2024
2025 try:
2026 props = self.GetIssueProperties()
2027 except urllib2.HTTPError:
2028 return 'error'
2029
2030 if props.get('closed'):
2031 # Issue is closed.
2032 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002033 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002034 # Issue is in the commit queue.
2035 return 'commit'
2036
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002037 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002038 if not messages:
2039 # No message was sent.
2040 return 'unsent'
2041
2042 if get_approving_reviewers(props):
2043 return 'lgtm'
2044 elif get_approving_reviewers(props, disapproval=True):
2045 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002046
tandrii9d2c7a32016-06-22 03:42:45 -07002047 # Skip CQ messages that don't require owner's action.
2048 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2049 if 'Dry run:' in messages[-1]['text']:
2050 messages.pop()
2051 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2052 # This message always follows prior messages from CQ,
2053 # so skip this too.
2054 messages.pop()
2055 else:
2056 # This is probably a CQ messages warranting user attention.
2057 break
2058
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002059 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002060 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002061 return 'reply'
2062 return 'waiting'
2063
dsansomee2d6fd92016-09-08 00:10:47 -07002064 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002065 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002066
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002067 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002068 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002069
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002070 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002071 return self.SetFlags({flag: value})
2072
2073 def SetFlags(self, flags):
2074 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002075 """
phajdan.jr68598232016-08-10 03:28:28 -07002076 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002077 try:
tandrii4b233bd2016-07-06 03:50:29 -07002078 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002079 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002080 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002081 if e.code == 404:
2082 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2083 if e.code == 403:
2084 DieWithError(
2085 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002086 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002087 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002088
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002089 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002090 """Returns an upload.RpcServer() to access this review's rietveld instance.
2091 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002092 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002093 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002094 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002095 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002096 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002097
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002098 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002099 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002100 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002101
tandrii5d48c322016-08-18 16:19:37 -07002102 @classmethod
2103 def PatchsetConfigKey(cls):
2104 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002105
tandrii5d48c322016-08-18 16:19:37 -07002106 @classmethod
2107 def CodereviewServerConfigKey(cls):
2108 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002109
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002110 def GetRieveldObjForPresubmit(self):
2111 return self.RpcServer()
2112
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002113 def SetCQState(self, new_state):
2114 props = self.GetIssueProperties()
2115 if props.get('private'):
2116 DieWithError('Cannot set-commit on private issue')
2117
2118 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002119 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002120 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002121 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002122 else:
tandrii4b233bd2016-07-06 03:50:29 -07002123 assert new_state == _CQState.DRY_RUN
2124 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002125
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002126 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2127 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002128 # PatchIssue should never be called with a dirty tree. It is up to the
2129 # caller to check this, but just in case we assert here since the
2130 # consequences of the caller not checking this could be dire.
2131 assert(not git_common.is_dirty_git_tree('apply'))
2132 assert(parsed_issue_arg.valid)
2133 self._changelist.issue = parsed_issue_arg.issue
2134 if parsed_issue_arg.hostname:
2135 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2136
skobes6468b902016-10-24 08:45:10 -07002137 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2138 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2139 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002140 try:
skobes6468b902016-10-24 08:45:10 -07002141 scm_obj.apply_patch(patchset_object)
2142 except Exception as e:
2143 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002144 return 1
2145
2146 # If we had an issue, commit the current state and register the issue.
2147 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002148 self.SetIssue(self.GetIssue())
2149 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2151 'patch from issue %(i)s at patchset '
2152 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2153 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002154 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002156 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002157 return 0
2158
2159 @staticmethod
2160 def ParseIssueURL(parsed_url):
2161 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2162 return None
wychen3c1c1722016-08-04 11:46:36 -07002163 # Rietveld patch: https://domain/<number>/#ps<patchset>
2164 match = re.match(r'/(\d+)/$', parsed_url.path)
2165 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2166 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002167 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002168 issue=int(match.group(1)),
2169 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002170 hostname=parsed_url.netloc,
2171 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 # Typical url: https://domain/<issue_number>[/[other]]
2173 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2174 if match:
skobes6468b902016-10-24 08:45:10 -07002175 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002177 hostname=parsed_url.netloc,
2178 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002179 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2180 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2181 if match:
skobes6468b902016-10-24 08:45:10 -07002182 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002183 issue=int(match.group(1)),
2184 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002185 hostname=parsed_url.netloc,
2186 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 return None
2188
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002189 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002190 """Upload the patch to Rietveld."""
2191 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2192 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002193 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2194 if options.emulate_svn_auto_props:
2195 upload_args.append('--emulate_svn_auto_props')
2196
2197 change_desc = None
2198
2199 if options.email is not None:
2200 upload_args.extend(['--email', options.email])
2201
2202 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002203 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 upload_args.extend(['--title', options.title])
2205 if options.message:
2206 upload_args.extend(['--message', options.message])
2207 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002208 print('This branch is associated with issue %s. '
2209 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002210 else:
nodirca166002016-06-27 10:59:51 -07002211 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002212 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002213 if options.message:
2214 message = options.message
2215 else:
2216 message = CreateDescriptionFromLog(args)
2217 if options.title:
2218 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002219 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002220 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002221 change_desc.update_reviewers(options.reviewers, options.tbrs,
2222 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002223 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002224 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225
2226 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002227 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228 return 1
2229
2230 upload_args.extend(['--message', change_desc.description])
2231 if change_desc.get_reviewers():
2232 upload_args.append('--reviewers=%s' % ','.join(
2233 change_desc.get_reviewers()))
2234 if options.send_mail:
2235 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002236 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 upload_args.append('--send_mail')
2238
2239 # We check this before applying rietveld.private assuming that in
2240 # rietveld.cc only addresses which we can send private CLs to are listed
2241 # if rietveld.private is set, and so we should ignore rietveld.cc only
2242 # when --private is specified explicitly on the command line.
2243 if options.private:
2244 logging.warn('rietveld.cc is ignored since private flag is specified. '
2245 'You need to review and add them manually if necessary.')
2246 cc = self.GetCCListWithoutDefault()
2247 else:
2248 cc = self.GetCCList()
2249 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002250 if change_desc.get_cced():
2251 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002252 if cc:
2253 upload_args.extend(['--cc', cc])
2254
2255 if options.private or settings.GetDefaultPrivateFlag() == "True":
2256 upload_args.append('--private')
2257
2258 upload_args.extend(['--git_similarity', str(options.similarity)])
2259 if not options.find_copies:
2260 upload_args.extend(['--git_no_find_copies'])
2261
2262 # Include the upstream repo's URL in the change -- this is useful for
2263 # projects that have their source spread across multiple repos.
2264 remote_url = self.GetGitBaseUrlFromConfig()
2265 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002266 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2267 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2268 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002269 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002270 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002271 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002272 if target_ref:
2273 upload_args.extend(['--target_ref', target_ref])
2274
2275 # Look for dependent patchsets. See crbug.com/480453 for more details.
2276 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2277 upstream_branch = ShortBranchName(upstream_branch)
2278 if remote is '.':
2279 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002280 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002281 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002282 print()
2283 print('Skipping dependency patchset upload because git config '
2284 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2285 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 else:
2287 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002288 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 auth_config=auth_config)
2290 branch_cl_issue_url = branch_cl.GetIssueURL()
2291 branch_cl_issue = branch_cl.GetIssue()
2292 branch_cl_patchset = branch_cl.GetPatchset()
2293 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2294 upload_args.extend(
2295 ['--depends_on_patchset', '%s:%s' % (
2296 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002297 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002298 '\n'
2299 'The current branch (%s) is tracking a local branch (%s) with '
2300 'an associated CL.\n'
2301 'Adding %s/#ps%s as a dependency patchset.\n'
2302 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2303 branch_cl_patchset))
2304
2305 project = settings.GetProject()
2306 if project:
2307 upload_args.extend(['--project', project])
2308
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002309 try:
2310 upload_args = ['upload'] + upload_args + args
2311 logging.info('upload.RealMain(%s)', upload_args)
2312 issue, patchset = upload.RealMain(upload_args)
2313 issue = int(issue)
2314 patchset = int(patchset)
2315 except KeyboardInterrupt:
2316 sys.exit(1)
2317 except:
2318 # If we got an exception after the user typed a description for their
2319 # change, back up the description before re-raising.
2320 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002321 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002322 raise
2323
2324 if not self.GetIssue():
2325 self.SetIssue(issue)
2326 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002327 return 0
2328
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002329
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002330class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002331 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002332 # auth_config is Rietveld thing, kept here to preserve interface only.
2333 super(_GerritChangelistImpl, self).__init__(changelist)
2334 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002335 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002336 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002337 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002338 # Map from change number (issue) to its detail cache.
2339 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002340
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002341 if codereview_host is not None:
2342 assert not codereview_host.startswith('https://'), codereview_host
2343 self._gerrit_host = codereview_host
2344 self._gerrit_server = 'https://%s' % codereview_host
2345
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002346 def _GetGerritHost(self):
2347 # Lazy load of configs.
2348 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002349 if self._gerrit_host and '.' not in self._gerrit_host:
2350 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2351 # This happens for internal stuff http://crbug.com/614312.
2352 parsed = urlparse.urlparse(self.GetRemoteUrl())
2353 if parsed.scheme == 'sso':
2354 print('WARNING: using non https URLs for remote is likely broken\n'
2355 ' Your current remote is: %s' % self.GetRemoteUrl())
2356 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2357 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002358 return self._gerrit_host
2359
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002360 def _GetGitHost(self):
2361 """Returns git host to be used when uploading change to Gerrit."""
2362 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2363
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002364 def GetCodereviewServer(self):
2365 if not self._gerrit_server:
2366 # If we're on a branch then get the server potentially associated
2367 # with that branch.
2368 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002369 self._gerrit_server = self._GitGetBranchConfigValue(
2370 self.CodereviewServerConfigKey())
2371 if self._gerrit_server:
2372 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002373 if not self._gerrit_server:
2374 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2375 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002376 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002377 parts[0] = parts[0] + '-review'
2378 self._gerrit_host = '.'.join(parts)
2379 self._gerrit_server = 'https://%s' % self._gerrit_host
2380 return self._gerrit_server
2381
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002382 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002383 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002384 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002385
tandrii5d48c322016-08-18 16:19:37 -07002386 @classmethod
2387 def PatchsetConfigKey(cls):
2388 return 'gerritpatchset'
2389
2390 @classmethod
2391 def CodereviewServerConfigKey(cls):
2392 return 'gerritserver'
2393
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002394 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002395 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002396 if settings.GetGerritSkipEnsureAuthenticated():
2397 # For projects with unusual authentication schemes.
2398 # See http://crbug.com/603378.
2399 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002400 # Lazy-loader to identify Gerrit and Git hosts.
2401 if gerrit_util.GceAuthenticator.is_gce():
2402 return
2403 self.GetCodereviewServer()
2404 git_host = self._GetGitHost()
2405 assert self._gerrit_server and self._gerrit_host
2406 cookie_auth = gerrit_util.CookiesAuthenticator()
2407
2408 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2409 git_auth = cookie_auth.get_auth_header(git_host)
2410 if gerrit_auth and git_auth:
2411 if gerrit_auth == git_auth:
2412 return
2413 print((
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002414 'WARNING: you have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002415 ' %s\n'
2416 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002417 ' Consider running the following command:\n'
2418 ' git cl creds-check\n'
2419 ' New credentials can be obtained by visiting %s') %
2420 (git_host, self._gerrit_host,
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002421 cookie_auth.get_new_password_message(git_host)))
2422 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002423 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002424 return
2425 else:
2426 missing = (
2427 [] if gerrit_auth else [self._gerrit_host] +
2428 [] if git_auth else [git_host])
2429 DieWithError('Credentials for the following hosts are required:\n'
2430 ' %s\n'
2431 'These are read from %s (or legacy %s)\n'
2432 '%s' % (
2433 '\n '.join(missing),
2434 cookie_auth.get_gitcookies_path(),
2435 cookie_auth.get_netrc_path(),
2436 cookie_auth.get_new_password_message(git_host)))
2437
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002438 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002439 if not self.GetIssue():
2440 return
2441
2442 # Warm change details cache now to avoid RPCs later, reducing latency for
2443 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002444 self._GetChangeDetail(
2445 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002446
2447 status = self._GetChangeDetail()['status']
2448 if status in ('MERGED', 'ABANDONED'):
2449 DieWithError('Change %s has been %s, new uploads are not allowed' %
2450 (self.GetIssueURL(),
2451 'submitted' if status == 'MERGED' else 'abandoned'))
2452
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002453 if gerrit_util.GceAuthenticator.is_gce():
2454 return
2455 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2456 self._GetGerritHost())
2457 if self.GetIssueOwner() == cookies_user:
2458 return
2459 logging.debug('change %s owner is %s, cookies user is %s',
2460 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2461 # Maybe user has linked accounts or smth like that,
2462 # so ask what Gerrit thinks of this user.
2463 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2464 if details['email'] == self.GetIssueOwner():
2465 return
2466 if not force:
2467 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2468 'as %s.\n'
2469 'Uploading may fail due to lack of permissions.' %
2470 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2471 confirm_or_exit(action='upload')
2472
2473
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002474 def _PostUnsetIssueProperties(self):
2475 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002476 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002477
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002478 def GetRieveldObjForPresubmit(self):
2479 class ThisIsNotRietveldIssue(object):
2480 def __nonzero__(self):
2481 # This is a hack to make presubmit_support think that rietveld is not
2482 # defined, yet still ensure that calls directly result in a decent
2483 # exception message below.
2484 return False
2485
2486 def __getattr__(self, attr):
2487 print(
2488 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2489 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2490 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2491 'or use Rietveld for codereview.\n'
2492 'See also http://crbug.com/579160.' % attr)
2493 raise NotImplementedError()
2494 return ThisIsNotRietveldIssue()
2495
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002496 def GetGerritObjForPresubmit(self):
2497 return presubmit_support.GerritAccessor(self._GetGerritHost())
2498
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002499 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002500 """Apply a rough heuristic to give a simple summary of an issue's review
2501 or CQ status, assuming adherence to a common workflow.
2502
2503 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002504 * 'error' - error from review tool (including deleted issues)
2505 * 'unsent' - no reviewers added
2506 * 'waiting' - waiting for review
2507 * 'reply' - waiting for uploader to reply to review
2508 * 'lgtm' - Code-Review label has been set
2509 * 'commit' - in the commit queue
2510 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002511 """
2512 if not self.GetIssue():
2513 return None
2514
2515 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002516 data = self._GetChangeDetail([
2517 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002518 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002519 return 'error'
2520
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002521 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002522 return 'closed'
2523
Aaron Gable9ab38c62017-04-06 14:36:33 -07002524 if data['labels'].get('Commit-Queue', {}).get('approved'):
2525 # The section will have an "approved" subsection if anyone has voted
2526 # the maximum value on the label.
2527 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002528
Aaron Gable9ab38c62017-04-06 14:36:33 -07002529 if data['labels'].get('Code-Review', {}).get('approved'):
2530 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531
2532 if not data.get('reviewers', {}).get('REVIEWER', []):
2533 return 'unsent'
2534
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002535 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002536 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2537 last_message_author = messages.pop().get('author', {})
2538 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002539 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2540 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002541 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002542 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002543 if last_message_author.get('_account_id') == owner:
2544 # Most recent message was by owner.
2545 return 'waiting'
2546 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002547 # Some reply from non-owner.
2548 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002549
2550 # Somehow there are no messages even though there are reviewers.
2551 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002552
2553 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002555 return data['revisions'][data['current_revision']]['_number']
2556
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002557 def FetchDescription(self, force=False):
2558 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2559 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002560 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002561 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002562
dsansomee2d6fd92016-09-08 00:10:47 -07002563 def UpdateDescriptionRemote(self, description, force=False):
2564 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2565 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002566 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002567 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002568 'unpublished edit. Either publish the edit in the Gerrit web UI '
2569 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002570
2571 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2572 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002573 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002574 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002575
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002576 def AddComment(self, message):
2577 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2578 msg=message)
2579
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002580 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002581 # DETAILED_ACCOUNTS is to get emails in accounts.
2582 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2583 summary = []
2584 for msg in data.get('messages', []):
2585 # Gerrit spits out nanoseconds.
2586 assert len(msg['date'].split('.')[-1]) == 9
2587 date = datetime.datetime.strptime(msg['date'][:-3],
2588 '%Y-%m-%d %H:%M:%S.%f')
2589 summary.append(_CommentSummary(
2590 date=date,
2591 message=msg['message'],
2592 sender=msg['author']['email'],
2593 # These could be inferred from the text messages and correlated with
2594 # Code-Review label maximum, however this is not reliable.
2595 # Leaving as is until the need arises.
2596 approval=False,
2597 disapproval=False,
2598 ))
2599 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002600
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002601 def CloseIssue(self):
2602 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2603
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002604 def SubmitIssue(self, wait_for_merge=True):
2605 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2606 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002607
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002608 def _GetChangeDetail(self, options=None, issue=None,
2609 no_cache=False):
2610 """Returns details of the issue by querying Gerrit and caching results.
2611
2612 If fresh data is needed, set no_cache=True which will clear cache and
2613 thus new data will be fetched from Gerrit.
2614 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002615 options = options or []
2616 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002617 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002618
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002619 # Optimization to avoid multiple RPCs:
2620 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2621 'CURRENT_COMMIT' not in options):
2622 options.append('CURRENT_COMMIT')
2623
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002624 # Normalize issue and options for consistent keys in cache.
2625 issue = str(issue)
2626 options = [o.upper() for o in options]
2627
2628 # Check in cache first unless no_cache is True.
2629 if no_cache:
2630 self._detail_cache.pop(issue, None)
2631 else:
2632 options_set = frozenset(options)
2633 for cached_options_set, data in self._detail_cache.get(issue, []):
2634 # Assumption: data fetched before with extra options is suitable
2635 # for return for a smaller set of options.
2636 # For example, if we cached data for
2637 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2638 # and request is for options=[CURRENT_REVISION],
2639 # THEN we can return prior cached data.
2640 if options_set.issubset(cached_options_set):
2641 return data
2642
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002643 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002644 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002645 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002646 except gerrit_util.GerritError as e:
2647 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002648 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002649 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002650
2651 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002652 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002653
agable32978d92016-11-01 12:55:02 -07002654 def _GetChangeCommit(self, issue=None):
2655 issue = issue or self.GetIssue()
2656 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002657 try:
2658 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2659 except gerrit_util.GerritError as e:
2660 if e.http_status == 404:
2661 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2662 raise
agable32978d92016-11-01 12:55:02 -07002663 return data
2664
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002665 def CMDLand(self, force, bypass_hooks, verbose):
2666 if git_common.is_dirty_git_tree('land'):
2667 return 1
tandriid60367b2016-06-22 05:25:12 -07002668 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2669 if u'Commit-Queue' in detail.get('labels', {}):
2670 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002671 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2672 'which can test and land changes for you. '
2673 'Are you sure you wish to bypass it?\n',
2674 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002675
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002676 differs = True
tandriic4344b52016-08-29 06:04:54 -07002677 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002678 # Note: git diff outputs nothing if there is no diff.
2679 if not last_upload or RunGit(['diff', last_upload]).strip():
2680 print('WARNING: some changes from local branch haven\'t been uploaded')
2681 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002682 if detail['current_revision'] == last_upload:
2683 differs = False
2684 else:
2685 print('WARNING: local branch contents differ from latest uploaded '
2686 'patchset')
2687 if differs:
2688 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002689 confirm_or_exit(
2690 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2691 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002692 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2693 elif not bypass_hooks:
2694 hook_results = self.RunHook(
2695 committing=True,
2696 may_prompt=not force,
2697 verbose=verbose,
2698 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2699 if not hook_results.should_continue():
2700 return 1
2701
2702 self.SubmitIssue(wait_for_merge=True)
2703 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002704 links = self._GetChangeCommit().get('web_links', [])
2705 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002706 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002707 print('Landed as %s' % link.get('url'))
2708 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002709 return 0
2710
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002711 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2712 directory):
2713 assert not reject
2714 assert not nocommit
2715 assert not directory
2716 assert parsed_issue_arg.valid
2717
2718 self._changelist.issue = parsed_issue_arg.issue
2719
2720 if parsed_issue_arg.hostname:
2721 self._gerrit_host = parsed_issue_arg.hostname
2722 self._gerrit_server = 'https://%s' % self._gerrit_host
2723
tandriic2405f52016-10-10 08:13:15 -07002724 try:
2725 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002726 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002727 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002728
2729 if not parsed_issue_arg.patchset:
2730 # Use current revision by default.
2731 revision_info = detail['revisions'][detail['current_revision']]
2732 patchset = int(revision_info['_number'])
2733 else:
2734 patchset = parsed_issue_arg.patchset
2735 for revision_info in detail['revisions'].itervalues():
2736 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2737 break
2738 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002739 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002740 (parsed_issue_arg.patchset, self.GetIssue()))
2741
2742 fetch_info = revision_info['fetch']['http']
2743 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002744 self.SetIssue(self.GetIssue())
2745 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002746 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002747 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002748 (self.GetIssue(), self.GetPatchset()))
2749 return 0
2750
2751 @staticmethod
2752 def ParseIssueURL(parsed_url):
2753 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2754 return None
2755 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2756 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2757 # Short urls like https://domain/<issue_number> can be used, but don't allow
2758 # specifying the patchset (you'd 404), but we allow that here.
2759 if parsed_url.path == '/':
2760 part = parsed_url.fragment
2761 else:
2762 part = parsed_url.path
2763 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2764 if match:
2765 return _ParsedIssueNumberArgument(
2766 issue=int(match.group(2)),
2767 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002768 hostname=parsed_url.netloc,
2769 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002770 return None
2771
tandrii16e0b4e2016-06-07 10:34:28 -07002772 def _GerritCommitMsgHookCheck(self, offer_removal):
2773 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2774 if not os.path.exists(hook):
2775 return
2776 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2777 # custom developer made one.
2778 data = gclient_utils.FileRead(hook)
2779 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2780 return
2781 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002782 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002783 'and may interfere with it in subtle ways.\n'
2784 'We recommend you remove the commit-msg hook.')
2785 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002786 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002787 gclient_utils.rm_file_or_tree(hook)
2788 print('Gerrit commit-msg hook removed.')
2789 else:
2790 print('OK, will keep Gerrit commit-msg hook in place.')
2791
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002792 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002793 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002794 if options.squash and options.no_squash:
2795 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002796
2797 if not options.squash and not options.no_squash:
2798 # Load default for user, repo, squash=true, in this order.
2799 options.squash = settings.GetSquashGerritUploads()
2800 elif options.no_squash:
2801 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002802
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002803 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002804 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002805
Aaron Gableb56ad332017-01-06 15:24:31 -08002806 # This may be None; default fallback value is determined in logic below.
2807 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002808 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002809
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002810 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002811 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002812 if self.GetIssue():
2813 # Try to get the message from a previous upload.
2814 message = self.GetDescription()
2815 if not message:
2816 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002817 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002818 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002819 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002820 if options.message:
2821 # For compatibility with Rietveld, if -m|--message is given on
2822 # command line, title should be the first line of that message,
2823 # which shouldn't be confused with CL description.
2824 default_title = options.message.strip().split()[0]
2825 else:
2826 default_title = RunGit(
2827 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002828 if options.force:
2829 title = default_title
2830 else:
2831 title = ask_for_data(
2832 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002833 if title == default_title:
2834 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002835 change_id = self._GetChangeDetail()['change_id']
2836 while True:
2837 footer_change_ids = git_footers.get_footer_change_id(message)
2838 if footer_change_ids == [change_id]:
2839 break
2840 if not footer_change_ids:
2841 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002842 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002843 continue
2844 # There is already a valid footer but with different or several ids.
2845 # Doing this automatically is non-trivial as we don't want to lose
2846 # existing other footers, yet we want to append just 1 desired
2847 # Change-Id. Thus, just create a new footer, but let user verify the
2848 # new description.
2849 message = '%s\n\nChange-Id: %s' % (message, change_id)
2850 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002851 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002852 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002853 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002854 'Please, check the proposed correction to the description, '
2855 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2856 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2857 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002858 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002859 if not options.force:
2860 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002861 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002862 message = change_desc.description
2863 if not message:
2864 DieWithError("Description is empty. Aborting...")
2865 # Continue the while loop.
2866 # Sanity check of this code - we should end up with proper message
2867 # footer.
2868 assert [change_id] == git_footers.get_footer_change_id(message)
2869 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002870 else: # if not self.GetIssue()
2871 if options.message:
2872 message = options.message
2873 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002874 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002875 if options.title:
2876 message = options.title + '\n\n' + message
2877 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002878
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002879 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002880 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002881 # On first upload, patchset title is always this string, while
2882 # --title flag gets converted to first line of message.
2883 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002884 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002885 if not change_desc.description:
2886 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002887 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888 if len(change_ids) > 1:
2889 DieWithError('too many Change-Id footers, at most 1 allowed.')
2890 if not change_ids:
2891 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002892 change_desc.set_description(git_footers.add_footer_change_id(
2893 change_desc.description,
2894 GenerateGerritChangeId(change_desc.description)))
2895 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002896 assert len(change_ids) == 1
2897 change_id = change_ids[0]
2898
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002899 if options.reviewers or options.tbrs or options.add_owners_to:
2900 change_desc.update_reviewers(options.reviewers, options.tbrs,
2901 options.add_owners_to, change)
2902
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002903 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002904 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2905 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002906 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2907 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002908 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002909 else:
2910 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002911 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002912 if not change_desc.description:
2913 DieWithError("Description is empty. Aborting...")
2914
2915 if not git_footers.get_footer_change_id(change_desc.description):
2916 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002917 change_desc.set_description(
2918 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002919 if options.reviewers or options.tbrs or options.add_owners_to:
2920 change_desc.update_reviewers(options.reviewers, options.tbrs,
2921 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002922 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002923 # For no-squash mode, we assume the remote called "origin" is the one we
2924 # want. It is not worthwhile to support different workflows for
2925 # no-squash mode.
2926 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002927 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2928
2929 assert change_desc
2930 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2931 ref_to_push)]).splitlines()
2932 if len(commits) > 1:
2933 print('WARNING: This will upload %d commits. Run the following command '
2934 'to see which commits will be uploaded: ' % len(commits))
2935 print('git log %s..%s' % (parent, ref_to_push))
2936 print('You can also use `git squash-branch` to squash these into a '
2937 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002938 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002939
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002940 if options.reviewers or options.tbrs or options.add_owners_to:
2941 change_desc.update_reviewers(options.reviewers, options.tbrs,
2942 options.add_owners_to, change)
2943
2944 if options.send_mail:
2945 if not change_desc.get_reviewers():
2946 DieWithError('Must specify reviewers to send email.', change_desc)
2947
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002948 # Extra options that can be specified at push time. Doc:
2949 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002950 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002951 if change_desc.get_reviewers(tbr_only=True):
2952 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002953 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002954
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002955
2956 # TODO(tandrii): options.message should be posted as a comment
2957 # if --send-email is set on non-initial upload as Rietveld used to do it.
2958
Aaron Gable9b713dd2016-12-14 16:04:21 -08002959 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002960 if not re.match(r'^[\w ]+$', title):
2961 title = re.sub(r'[^\w ]', '', title)
2962 if not automatic_title:
2963 print('WARNING: Patchset title may only contain alphanumeric chars '
2964 'and spaces. You can edit it in the UI. '
2965 'See https://crbug.com/663787.\n'
2966 'Cleaned up title: %s' % title)
2967 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2968 # reverse on its side.
2969 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002970
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002971 # Never notify now because no one is on the review. Notify when we add
2972 # reviewers and CCs below.
2973 refspec_opts.append('notify=NONE')
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002974
agablec6787972016-09-09 16:13:34 -07002975 if options.private:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002976 refspec_opts.append('draft')
agablec6787972016-09-09 16:13:34 -07002977
rmistry9eadede2016-09-19 11:22:43 -07002978 if options.topic:
2979 # Documentation on Gerrit topics is here:
2980 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002981 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002982
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002983 refspec_suffix = ''
2984 if refspec_opts:
2985 refspec_suffix = '%' + ','.join(refspec_opts)
2986 assert ' ' not in refspec_suffix, (
2987 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2988 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2989
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002990 try:
2991 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002992 ['git', 'push', self.GetRemoteUrl(), refspec],
2993 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002994 # Flush after every line: useful for seeing progress when running as
2995 # recipe.
2996 filter_fn=lambda _: sys.stdout.flush())
2997 except subprocess2.CalledProcessError:
2998 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02002999 'for the reason of the failure.\n'
3000 'Hint: run command below to diangose common Git/Gerrit '
3001 'credential problems:\n'
3002 ' git cl creds-check\n',
3003 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003004
3005 if options.squash:
3006 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3007 change_numbers = [m.group(1)
3008 for m in map(regex.match, push_stdout.splitlines())
3009 if m]
3010 if len(change_numbers) != 1:
3011 DieWithError(
3012 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003013 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003014 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003015 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003016
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003017 reviewers = sorted(change_desc.get_reviewers())
3018
tandrii88189772016-09-29 04:29:57 -07003019 # Add cc's from the CC_LIST and --cc flag (if any).
3020 cc = self.GetCCList().split(',')
3021 if options.cc:
3022 cc.extend(options.cc)
3023 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003024 if change_desc.get_cced():
3025 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003026
3027 gerrit_util.AddReviewers(
3028 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3029 notify=bool(options.send_mail))
3030
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003031 return 0
3032
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003033 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3034 change_desc):
3035 """Computes parent of the generated commit to be uploaded to Gerrit.
3036
3037 Returns revision or a ref name.
3038 """
3039 if custom_cl_base:
3040 # Try to avoid creating additional unintended CLs when uploading, unless
3041 # user wants to take this risk.
3042 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3043 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3044 local_ref_of_target_remote])
3045 if code == 1:
3046 print('\nWARNING: manually specified base of this CL `%s` '
3047 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3048 'If you proceed with upload, more than 1 CL may be created by '
3049 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3050 'If you are certain that specified base `%s` has already been '
3051 'uploaded to Gerrit as another CL, you may proceed.\n' %
3052 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3053 if not force:
3054 confirm_or_exit(
3055 'Do you take responsibility for cleaning up potential mess '
3056 'resulting from proceeding with upload?',
3057 action='upload')
3058 return custom_cl_base
3059
Aaron Gablef97e33d2017-03-30 15:44:27 -07003060 if remote != '.':
3061 return self.GetCommonAncestorWithUpstream()
3062
3063 # If our upstream branch is local, we base our squashed commit on its
3064 # squashed version.
3065 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3066
Aaron Gablef97e33d2017-03-30 15:44:27 -07003067 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003068 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003069
3070 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003071 # TODO(tandrii): consider checking parent change in Gerrit and using its
3072 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3073 # the tree hash of the parent branch. The upside is less likely bogus
3074 # requests to reupload parent change just because it's uploadhash is
3075 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003076 parent = RunGit(['config',
3077 'branch.%s.gerritsquashhash' % upstream_branch_name],
3078 error_ok=True).strip()
3079 # Verify that the upstream branch has been uploaded too, otherwise
3080 # Gerrit will create additional CLs when uploading.
3081 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3082 RunGitSilent(['rev-parse', parent + ':'])):
3083 DieWithError(
3084 '\nUpload upstream branch %s first.\n'
3085 'It is likely that this branch has been rebased since its last '
3086 'upload, so you just need to upload it again.\n'
3087 '(If you uploaded it with --no-squash, then branch dependencies '
3088 'are not supported, and you should reupload with --squash.)'
3089 % upstream_branch_name,
3090 change_desc)
3091 return parent
3092
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003093 def _AddChangeIdToCommitMessage(self, options, args):
3094 """Re-commits using the current message, assumes the commit hook is in
3095 place.
3096 """
3097 log_desc = options.message or CreateDescriptionFromLog(args)
3098 git_command = ['commit', '--amend', '-m', log_desc]
3099 RunGit(git_command)
3100 new_log_desc = CreateDescriptionFromLog(args)
3101 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003102 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003103 return new_log_desc
3104 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003105 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003106
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003107 def SetCQState(self, new_state):
3108 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003109 vote_map = {
3110 _CQState.NONE: 0,
3111 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003112 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003113 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003114 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3115 if new_state == _CQState.DRY_RUN:
3116 # Don't spam everybody reviewer/owner.
3117 kwargs['notify'] = 'NONE'
3118 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003119
tandriie113dfd2016-10-11 10:20:12 -07003120 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003121 try:
3122 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003123 except GerritChangeNotExists:
3124 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003125
3126 if data['status'] in ('ABANDONED', 'MERGED'):
3127 return 'CL %s is closed' % self.GetIssue()
3128
3129 def GetTryjobProperties(self, patchset=None):
3130 """Returns dictionary of properties to launch tryjob."""
3131 data = self._GetChangeDetail(['ALL_REVISIONS'])
3132 patchset = int(patchset or self.GetPatchset())
3133 assert patchset
3134 revision_data = None # Pylint wants it to be defined.
3135 for revision_data in data['revisions'].itervalues():
3136 if int(revision_data['_number']) == patchset:
3137 break
3138 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003139 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003140 (patchset, self.GetIssue()))
3141 return {
3142 'patch_issue': self.GetIssue(),
3143 'patch_set': patchset or self.GetPatchset(),
3144 'patch_project': data['project'],
3145 'patch_storage': 'gerrit',
3146 'patch_ref': revision_data['fetch']['http']['ref'],
3147 'patch_repository_url': revision_data['fetch']['http']['url'],
3148 'patch_gerrit_url': self.GetCodereviewServer(),
3149 }
tandriie113dfd2016-10-11 10:20:12 -07003150
tandriide281ae2016-10-12 06:02:30 -07003151 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003152 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003153
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003154
3155_CODEREVIEW_IMPLEMENTATIONS = {
3156 'rietveld': _RietveldChangelistImpl,
3157 'gerrit': _GerritChangelistImpl,
3158}
3159
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003160
iannuccie53c9352016-08-17 14:40:40 -07003161def _add_codereview_issue_select_options(parser, extra=""):
3162 _add_codereview_select_options(parser)
3163
3164 text = ('Operate on this issue number instead of the current branch\'s '
3165 'implicit issue.')
3166 if extra:
3167 text += ' '+extra
3168 parser.add_option('-i', '--issue', type=int, help=text)
3169
3170
3171def _process_codereview_issue_select_options(parser, options):
3172 _process_codereview_select_options(parser, options)
3173 if options.issue is not None and not options.forced_codereview:
3174 parser.error('--issue must be specified with either --rietveld or --gerrit')
3175
3176
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003177def _add_codereview_select_options(parser):
3178 """Appends --gerrit and --rietveld options to force specific codereview."""
3179 parser.codereview_group = optparse.OptionGroup(
3180 parser, 'EXPERIMENTAL! Codereview override options')
3181 parser.add_option_group(parser.codereview_group)
3182 parser.codereview_group.add_option(
3183 '--gerrit', action='store_true',
3184 help='Force the use of Gerrit for codereview')
3185 parser.codereview_group.add_option(
3186 '--rietveld', action='store_true',
3187 help='Force the use of Rietveld for codereview')
3188
3189
3190def _process_codereview_select_options(parser, options):
3191 if options.gerrit and options.rietveld:
3192 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3193 options.forced_codereview = None
3194 if options.gerrit:
3195 options.forced_codereview = 'gerrit'
3196 elif options.rietveld:
3197 options.forced_codereview = 'rietveld'
3198
3199
tandriif9aefb72016-07-01 09:06:51 -07003200def _get_bug_line_values(default_project, bugs):
3201 """Given default_project and comma separated list of bugs, yields bug line
3202 values.
3203
3204 Each bug can be either:
3205 * a number, which is combined with default_project
3206 * string, which is left as is.
3207
3208 This function may produce more than one line, because bugdroid expects one
3209 project per line.
3210
3211 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3212 ['v8:123', 'chromium:789']
3213 """
3214 default_bugs = []
3215 others = []
3216 for bug in bugs.split(','):
3217 bug = bug.strip()
3218 if bug:
3219 try:
3220 default_bugs.append(int(bug))
3221 except ValueError:
3222 others.append(bug)
3223
3224 if default_bugs:
3225 default_bugs = ','.join(map(str, default_bugs))
3226 if default_project:
3227 yield '%s:%s' % (default_project, default_bugs)
3228 else:
3229 yield default_bugs
3230 for other in sorted(others):
3231 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3232 yield other
3233
3234
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003235class ChangeDescription(object):
3236 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003237 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003238 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003239 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003240 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003241
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003242 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003243 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003244
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003246 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003247 return '\n'.join(self._description_lines)
3248
3249 def set_description(self, desc):
3250 if isinstance(desc, basestring):
3251 lines = desc.splitlines()
3252 else:
3253 lines = [line.rstrip() for line in desc]
3254 while lines and not lines[0]:
3255 lines.pop(0)
3256 while lines and not lines[-1]:
3257 lines.pop(-1)
3258 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003259
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003260 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3261 """Rewrites the R=/TBR= line(s) as a single line each.
3262
3263 Args:
3264 reviewers (list(str)) - list of additional emails to use for reviewers.
3265 tbrs (list(str)) - list of additional emails to use for TBRs.
3266 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3267 the change that are missing OWNER coverage. If this is not None, you
3268 must also pass a value for `change`.
3269 change (Change) - The Change that should be used for OWNERS lookups.
3270 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003271 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003272 assert isinstance(tbrs, list), tbrs
3273
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003274 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003275 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003276
3277 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003278 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003279
3280 reviewers = set(reviewers)
3281 tbrs = set(tbrs)
3282 LOOKUP = {
3283 'TBR': tbrs,
3284 'R': reviewers,
3285 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003286
agable@chromium.org42c20792013-09-12 17:34:49 +00003287 # Get the set of R= and TBR= lines and remove them from the desciption.
3288 regexp = re.compile(self.R_LINE)
3289 matches = [regexp.match(line) for line in self._description_lines]
3290 new_desc = [l for i, l in enumerate(self._description_lines)
3291 if not matches[i]]
3292 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003293
agable@chromium.org42c20792013-09-12 17:34:49 +00003294 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003295
3296 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003297 for match in matches:
3298 if not match:
3299 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003300 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3301
3302 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003303 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003304 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003305 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003306 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003307 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003308 LOOKUP[add_owners_to].update(
3309 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003310
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003311 # If any folks ended up in both groups, remove them from tbrs.
3312 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003313
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003314 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3315 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003316
3317 # Put the new lines in the description where the old first R= line was.
3318 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3319 if 0 <= line_loc < len(self._description_lines):
3320 if new_tbr_line:
3321 self._description_lines.insert(line_loc, new_tbr_line)
3322 if new_r_line:
3323 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003324 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003325 if new_r_line:
3326 self.append_footer(new_r_line)
3327 if new_tbr_line:
3328 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003329
Aaron Gable3a16ed12017-03-23 10:51:55 -07003330 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003331 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003332 self.set_description([
3333 '# Enter a description of the change.',
3334 '# This will be displayed on the codereview site.',
3335 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003336 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003337 '--------------------',
3338 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003339
agable@chromium.org42c20792013-09-12 17:34:49 +00003340 regexp = re.compile(self.BUG_LINE)
3341 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003342 prefix = settings.GetBugPrefix()
3343 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003344 if git_footer:
3345 self.append_footer('Bug: %s' % ', '.join(values))
3346 else:
3347 for value in values:
3348 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003349
agable@chromium.org42c20792013-09-12 17:34:49 +00003350 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003351 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003352 if not content:
3353 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003354 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003355
3356 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003357 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3358 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003359 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003360 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003361
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003362 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003363 """Adds a footer line to the description.
3364
3365 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3366 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3367 that Gerrit footers are always at the end.
3368 """
3369 parsed_footer_line = git_footers.parse_footer(line)
3370 if parsed_footer_line:
3371 # Line is a gerrit footer in the form: Footer-Key: any value.
3372 # Thus, must be appended observing Gerrit footer rules.
3373 self.set_description(
3374 git_footers.add_footer(self.description,
3375 key=parsed_footer_line[0],
3376 value=parsed_footer_line[1]))
3377 return
3378
3379 if not self._description_lines:
3380 self._description_lines.append(line)
3381 return
3382
3383 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3384 if gerrit_footers:
3385 # git_footers.split_footers ensures that there is an empty line before
3386 # actual (gerrit) footers, if any. We have to keep it that way.
3387 assert top_lines and top_lines[-1] == ''
3388 top_lines, separator = top_lines[:-1], top_lines[-1:]
3389 else:
3390 separator = [] # No need for separator if there are no gerrit_footers.
3391
3392 prev_line = top_lines[-1] if top_lines else ''
3393 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3394 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3395 top_lines.append('')
3396 top_lines.append(line)
3397 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003398
tandrii99a72f22016-08-17 14:33:24 -07003399 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003400 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003401 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003402 reviewers = [match.group(2).strip()
3403 for match in matches
3404 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003405 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003406
bradnelsond975b302016-10-23 12:20:23 -07003407 def get_cced(self):
3408 """Retrieves the list of reviewers."""
3409 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3410 cced = [match.group(2).strip() for match in matches if match]
3411 return cleanup_list(cced)
3412
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003413 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3414 """Updates this commit description given the parent.
3415
3416 This is essentially what Gnumbd used to do.
3417 Consult https://goo.gl/WMmpDe for more details.
3418 """
3419 assert parent_msg # No, orphan branch creation isn't supported.
3420 assert parent_hash
3421 assert dest_ref
3422 parent_footer_map = git_footers.parse_footers(parent_msg)
3423 # This will also happily parse svn-position, which GnumbD is no longer
3424 # supporting. While we'd generate correct footers, the verifier plugin
3425 # installed in Gerrit will block such commit (ie git push below will fail).
3426 parent_position = git_footers.get_position(parent_footer_map)
3427
3428 # Cherry-picks may have last line obscuring their prior footers,
3429 # from git_footers perspective. This is also what Gnumbd did.
3430 cp_line = None
3431 if (self._description_lines and
3432 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3433 cp_line = self._description_lines.pop()
3434
3435 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3436
3437 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3438 # user interference with actual footers we'd insert below.
3439 for i, (k, v) in enumerate(parsed_footers):
3440 if k.startswith('Cr-'):
3441 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3442
3443 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003444 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003445 if parent_position[0] == dest_ref:
3446 # Same branch as parent.
3447 number = int(parent_position[1]) + 1
3448 else:
3449 number = 1 # New branch, and extra lineage.
3450 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3451 int(parent_position[1])))
3452
3453 parsed_footers.append(('Cr-Commit-Position',
3454 '%s@{#%d}' % (dest_ref, number)))
3455 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3456
3457 self._description_lines = top_lines
3458 if cp_line:
3459 self._description_lines.append(cp_line)
3460 if self._description_lines[-1] != '':
3461 self._description_lines.append('') # Ensure footer separator.
3462 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3463
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003464
Aaron Gablea1bab272017-04-11 16:38:18 -07003465def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003466 """Retrieves the reviewers that approved a CL from the issue properties with
3467 messages.
3468
3469 Note that the list may contain reviewers that are not committer, thus are not
3470 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003471
3472 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003473 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003474 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003475 return sorted(
3476 set(
3477 message['sender']
3478 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003479 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003480 )
3481 )
3482
3483
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003484def FindCodereviewSettingsFile(filename='codereview.settings'):
3485 """Finds the given file starting in the cwd and going up.
3486
3487 Only looks up to the top of the repository unless an
3488 'inherit-review-settings-ok' file exists in the root of the repository.
3489 """
3490 inherit_ok_file = 'inherit-review-settings-ok'
3491 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003492 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003493 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3494 root = '/'
3495 while True:
3496 if filename in os.listdir(cwd):
3497 if os.path.isfile(os.path.join(cwd, filename)):
3498 return open(os.path.join(cwd, filename))
3499 if cwd == root:
3500 break
3501 cwd = os.path.dirname(cwd)
3502
3503
3504def LoadCodereviewSettingsFromFile(fileobj):
3505 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003506 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003507
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003508 def SetProperty(name, setting, unset_error_ok=False):
3509 fullname = 'rietveld.' + name
3510 if setting in keyvals:
3511 RunGit(['config', fullname, keyvals[setting]])
3512 else:
3513 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3514
tandrii48df5812016-10-17 03:55:37 -07003515 if not keyvals.get('GERRIT_HOST', False):
3516 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003517 # Only server setting is required. Other settings can be absent.
3518 # In that case, we ignore errors raised during option deletion attempt.
3519 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003520 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003521 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3522 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003523 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003524 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3525 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003526 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003527 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3528 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003529
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003530 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003531 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003532
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003533 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003534 RunGit(['config', 'gerrit.squash-uploads',
3535 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003536
tandrii@chromium.org28253532016-04-14 13:46:56 +00003537 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003538 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003539 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3540
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003541 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003542 # should be of the form
3543 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3544 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003545 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3546 keyvals['ORIGIN_URL_CONFIG']])
3547
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003548
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003549def urlretrieve(source, destination):
3550 """urllib is broken for SSL connections via a proxy therefore we
3551 can't use urllib.urlretrieve()."""
3552 with open(destination, 'w') as f:
3553 f.write(urllib2.urlopen(source).read())
3554
3555
ukai@chromium.org712d6102013-11-27 00:52:58 +00003556def hasSheBang(fname):
3557 """Checks fname is a #! script."""
3558 with open(fname) as f:
3559 return f.read(2).startswith('#!')
3560
3561
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003562# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3563def DownloadHooks(*args, **kwargs):
3564 pass
3565
3566
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003567def DownloadGerritHook(force):
3568 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003569
3570 Args:
3571 force: True to update hooks. False to install hooks if not present.
3572 """
3573 if not settings.GetIsGerrit():
3574 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003575 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003576 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3577 if not os.access(dst, os.X_OK):
3578 if os.path.exists(dst):
3579 if not force:
3580 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003581 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003582 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003583 if not hasSheBang(dst):
3584 DieWithError('Not a script: %s\n'
3585 'You need to download from\n%s\n'
3586 'into .git/hooks/commit-msg and '
3587 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003588 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3589 except Exception:
3590 if os.path.exists(dst):
3591 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003592 DieWithError('\nFailed to download hooks.\n'
3593 'You need to download from\n%s\n'
3594 'into .git/hooks/commit-msg and '
3595 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003596
3597
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003598def GetRietveldCodereviewSettingsInteractively():
3599 """Prompt the user for settings."""
3600 server = settings.GetDefaultServerUrl(error_ok=True)
3601 prompt = 'Rietveld server (host[:port])'
3602 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3603 newserver = ask_for_data(prompt + ':')
3604 if not server and not newserver:
3605 newserver = DEFAULT_SERVER
3606 if newserver:
3607 newserver = gclient_utils.UpgradeToHttps(newserver)
3608 if newserver != server:
3609 RunGit(['config', 'rietveld.server', newserver])
3610
3611 def SetProperty(initial, caption, name, is_url):
3612 prompt = caption
3613 if initial:
3614 prompt += ' ("x" to clear) [%s]' % initial
3615 new_val = ask_for_data(prompt + ':')
3616 if new_val == 'x':
3617 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3618 elif new_val:
3619 if is_url:
3620 new_val = gclient_utils.UpgradeToHttps(new_val)
3621 if new_val != initial:
3622 RunGit(['config', 'rietveld.' + name, new_val])
3623
3624 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3625 SetProperty(settings.GetDefaultPrivateFlag(),
3626 'Private flag (rietveld only)', 'private', False)
3627 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3628 'tree-status-url', False)
3629 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3630 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3631 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3632 'run-post-upload-hook', False)
3633
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003634
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003635class _GitCookiesChecker(object):
3636 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003637
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003638 _GOOGLESOURCE = 'googlesource.com'
3639
3640 def __init__(self):
3641 # Cached list of [host, identity, source], where source is either
3642 # .gitcookies or .netrc.
3643 self._all_hosts = None
3644
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003645 def ensure_configured_gitcookies(self):
3646 """Runs checks and suggests fixes to make git use .gitcookies from default
3647 path."""
3648 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3649 configured_path = RunGitSilent(
3650 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003651 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003652 if configured_path:
3653 self._ensure_default_gitcookies_path(configured_path, default)
3654 else:
3655 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003656
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003657 @staticmethod
3658 def _ensure_default_gitcookies_path(configured_path, default_path):
3659 assert configured_path
3660 if configured_path == default_path:
3661 print('git is already configured to use your .gitcookies from %s' %
3662 configured_path)
3663 return
3664
3665 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3666 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3667 (configured_path, default_path))
3668
3669 if not os.path.exists(configured_path):
3670 print('However, your configured .gitcookies file is missing.')
3671 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3672 action='reconfigure')
3673 RunGit(['config', '--global', 'http.cookiefile', default_path])
3674 return
3675
3676 if os.path.exists(default_path):
3677 print('WARNING: default .gitcookies file already exists %s' %
3678 default_path)
3679 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3680 default_path)
3681
3682 confirm_or_exit('Move existing .gitcookies to default location?',
3683 action='move')
3684 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003685 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003686 print('Moved and reconfigured git to use .gitcookies from %s' %
3687 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003688
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003689 @staticmethod
3690 def _configure_gitcookies_path(default_path):
3691 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3692 if os.path.exists(netrc_path):
3693 print('You seem to be using outdated .netrc for git credentials: %s' %
3694 netrc_path)
3695 print('This tool will guide you through setting up recommended '
3696 '.gitcookies store for git credentials.\n'
3697 '\n'
3698 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3699 ' git config --global --unset http.cookiefile\n'
3700 ' mv %s %s.backup\n\n' % (default_path, default_path))
3701 confirm_or_exit(action='setup .gitcookies')
3702 RunGit(['config', '--global', 'http.cookiefile', default_path])
3703 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003704
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003705 def get_hosts_with_creds(self, include_netrc=False):
3706 if self._all_hosts is None:
3707 a = gerrit_util.CookiesAuthenticator()
3708 self._all_hosts = [
3709 (h, u, s)
3710 for h, u, s in itertools.chain(
3711 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3712 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3713 )
3714 if h.endswith(self._GOOGLESOURCE)
3715 ]
3716
3717 if include_netrc:
3718 return self._all_hosts
3719 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3720
3721 def print_current_creds(self, include_netrc=False):
3722 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3723 if not hosts:
3724 print('No Git/Gerrit credentials found')
3725 return
3726 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3727 header = [('Host', 'User', 'Which file'),
3728 ['=' * l for l in lengths]]
3729 for row in (header + hosts):
3730 print('\t'.join((('%%+%ds' % l) % s)
3731 for l, s in zip(lengths, row)))
3732
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003733 @staticmethod
3734 def _parse_identity(identity):
3735 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3736 username, domain = identity.split('.', 1)
3737 if username.startswith('git-'):
3738 username = username[len('git-'):]
3739 return username, domain
3740
3741 def _get_usernames_of_domain(self, domain):
3742 """Returns list of usernames referenced by .gitcookies in a given domain."""
3743 identities_by_domain = {}
3744 for _, identity, _ in self.get_hosts_with_creds():
3745 username, domain = self._parse_identity(identity)
3746 identities_by_domain.setdefault(domain, []).append(username)
3747 return identities_by_domain.get(domain)
3748
3749 def _canonical_git_googlesource_host(self, host):
3750 """Normalizes Gerrit hosts (with '-review') to Git host."""
3751 assert host.endswith(self._GOOGLESOURCE)
3752 # Prefix doesn't include '.' at the end.
3753 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3754 if prefix.endswith('-review'):
3755 prefix = prefix[:-len('-review')]
3756 return prefix + '.' + self._GOOGLESOURCE
3757
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003758 def _canonical_gerrit_googlesource_host(self, host):
3759 git_host = self._canonical_git_googlesource_host(host)
3760 prefix = git_host.split('.', 1)[0]
3761 return prefix + '-review.' + self._GOOGLESOURCE
3762
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003763 def has_generic_host(self):
3764 """Returns whether generic .googlesource.com has been configured.
3765
3766 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3767 """
3768 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3769 if host == '.' + self._GOOGLESOURCE:
3770 return True
3771 return False
3772
3773 def _get_git_gerrit_identity_pairs(self):
3774 """Returns map from canonic host to pair of identities (Git, Gerrit).
3775
3776 One of identities might be None, meaning not configured.
3777 """
3778 host_to_identity_pairs = {}
3779 for host, identity, _ in self.get_hosts_with_creds():
3780 canonical = self._canonical_git_googlesource_host(host)
3781 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3782 idx = 0 if canonical == host else 1
3783 pair[idx] = identity
3784 return host_to_identity_pairs
3785
3786 def get_partially_configured_hosts(self):
3787 return set(
3788 host for host, identities_pair in
3789 self._get_git_gerrit_identity_pairs().iteritems()
3790 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3791
3792 def get_conflicting_hosts(self):
3793 return set(
3794 host for host, (i1, i2) in
3795 self._get_git_gerrit_identity_pairs().iteritems()
3796 if None not in (i1, i2) and i1 != i2)
3797
3798 def get_duplicated_hosts(self):
3799 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3800 return set(host for host, count in counters.iteritems() if count > 1)
3801
3802 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3803 'chromium.googlesource.com': 'chromium.org',
3804 'chrome-internal.googlesource.com': 'google.com',
3805 }
3806
3807 def get_hosts_with_wrong_identities(self):
3808 """Finds hosts which **likely** reference wrong identities.
3809
3810 Note: skips hosts which have conflicting identities for Git and Gerrit.
3811 """
3812 hosts = set()
3813 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3814 pair = self._get_git_gerrit_identity_pairs().get(host)
3815 if pair and pair[0] == pair[1]:
3816 _, domain = self._parse_identity(pair[0])
3817 if domain != expected:
3818 hosts.add(host)
3819 return hosts
3820
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003821 @staticmethod
3822 def print_hosts(hosts, extra_column_func=None):
3823 hosts = sorted(hosts)
3824 assert hosts
3825 if extra_column_func is None:
3826 extras = [''] * len(hosts)
3827 else:
3828 extras = [extra_column_func(host) for host in hosts]
3829 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3830 for he in zip(hosts, extras):
3831 print(tmpl % he)
3832 print()
3833
3834 def find_and_report_problems(self):
3835 """Returns True if there was at least one problem, else False."""
3836 problems = [False]
3837 def add_problem():
3838 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003839 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003840 problems[0] = True
3841
3842 if self.has_generic_host():
3843 add_problem()
3844 print(' .googlesource.com record detected\n'
3845 ' Chrome Infrastructure team recommends to list full host names '
3846 'explicitly.\n')
3847
3848 dups = self.get_duplicated_hosts()
3849 if dups:
3850 add_problem()
3851 print(' The following hosts were defined twice:\n')
3852 self.print_hosts(dups)
3853
3854 partial = self.get_partially_configured_hosts()
3855 if partial:
3856 add_problem()
3857 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3858 'These hosts are missing:')
3859 self.print_hosts(partial)
3860
3861 conflicting = self.get_conflicting_hosts()
3862 if conflicting:
3863 add_problem()
3864 print(' The following Git hosts have differing credentials from their '
3865 'Gerrit counterparts:\n')
3866 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3867 tuple(self._get_git_gerrit_identity_pairs()[host]))
3868
3869 wrong = self.get_hosts_with_wrong_identities()
3870 if wrong:
3871 add_problem()
3872 print(' These hosts likely use wrong identity:\n')
3873 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3874 (self._get_git_gerrit_identity_pairs()[host][0],
3875 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3876 return problems[0]
3877
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003878
3879def CMDcreds_check(parser, args):
3880 """Checks credentials and suggests changes."""
3881 _, _ = parser.parse_args(args)
3882
3883 if gerrit_util.GceAuthenticator.is_gce():
3884 DieWithError('this command is not designed for GCE, are you on a bot?')
3885
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003886 checker = _GitCookiesChecker()
3887 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003888
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003889 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003890 checker.print_current_creds(include_netrc=True)
3891
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003892 if not checker.find_and_report_problems():
3893 print('\nNo problems detected in your .gitcookies')
3894 return 0
3895 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003896
3897
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003898@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003899def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003900 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003901
tandrii5d0a0422016-09-14 06:24:35 -07003902 print('WARNING: git cl config works for Rietveld only')
3903 # TODO(tandrii): remove this once we switch to Gerrit.
3904 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003905 parser.add_option('--activate-update', action='store_true',
3906 help='activate auto-updating [rietveld] section in '
3907 '.git/config')
3908 parser.add_option('--deactivate-update', action='store_true',
3909 help='deactivate auto-updating [rietveld] section in '
3910 '.git/config')
3911 options, args = parser.parse_args(args)
3912
3913 if options.deactivate_update:
3914 RunGit(['config', 'rietveld.autoupdate', 'false'])
3915 return
3916
3917 if options.activate_update:
3918 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3919 return
3920
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003921 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003922 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003923 return 0
3924
3925 url = args[0]
3926 if not url.endswith('codereview.settings'):
3927 url = os.path.join(url, 'codereview.settings')
3928
3929 # Load code review settings and download hooks (if available).
3930 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3931 return 0
3932
3933
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003934def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003935 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003936 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3937 branch = ShortBranchName(branchref)
3938 _, args = parser.parse_args(args)
3939 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003940 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003941 return RunGit(['config', 'branch.%s.base-url' % branch],
3942 error_ok=False).strip()
3943 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003944 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003945 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3946 error_ok=False).strip()
3947
3948
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003949def color_for_status(status):
3950 """Maps a Changelist status to color, for CMDstatus and other tools."""
3951 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003952 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003953 'waiting': Fore.BLUE,
3954 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003955 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003956 'lgtm': Fore.GREEN,
3957 'commit': Fore.MAGENTA,
3958 'closed': Fore.CYAN,
3959 'error': Fore.WHITE,
3960 }.get(status, Fore.WHITE)
3961
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003962
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003963def get_cl_statuses(changes, fine_grained, max_processes=None):
3964 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003965
3966 If fine_grained is true, this will fetch CL statuses from the server.
3967 Otherwise, simply indicate if there's a matching url for the given branches.
3968
3969 If max_processes is specified, it is used as the maximum number of processes
3970 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3971 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003972
3973 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003974 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003975 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003976 upload.verbosity = 0
3977
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003978 if not changes:
3979 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003980
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003981 if not fine_grained:
3982 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003983 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003984 for cl in changes:
3985 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003986 return
3987
3988 # First, sort out authentication issues.
3989 logging.debug('ensuring credentials exist')
3990 for cl in changes:
3991 cl.EnsureAuthenticated(force=False, refresh=True)
3992
3993 def fetch(cl):
3994 try:
3995 return (cl, cl.GetStatus())
3996 except:
3997 # See http://crbug.com/629863.
3998 logging.exception('failed to fetch status for %s:', cl)
3999 raise
4000
4001 threads_count = len(changes)
4002 if max_processes:
4003 threads_count = max(1, min(threads_count, max_processes))
4004 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4005
4006 pool = ThreadPool(threads_count)
4007 fetched_cls = set()
4008 try:
4009 it = pool.imap_unordered(fetch, changes).__iter__()
4010 while True:
4011 try:
4012 cl, status = it.next(timeout=5)
4013 except multiprocessing.TimeoutError:
4014 break
4015 fetched_cls.add(cl)
4016 yield cl, status
4017 finally:
4018 pool.close()
4019
4020 # Add any branches that failed to fetch.
4021 for cl in set(changes) - fetched_cls:
4022 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004023
rmistry@google.com2dd99862015-06-22 12:22:18 +00004024
4025def upload_branch_deps(cl, args):
4026 """Uploads CLs of local branches that are dependents of the current branch.
4027
4028 If the local branch dependency tree looks like:
4029 test1 -> test2.1 -> test3.1
4030 -> test3.2
4031 -> test2.2 -> test3.3
4032
4033 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4034 run on the dependent branches in this order:
4035 test2.1, test3.1, test3.2, test2.2, test3.3
4036
4037 Note: This function does not rebase your local dependent branches. Use it when
4038 you make a change to the parent branch that will not conflict with its
4039 dependent branches, and you would like their dependencies updated in
4040 Rietveld.
4041 """
4042 if git_common.is_dirty_git_tree('upload-branch-deps'):
4043 return 1
4044
4045 root_branch = cl.GetBranch()
4046 if root_branch is None:
4047 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4048 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004049 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004050 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4051 'patchset dependencies without an uploaded CL.')
4052
4053 branches = RunGit(['for-each-ref',
4054 '--format=%(refname:short) %(upstream:short)',
4055 'refs/heads'])
4056 if not branches:
4057 print('No local branches found.')
4058 return 0
4059
4060 # Create a dictionary of all local branches to the branches that are dependent
4061 # on it.
4062 tracked_to_dependents = collections.defaultdict(list)
4063 for b in branches.splitlines():
4064 tokens = b.split()
4065 if len(tokens) == 2:
4066 branch_name, tracked = tokens
4067 tracked_to_dependents[tracked].append(branch_name)
4068
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print()
4070 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004071 dependents = []
4072 def traverse_dependents_preorder(branch, padding=''):
4073 dependents_to_process = tracked_to_dependents.get(branch, [])
4074 padding += ' '
4075 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004077 dependents.append(dependent)
4078 traverse_dependents_preorder(dependent, padding)
4079 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004080 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004081
4082 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004084 return 0
4085
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004086 confirm_or_exit('This command will checkout all dependent branches and run '
4087 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004088
andybons@chromium.org962f9462016-02-03 20:00:42 +00004089 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004090 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004091 args.extend(['-t', 'Updated patchset dependency'])
4092
rmistry@google.com2dd99862015-06-22 12:22:18 +00004093 # Record all dependents that failed to upload.
4094 failures = {}
4095 # Go through all dependents, checkout the branch and upload.
4096 try:
4097 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print()
4099 print('--------------------------------------')
4100 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004101 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004102 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004103 try:
4104 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004105 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004106 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004107 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004108 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004110 finally:
4111 # Swap back to the original root branch.
4112 RunGit(['checkout', '-q', root_branch])
4113
vapiera7fbd5a2016-06-16 09:17:49 -07004114 print()
4115 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004116 for dependent_branch in dependents:
4117 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004118 print(' %s : %s' % (dependent_branch, upload_status))
4119 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004120
4121 return 0
4122
4123
kmarshall3bff56b2016-06-06 18:31:47 -07004124def CMDarchive(parser, args):
4125 """Archives and deletes branches associated with closed changelists."""
4126 parser.add_option(
4127 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004128 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004129 parser.add_option(
4130 '-f', '--force', action='store_true',
4131 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004132 parser.add_option(
4133 '-d', '--dry-run', action='store_true',
4134 help='Skip the branch tagging and removal steps.')
4135 parser.add_option(
4136 '-t', '--notags', action='store_true',
4137 help='Do not tag archived branches. '
4138 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004139
4140 auth.add_auth_options(parser)
4141 options, args = parser.parse_args(args)
4142 if args:
4143 parser.error('Unsupported args: %s' % ' '.join(args))
4144 auth_config = auth.extract_auth_config_from_options(options)
4145
4146 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4147 if not branches:
4148 return 0
4149
vapiera7fbd5a2016-06-16 09:17:49 -07004150 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004151 changes = [Changelist(branchref=b, auth_config=auth_config)
4152 for b in branches.splitlines()]
4153 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4154 statuses = get_cl_statuses(changes,
4155 fine_grained=True,
4156 max_processes=options.maxjobs)
4157 proposal = [(cl.GetBranch(),
4158 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4159 for cl, status in statuses
4160 if status == 'closed']
4161 proposal.sort()
4162
4163 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004164 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004165 return 0
4166
4167 current_branch = GetCurrentBranch()
4168
vapiera7fbd5a2016-06-16 09:17:49 -07004169 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004170 if options.notags:
4171 for next_item in proposal:
4172 print(' ' + next_item[0])
4173 else:
4174 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4175 for next_item in proposal:
4176 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004177
kmarshall9249e012016-08-23 12:02:16 -07004178 # Quit now on precondition failure or if instructed by the user, either
4179 # via an interactive prompt or by command line flags.
4180 if options.dry_run:
4181 print('\nNo changes were made (dry run).\n')
4182 return 0
4183 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004184 print('You are currently on a branch \'%s\' which is associated with a '
4185 'closed codereview issue, so archive cannot proceed. Please '
4186 'checkout another branch and run this command again.' %
4187 current_branch)
4188 return 1
kmarshall9249e012016-08-23 12:02:16 -07004189 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004190 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4191 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004193 return 1
4194
4195 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004196 if not options.notags:
4197 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004198 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004199
vapiera7fbd5a2016-06-16 09:17:49 -07004200 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004201
4202 return 0
4203
4204
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004205def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004206 """Show status of changelists.
4207
4208 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004209 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004210 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004211 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004212 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004213 - Magenta in the commit queue
4214 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004215 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004216
4217 Also see 'git cl comments'.
4218 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004220 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004221 parser.add_option('-f', '--fast', action='store_true',
4222 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004223 parser.add_option(
4224 '-j', '--maxjobs', action='store', type=int,
4225 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004226
4227 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004228 _add_codereview_issue_select_options(
4229 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004230 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004231 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004232 if args:
4233 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004234 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004235
iannuccie53c9352016-08-17 14:40:40 -07004236 if options.issue is not None and not options.field:
4237 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004238
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004239 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004240 cl = Changelist(auth_config=auth_config, issue=options.issue,
4241 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004242 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004243 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004244 elif options.field == 'id':
4245 issueid = cl.GetIssue()
4246 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004247 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004248 elif options.field == 'patch':
4249 patchset = cl.GetPatchset()
4250 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004251 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004252 elif options.field == 'status':
4253 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004254 elif options.field == 'url':
4255 url = cl.GetIssueURL()
4256 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004257 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004258 return 0
4259
4260 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4261 if not branches:
4262 print('No local branch found.')
4263 return 0
4264
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004265 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004266 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004267 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004268 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004269 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004270 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004271 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004272
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004273 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004274 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4275 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4276 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004277 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004278 c, status = output.next()
4279 branch_statuses[c.GetBranch()] = status
4280 status = branch_statuses.pop(branch)
4281 url = cl.GetIssueURL()
4282 if url and (not status or status == 'error'):
4283 # The issue probably doesn't exist anymore.
4284 url += ' (broken)'
4285
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004286 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004287 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004288 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004289 color = ''
4290 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004291 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004292 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004293 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004294 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004295
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004296
4297 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004298 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004299 print('Current branch: %s' % branch)
4300 for cl in changes:
4301 if cl.GetBranch() == branch:
4302 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004303 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004304 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004305 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004306 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004307 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004308 print('Issue description:')
4309 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004310 return 0
4311
4312
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004313def colorize_CMDstatus_doc():
4314 """To be called once in main() to add colors to git cl status help."""
4315 colors = [i for i in dir(Fore) if i[0].isupper()]
4316
4317 def colorize_line(line):
4318 for color in colors:
4319 if color in line.upper():
4320 # Extract whitespaces first and the leading '-'.
4321 indent = len(line) - len(line.lstrip(' ')) + 1
4322 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4323 return line
4324
4325 lines = CMDstatus.__doc__.splitlines()
4326 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4327
4328
phajdan.jre328cf92016-08-22 04:12:17 -07004329def write_json(path, contents):
4330 with open(path, 'w') as f:
4331 json.dump(contents, f)
4332
4333
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004334@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004335def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004336 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004337
4338 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004339 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004340 parser.add_option('-r', '--reverse', action='store_true',
4341 help='Lookup the branch(es) for the specified issues. If '
4342 'no issues are specified, all branches with mapped '
4343 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004344 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004345 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004346 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004347 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004348
dnj@chromium.org406c4402015-03-03 17:22:28 +00004349 if options.reverse:
4350 branches = RunGit(['for-each-ref', 'refs/heads',
4351 '--format=%(refname:short)']).splitlines()
4352
4353 # Reverse issue lookup.
4354 issue_branch_map = {}
4355 for branch in branches:
4356 cl = Changelist(branchref=branch)
4357 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4358 if not args:
4359 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004360 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004361 for issue in args:
4362 if not issue:
4363 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004364 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004365 print('Branch for issue number %s: %s' % (
4366 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004367 if options.json:
4368 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004369 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004370 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004371 if len(args) > 0:
4372 try:
4373 issue = int(args[0])
4374 except ValueError:
4375 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004376 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004377 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004378 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004379 if options.json:
4380 write_json(options.json, {
4381 'issue': cl.GetIssue(),
4382 'issue_url': cl.GetIssueURL(),
4383 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004384 return 0
4385
4386
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004387def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004388 """Shows or posts review comments for any changelist."""
4389 parser.add_option('-a', '--add-comment', dest='comment',
4390 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004391 parser.add_option('-i', '--issue', dest='issue',
4392 help='review issue id (defaults to current issue). '
4393 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004394 parser.add_option('-j', '--json-file',
4395 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004396 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004397 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004398 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004399 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004400 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004401
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004402 issue = None
4403 if options.issue:
4404 try:
4405 issue = int(options.issue)
4406 except ValueError:
4407 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004408 if not options.forced_codereview:
4409 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004410
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004411 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004412 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004413 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004414
4415 if options.comment:
4416 cl.AddComment(options.comment)
4417 return 0
4418
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004419 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4420 for comment in summary:
4421 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004422 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004423 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004424 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004425 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004426 color = Fore.MAGENTA
4427 else:
4428 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004429 print('\n%s%s %s%s\n%s' % (
4430 color,
4431 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4432 comment.sender,
4433 Fore.RESET,
4434 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4435
smut@google.comc85ac942015-09-15 16:34:43 +00004436 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004437 def pre_serialize(c):
4438 dct = c.__dict__.copy()
4439 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4440 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004441 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004442 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004443 return 0
4444
4445
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004446@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004447def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004448 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004449 parser.add_option('-d', '--display', action='store_true',
4450 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004451 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004452 help='New description to set for this issue (- for stdin, '
4453 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004454 parser.add_option('-f', '--force', action='store_true',
4455 help='Delete any unpublished Gerrit edits for this issue '
4456 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004457
4458 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004459 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004460 options, args = parser.parse_args(args)
4461 _process_codereview_select_options(parser, options)
4462
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004463 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004464 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004465 target_issue_arg = ParseIssueNumberArgument(args[0],
4466 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004467 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004468 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004469
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004470 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004471
martiniss6eda05f2016-06-30 10:18:35 -07004472 kwargs = {
4473 'auth_config': auth_config,
4474 'codereview': options.forced_codereview,
4475 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004476 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004477 if target_issue_arg:
4478 kwargs['issue'] = target_issue_arg.issue
4479 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004480 if target_issue_arg.codereview and not options.forced_codereview:
4481 detected_codereview_from_url = True
4482 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004483
4484 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004485 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004486 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004487 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004488
4489 if detected_codereview_from_url:
4490 logging.info('canonical issue/change URL: %s (type: %s)\n',
4491 cl.GetIssueURL(), target_issue_arg.codereview)
4492
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004493 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004494
smut@google.com34fb6b12015-07-13 20:03:26 +00004495 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004496 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004497 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004498
4499 if options.new_description:
4500 text = options.new_description
4501 if text == '-':
4502 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004503 elif text == '+':
4504 base_branch = cl.GetCommonAncestorWithUpstream()
4505 change = cl.GetChange(base_branch, None, local_description=True)
4506 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004507
4508 description.set_description(text)
4509 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004510 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004511
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004512 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004513 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004514 return 0
4515
4516
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004517def CreateDescriptionFromLog(args):
4518 """Pulls out the commit log to use as a base for the CL description."""
4519 log_args = []
4520 if len(args) == 1 and not args[0].endswith('.'):
4521 log_args = [args[0] + '..']
4522 elif len(args) == 1 and args[0].endswith('...'):
4523 log_args = [args[0][:-1]]
4524 elif len(args) == 2:
4525 log_args = [args[0] + '..' + args[1]]
4526 else:
4527 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004528 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004529
4530
thestig@chromium.org44202a22014-03-11 19:22:18 +00004531def CMDlint(parser, args):
4532 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004533 parser.add_option('--filter', action='append', metavar='-x,+y',
4534 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004535 auth.add_auth_options(parser)
4536 options, args = parser.parse_args(args)
4537 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004538
4539 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004540 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004541 try:
4542 import cpplint
4543 import cpplint_chromium
4544 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004545 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004546 return 1
4547
4548 # Change the current working directory before calling lint so that it
4549 # shows the correct base.
4550 previous_cwd = os.getcwd()
4551 os.chdir(settings.GetRoot())
4552 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004553 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004554 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4555 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004556 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004557 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004558 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004559
4560 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004561 command = args + files
4562 if options.filter:
4563 command = ['--filter=' + ','.join(options.filter)] + command
4564 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004565
4566 white_regex = re.compile(settings.GetLintRegex())
4567 black_regex = re.compile(settings.GetLintIgnoreRegex())
4568 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4569 for filename in filenames:
4570 if white_regex.match(filename):
4571 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004572 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004573 else:
4574 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4575 extra_check_functions)
4576 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004577 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004578 finally:
4579 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004580 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004581 if cpplint._cpplint_state.error_count != 0:
4582 return 1
4583 return 0
4584
4585
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004586def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004587 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004588 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004589 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004590 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004591 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004592 auth.add_auth_options(parser)
4593 options, args = parser.parse_args(args)
4594 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004595
sbc@chromium.org71437c02015-04-09 19:29:40 +00004596 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004597 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004598 return 1
4599
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004600 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004601 if args:
4602 base_branch = args[0]
4603 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004604 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004605 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004606
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004607 cl.RunHook(
4608 committing=not options.upload,
4609 may_prompt=False,
4610 verbose=options.verbose,
4611 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004612 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613
4614
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004615def GenerateGerritChangeId(message):
4616 """Returns Ixxxxxx...xxx change id.
4617
4618 Works the same way as
4619 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4620 but can be called on demand on all platforms.
4621
4622 The basic idea is to generate git hash of a state of the tree, original commit
4623 message, author/committer info and timestamps.
4624 """
4625 lines = []
4626 tree_hash = RunGitSilent(['write-tree'])
4627 lines.append('tree %s' % tree_hash.strip())
4628 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4629 if code == 0:
4630 lines.append('parent %s' % parent.strip())
4631 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4632 lines.append('author %s' % author.strip())
4633 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4634 lines.append('committer %s' % committer.strip())
4635 lines.append('')
4636 # Note: Gerrit's commit-hook actually cleans message of some lines and
4637 # whitespace. This code is not doing this, but it clearly won't decrease
4638 # entropy.
4639 lines.append(message)
4640 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4641 stdin='\n'.join(lines))
4642 return 'I%s' % change_hash.strip()
4643
4644
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004645def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004646 """Computes the remote branch ref to use for the CL.
4647
4648 Args:
4649 remote (str): The git remote for the CL.
4650 remote_branch (str): The git remote branch for the CL.
4651 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004652 """
4653 if not (remote and remote_branch):
4654 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004655
wittman@chromium.org455dc922015-01-26 20:15:50 +00004656 if target_branch:
4657 # Cannonicalize branch references to the equivalent local full symbolic
4658 # refs, which are then translated into the remote full symbolic refs
4659 # below.
4660 if '/' not in target_branch:
4661 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4662 else:
4663 prefix_replacements = (
4664 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4665 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4666 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4667 )
4668 match = None
4669 for regex, replacement in prefix_replacements:
4670 match = re.search(regex, target_branch)
4671 if match:
4672 remote_branch = target_branch.replace(match.group(0), replacement)
4673 break
4674 if not match:
4675 # This is a branch path but not one we recognize; use as-is.
4676 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004677 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4678 # Handle the refs that need to land in different refs.
4679 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004680
wittman@chromium.org455dc922015-01-26 20:15:50 +00004681 # Create the true path to the remote branch.
4682 # Does the following translation:
4683 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4684 # * refs/remotes/origin/master -> refs/heads/master
4685 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4686 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4687 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4688 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4689 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4690 'refs/heads/')
4691 elif remote_branch.startswith('refs/remotes/branch-heads'):
4692 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004693
wittman@chromium.org455dc922015-01-26 20:15:50 +00004694 return remote_branch
4695
4696
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004697def cleanup_list(l):
4698 """Fixes a list so that comma separated items are put as individual items.
4699
4700 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4701 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4702 """
4703 items = sum((i.split(',') for i in l), [])
4704 stripped_items = (i.strip() for i in items)
4705 return sorted(filter(None, stripped_items))
4706
4707
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004708@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004709def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004710 """Uploads the current changelist to codereview.
4711
4712 Can skip dependency patchset uploads for a branch by running:
4713 git config branch.branch_name.skip-deps-uploads True
4714 To unset run:
4715 git config --unset branch.branch_name.skip-deps-uploads
4716 Can also set the above globally by using the --global flag.
4717 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004718 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4719 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004720 parser.add_option('--bypass-watchlists', action='store_true',
4721 dest='bypass_watchlists',
4722 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004723 parser.add_option('-f', action='store_true', dest='force',
4724 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004725 parser.add_option('--message', '-m', dest='message',
4726 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004727 parser.add_option('-b', '--bug',
4728 help='pre-populate the bug number(s) for this issue. '
4729 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004730 parser.add_option('--message-file', dest='message_file',
4731 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004732 parser.add_option('--title', '-t', dest='title',
4733 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004734 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004735 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004736 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004737 parser.add_option('--tbrs',
4738 action='append', default=[],
4739 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004740 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004741 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004742 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004743 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004744 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004745 parser.add_option('--emulate_svn_auto_props',
4746 '--emulate-svn-auto-props',
4747 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004748 dest="emulate_svn_auto_props",
4749 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004750 parser.add_option('-c', '--use-commit-queue', action='store_true',
4751 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004752 parser.add_option('--private', action='store_true',
4753 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004754 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004755 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004756 metavar='TARGET',
4757 help='Apply CL to remote ref TARGET. ' +
4758 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004759 parser.add_option('--squash', action='store_true',
4760 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004761 parser.add_option('--no-squash', action='store_true',
4762 help='Don\'t squash multiple commits into one ' +
4763 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004764 parser.add_option('--topic', default=None,
4765 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004766 parser.add_option('--email', default=None,
4767 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004768 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4769 const='TBR', help='add a set of OWNERS to TBR')
4770 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4771 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004772 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4773 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004774 help='Send the patchset to do a CQ dry run right after '
4775 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004776 parser.add_option('--dependencies', action='store_true',
4777 help='Uploads CLs of all the local branches that depend on '
4778 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004779
rmistry@google.com2dd99862015-06-22 12:22:18 +00004780 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004781 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004782 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004783 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004784 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004785 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004786 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004787
sbc@chromium.org71437c02015-04-09 19:29:40 +00004788 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004789 return 1
4790
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004791 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004792 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004793 options.cc = cleanup_list(options.cc)
4794
tandriib80458a2016-06-23 12:20:07 -07004795 if options.message_file:
4796 if options.message:
4797 parser.error('only one of --message and --message-file allowed.')
4798 options.message = gclient_utils.FileRead(options.message_file)
4799 options.message_file = None
4800
tandrii4d0545a2016-07-06 03:56:49 -07004801 if options.cq_dry_run and options.use_commit_queue:
4802 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4803
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004804 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4805 settings.GetIsGerrit()
4806
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004807 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004808 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004809
4810
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004811@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004812def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004813 """DEPRECATED: Used to commit the current changelist via git-svn."""
4814 message = ('git-cl no longer supports committing to SVN repositories via '
4815 'git-svn. You probably want to use `git cl land` instead.')
4816 print(message)
4817 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004818
4819
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004820# Two special branches used by git cl land.
4821MERGE_BRANCH = 'git-cl-commit'
4822CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4823
4824
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004825@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004826def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004827 """Commits the current changelist via git.
4828
4829 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4830 upstream and closes the issue automatically and atomically.
4831
4832 Otherwise (in case of Rietveld):
4833 Squashes branch into a single commit.
4834 Updates commit message with metadata (e.g. pointer to review).
4835 Pushes the code upstream.
4836 Updates review and closes.
4837 """
4838 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4839 help='bypass upload presubmit hook')
4840 parser.add_option('-m', dest='message',
4841 help="override review description")
4842 parser.add_option('-f', action='store_true', dest='force',
4843 help="force yes to questions (don't prompt)")
4844 parser.add_option('-c', dest='contributor',
4845 help="external contributor for patch (appended to " +
4846 "description and used as author for git). Should be " +
4847 "formatted as 'First Last <email@example.com>'")
4848 add_git_similarity(parser)
4849 auth.add_auth_options(parser)
4850 (options, args) = parser.parse_args(args)
4851 auth_config = auth.extract_auth_config_from_options(options)
4852
4853 cl = Changelist(auth_config=auth_config)
4854
4855 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4856 if cl.IsGerrit():
4857 if options.message:
4858 # This could be implemented, but it requires sending a new patch to
4859 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4860 # Besides, Gerrit has the ability to change the commit message on submit
4861 # automatically, thus there is no need to support this option (so far?).
4862 parser.error('-m MESSAGE option is not supported for Gerrit.')
4863 if options.contributor:
4864 parser.error(
4865 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4866 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4867 'the contributor\'s "name <email>". If you can\'t upload such a '
4868 'commit for review, contact your repository admin and request'
4869 '"Forge-Author" permission.')
4870 if not cl.GetIssue():
4871 DieWithError('You must upload the change first to Gerrit.\n'
4872 ' If you would rather have `git cl land` upload '
4873 'automatically for you, see http://crbug.com/642759')
4874 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4875 options.verbose)
4876
4877 current = cl.GetBranch()
4878 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4879 if remote == '.':
4880 print()
4881 print('Attempting to push branch %r into another local branch!' % current)
4882 print()
4883 print('Either reparent this branch on top of origin/master:')
4884 print(' git reparent-branch --root')
4885 print()
4886 print('OR run `git rebase-update` if you think the parent branch is ')
4887 print('already committed.')
4888 print()
4889 print(' Current parent: %r' % upstream_branch)
4890 return 1
4891
4892 if not args:
4893 # Default to merging against our best guess of the upstream branch.
4894 args = [cl.GetUpstreamBranch()]
4895
4896 if options.contributor:
4897 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4898 print("Please provide contibutor as 'First Last <email@example.com>'")
4899 return 1
4900
4901 base_branch = args[0]
4902
4903 if git_common.is_dirty_git_tree('land'):
4904 return 1
4905
4906 # This rev-list syntax means "show all commits not in my branch that
4907 # are in base_branch".
4908 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4909 base_branch]).splitlines()
4910 if upstream_commits:
4911 print('Base branch "%s" has %d commits '
4912 'not in this branch.' % (base_branch, len(upstream_commits)))
4913 print('Run "git merge %s" before attempting to land.' % base_branch)
4914 return 1
4915
4916 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4917 if not options.bypass_hooks:
4918 author = None
4919 if options.contributor:
4920 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4921 hook_results = cl.RunHook(
4922 committing=True,
4923 may_prompt=not options.force,
4924 verbose=options.verbose,
4925 change=cl.GetChange(merge_base, author))
4926 if not hook_results.should_continue():
4927 return 1
4928
4929 # Check the tree status if the tree status URL is set.
4930 status = GetTreeStatus()
4931 if 'closed' == status:
4932 print('The tree is closed. Please wait for it to reopen. Use '
4933 '"git cl land --bypass-hooks" to commit on a closed tree.')
4934 return 1
4935 elif 'unknown' == status:
4936 print('Unable to determine tree status. Please verify manually and '
4937 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4938 return 1
4939
4940 change_desc = ChangeDescription(options.message)
4941 if not change_desc.description and cl.GetIssue():
4942 change_desc = ChangeDescription(cl.GetDescription())
4943
4944 if not change_desc.description:
4945 if not cl.GetIssue() and options.bypass_hooks:
4946 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4947 else:
4948 print('No description set.')
4949 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4950 return 1
4951
4952 # Keep a separate copy for the commit message, because the commit message
4953 # contains the link to the Rietveld issue, while the Rietveld message contains
4954 # the commit viewvc url.
4955 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07004956 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004957 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004958
4959 commit_desc = ChangeDescription(change_desc.description)
4960 if cl.GetIssue():
4961 # Xcode won't linkify this URL unless there is a non-whitespace character
4962 # after it. Add a period on a new line to circumvent this. Also add a space
4963 # before the period to make sure that Gitiles continues to correctly resolve
4964 # the URL.
4965 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4966 if options.contributor:
4967 commit_desc.append_footer('Patch from %s.' % options.contributor)
4968
4969 print('Description:')
4970 print(commit_desc.description)
4971
4972 branches = [merge_base, cl.GetBranchRef()]
4973 if not options.force:
4974 print_stats(options.similarity, options.find_copies, branches)
4975
4976 # We want to squash all this branch's commits into one commit with the proper
4977 # description. We do this by doing a "reset --soft" to the base branch (which
4978 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004979 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004980 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4981 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4982 result = RunGitWithCode(showref_cmd)
4983 if result[0] == 0:
4984 RunGit(['branch', '-D', branch])
4985
4986 # We might be in a directory that's present in this branch but not in the
4987 # trunk. Move up to the top of the tree so that git commands that expect a
4988 # valid CWD won't fail after we check out the merge branch.
4989 rel_base_path = settings.GetRelativeRoot()
4990 if rel_base_path:
4991 os.chdir(rel_base_path)
4992
4993 # Stuff our change into the merge branch.
4994 # We wrap in a try...finally block so if anything goes wrong,
4995 # we clean up the branches.
4996 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004997 revision = None
4998 try:
4999 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5000 RunGit(['reset', '--soft', merge_base])
5001 if options.contributor:
5002 RunGit(
5003 [
5004 'commit', '--author', options.contributor,
5005 '-m', commit_desc.description,
5006 ])
5007 else:
5008 RunGit(['commit', '-m', commit_desc.description])
5009
5010 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5011 mirror = settings.GetGitMirror(remote)
5012 if mirror:
5013 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005014 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005015 else:
5016 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005017 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005018 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5019
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005020 retcode = PushToGitWithAutoRebase(
5021 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005022 if retcode == 0:
5023 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005024 if git_numberer_enabled:
5025 change_desc = ChangeDescription(
5026 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005027 except: # pylint: disable=bare-except
5028 if _IS_BEING_TESTED:
5029 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5030 + '-' * 30 + '8<' + '-' * 30)
5031 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5032 raise
5033 finally:
5034 # And then swap back to the original branch and clean up.
5035 RunGit(['checkout', '-q', cl.GetBranch()])
5036 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005037 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005038
5039 if not revision:
5040 print('Failed to push. If this persists, please file a bug.')
5041 return 1
5042
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005043 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005044 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005045 if viewvc_url and revision:
5046 change_desc.append_footer(
5047 'Committed: %s%s' % (viewvc_url, revision))
5048 elif revision:
5049 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005050 print('Closing issue '
5051 '(you may be prompted for your codereview password)...')
5052 cl.UpdateDescription(change_desc.description)
5053 cl.CloseIssue()
5054 props = cl.GetIssueProperties()
5055 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005056 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5057 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005058 if options.bypass_hooks:
5059 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5060 else:
5061 comment += ' (presubmit successful).'
5062 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5063
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005064 if os.path.isfile(POSTUPSTREAM_HOOK):
5065 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5066
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005067 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005068
5069
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005070def PushToGitWithAutoRebase(remote, branch, original_description,
5071 git_numberer_enabled, max_attempts=3):
5072 """Pushes current HEAD commit on top of remote's branch.
5073
5074 Attempts to fetch and autorebase on push failures.
5075 Adds git number footers on the fly.
5076
5077 Returns integer code from last command.
5078 """
5079 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5080 code = 0
5081 attempts_left = max_attempts
5082 while attempts_left:
5083 attempts_left -= 1
5084 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5085
5086 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5087 # If fetch fails, retry.
5088 print('Fetching %s/%s...' % (remote, branch))
5089 code, out = RunGitWithCode(
5090 ['retry', 'fetch', remote,
5091 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5092 if code:
5093 print('Fetch failed with exit code %d.' % code)
5094 print(out.strip())
5095 continue
5096
5097 print('Cherry-picking commit on top of latest %s' % branch)
5098 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5099 suppress_stderr=True)
5100 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5101 code, out = RunGitWithCode(['cherry-pick', cherry])
5102 if code:
5103 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5104 'the following files have merge conflicts:' %
5105 (branch, parent_hash))
5106 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5107 print('Please rebase your patch and try again.')
5108 RunGitWithCode(['cherry-pick', '--abort'])
5109 break
5110
5111 commit_desc = ChangeDescription(original_description)
5112 if git_numberer_enabled:
5113 logging.debug('Adding git number footers')
5114 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5115 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5116 branch)
5117 # Ensure timestamps are monotonically increasing.
5118 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5119 _get_committer_timestamp('HEAD'))
5120 _git_amend_head(commit_desc.description, timestamp)
5121
5122 code, out = RunGitWithCode(
5123 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5124 print(out)
5125 if code == 0:
5126 break
5127 if IsFatalPushFailure(out):
5128 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005129 'user.email are correct and you have push access to the repo.\n'
5130 'Hint: run command below to diangose common Git/Gerrit credential '
5131 'problems:\n'
5132 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005133 break
5134 return code
5135
5136
5137def IsFatalPushFailure(push_stdout):
5138 """True if retrying push won't help."""
5139 return '(prohibited by Gerrit)' in push_stdout
5140
5141
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005142@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005143def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005144 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005145 parser.add_option('-b', dest='newbranch',
5146 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005147 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005148 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005149 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5150 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005151 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005152 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005153 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005154 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005155 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005156 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005157
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005158
5159 group = optparse.OptionGroup(
5160 parser,
5161 'Options for continuing work on the current issue uploaded from a '
5162 'different clone (e.g. different machine). Must be used independently '
5163 'from the other options. No issue number should be specified, and the '
5164 'branch must have an issue number associated with it')
5165 group.add_option('--reapply', action='store_true', dest='reapply',
5166 help='Reset the branch and reapply the issue.\n'
5167 'CAUTION: This will undo any local changes in this '
5168 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005169
5170 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005171 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005172 parser.add_option_group(group)
5173
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005174 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005175 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005176 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005177 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005178 auth_config = auth.extract_auth_config_from_options(options)
5179
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005180 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005181 if options.newbranch:
5182 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005183 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005184 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005185
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005186 cl = Changelist(auth_config=auth_config,
5187 codereview=options.forced_codereview)
5188 if not cl.GetIssue():
5189 parser.error('current branch must have an associated issue')
5190
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005191 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005192 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005193 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005194
5195 RunGit(['reset', '--hard', upstream])
5196 if options.pull:
5197 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005198
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005199 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5200 options.directory)
5201
5202 if len(args) != 1 or not args[0]:
5203 parser.error('Must specify issue number or url')
5204
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005205 target_issue_arg = ParseIssueNumberArgument(args[0],
5206 options.forced_codereview)
5207 if not target_issue_arg.valid:
5208 parser.error('invalid codereview url or CL id')
5209
5210 cl_kwargs = {
5211 'auth_config': auth_config,
5212 'codereview_host': target_issue_arg.hostname,
5213 'codereview': options.forced_codereview,
5214 }
5215 detected_codereview_from_url = False
5216 if target_issue_arg.codereview and not options.forced_codereview:
5217 detected_codereview_from_url = True
5218 cl_kwargs['codereview'] = target_issue_arg.codereview
5219 cl_kwargs['issue'] = target_issue_arg.issue
5220
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005221 # We don't want uncommitted changes mixed up with the patch.
5222 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005223 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005224
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005225 if options.newbranch:
5226 if options.force:
5227 RunGit(['branch', '-D', options.newbranch],
5228 stderr=subprocess2.PIPE, error_ok=True)
5229 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005230 elif not GetCurrentBranch():
5231 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005232
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005233 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005234
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005235 if cl.IsGerrit():
5236 if options.reject:
5237 parser.error('--reject is not supported with Gerrit codereview.')
5238 if options.nocommit:
5239 parser.error('--nocommit is not supported with Gerrit codereview.')
5240 if options.directory:
5241 parser.error('--directory is not supported with Gerrit codereview.')
5242
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005243 if detected_codereview_from_url:
5244 print('canonical issue/change URL: %s (type: %s)\n' %
5245 (cl.GetIssueURL(), target_issue_arg.codereview))
5246
5247 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
5248 options.nocommit, options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005249
5250
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005251def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005252 """Fetches the tree status and returns either 'open', 'closed',
5253 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005254 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005255 if url:
5256 status = urllib2.urlopen(url).read().lower()
5257 if status.find('closed') != -1 or status == '0':
5258 return 'closed'
5259 elif status.find('open') != -1 or status == '1':
5260 return 'open'
5261 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005262 return 'unset'
5263
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005264
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005265def GetTreeStatusReason():
5266 """Fetches the tree status from a json url and returns the message
5267 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005268 url = settings.GetTreeStatusUrl()
5269 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005270 connection = urllib2.urlopen(json_url)
5271 status = json.loads(connection.read())
5272 connection.close()
5273 return status['message']
5274
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005275
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005276def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005277 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005278 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005279 status = GetTreeStatus()
5280 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005281 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005282 return 2
5283
vapiera7fbd5a2016-06-16 09:17:49 -07005284 print('The tree is %s' % status)
5285 print()
5286 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287 if status != 'open':
5288 return 1
5289 return 0
5290
5291
maruel@chromium.org15192402012-09-06 12:38:29 +00005292def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005293 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005294 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005295 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005296 '-b', '--bot', action='append',
5297 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5298 'times to specify multiple builders. ex: '
5299 '"-b win_rel -b win_layout". See '
5300 'the try server waterfall for the builders name and the tests '
5301 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005302 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005303 '-B', '--bucket', default='',
5304 help=('Buildbucket bucket to send the try requests.'))
5305 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005306 '-m', '--master', default='',
5307 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005308 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005309 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005310 help='Revision to use for the try job; default: the revision will '
5311 'be determined by the try recipe that builder runs, which usually '
5312 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005313 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005314 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005315 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005316 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005317 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005318 '--project',
5319 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005320 'in recipe to determine to which repository or directory to '
5321 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005322 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005323 '-p', '--property', dest='properties', action='append', default=[],
5324 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005325 'key2=value2 etc. The value will be treated as '
5326 'json if decodable, or as string otherwise. '
5327 'NOTE: using this may make your try job not usable for CQ, '
5328 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005329 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005330 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5331 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005332 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005333 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005334 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005335 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005336
machenbach@chromium.org45453142015-09-15 08:45:22 +00005337 # Make sure that all properties are prop=value pairs.
5338 bad_params = [x for x in options.properties if '=' not in x]
5339 if bad_params:
5340 parser.error('Got properties with missing "=": %s' % bad_params)
5341
maruel@chromium.org15192402012-09-06 12:38:29 +00005342 if args:
5343 parser.error('Unknown arguments: %s' % args)
5344
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005345 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005346 if not cl.GetIssue():
5347 parser.error('Need to upload first')
5348
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005349 if cl.IsGerrit():
5350 # HACK: warm up Gerrit change detail cache to save on RPCs.
5351 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5352
tandriie113dfd2016-10-11 10:20:12 -07005353 error_message = cl.CannotTriggerTryJobReason()
5354 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005355 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005356
borenet6c0efe62016-10-19 08:13:29 -07005357 if options.bucket and options.master:
5358 parser.error('Only one of --bucket and --master may be used.')
5359
qyearsley1fdfcb62016-10-24 13:22:03 -07005360 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005361
qyearsleydd49f942016-10-28 11:57:22 -07005362 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5363 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005364 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005365 if options.verbose:
5366 print('git cl try with no bots now defaults to CQ Dry Run.')
5367 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005368
borenet6c0efe62016-10-19 08:13:29 -07005369 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005370 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005371 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005372 'of bot requires an initial job from a parent (usually a builder). '
5373 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005374 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005375 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005376
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005377 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005378 # TODO(tandrii): Checking local patchset against remote patchset is only
5379 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5380 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005381 print('Warning: Codereview server has newer patchsets (%s) than most '
5382 'recent upload from local checkout (%s). Did a previous upload '
5383 'fail?\n'
5384 'By default, git cl try uses the latest patchset from '
5385 'codereview, continuing to use patchset %s.\n' %
5386 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005387
tandrii568043b2016-10-11 07:49:18 -07005388 try:
borenet6c0efe62016-10-19 08:13:29 -07005389 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5390 patchset)
tandrii568043b2016-10-11 07:49:18 -07005391 except BuildbucketResponseException as ex:
5392 print('ERROR: %s' % ex)
5393 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005394 return 0
5395
5396
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005397def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005398 """Prints info about try jobs associated with current CL."""
5399 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005400 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005401 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005402 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005403 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005404 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005405 '--color', action='store_true', default=setup_color.IS_TTY,
5406 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005407 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005408 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5409 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005410 group.add_option(
5411 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005412 parser.add_option_group(group)
5413 auth.add_auth_options(parser)
5414 options, args = parser.parse_args(args)
5415 if args:
5416 parser.error('Unrecognized args: %s' % ' '.join(args))
5417
5418 auth_config = auth.extract_auth_config_from_options(options)
5419 cl = Changelist(auth_config=auth_config)
5420 if not cl.GetIssue():
5421 parser.error('Need to upload first')
5422
tandrii221ab252016-10-06 08:12:04 -07005423 patchset = options.patchset
5424 if not patchset:
5425 patchset = cl.GetMostRecentPatchset()
5426 if not patchset:
5427 parser.error('Codereview doesn\'t know about issue %s. '
5428 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005429 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005430 cl.GetIssue())
5431
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005432 # TODO(tandrii): Checking local patchset against remote patchset is only
5433 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5434 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005435 print('Warning: Codereview server has newer patchsets (%s) than most '
5436 'recent upload from local checkout (%s). Did a previous upload '
5437 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005438 'By default, git cl try-results uses the latest patchset from '
5439 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005440 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005441 try:
tandrii221ab252016-10-06 08:12:04 -07005442 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005443 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005444 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005445 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005446 if options.json:
5447 write_try_results_json(options.json, jobs)
5448 else:
5449 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005450 return 0
5451
5452
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005453@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005454def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005455 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005456 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005457 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005458 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005459
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005460 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005461 if args:
5462 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005463 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005464 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005465 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005466 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005467
5468 # Clear configured merge-base, if there is one.
5469 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005470 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005471 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005472 return 0
5473
5474
thestig@chromium.org00858c82013-12-02 23:08:03 +00005475def CMDweb(parser, args):
5476 """Opens the current CL in the web browser."""
5477 _, args = parser.parse_args(args)
5478 if args:
5479 parser.error('Unrecognized args: %s' % ' '.join(args))
5480
5481 issue_url = Changelist().GetIssueURL()
5482 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005483 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005484 return 1
5485
5486 webbrowser.open(issue_url)
5487 return 0
5488
5489
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005490def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005491 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005492 parser.add_option('-d', '--dry-run', action='store_true',
5493 help='trigger in dry run mode')
5494 parser.add_option('-c', '--clear', action='store_true',
5495 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005496 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005497 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005498 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005499 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005500 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005501 if args:
5502 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005503 if options.dry_run and options.clear:
5504 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5505
iannuccie53c9352016-08-17 14:40:40 -07005506 cl = Changelist(auth_config=auth_config, issue=options.issue,
5507 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005508 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005509 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005510 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005511 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005512 state = _CQState.DRY_RUN
5513 else:
5514 state = _CQState.COMMIT
5515 if not cl.GetIssue():
5516 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005517 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005518 return 0
5519
5520
groby@chromium.org411034a2013-02-26 15:12:01 +00005521def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005522 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005523 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005524 auth.add_auth_options(parser)
5525 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005526 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005527 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005528 if args:
5529 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005530 cl = Changelist(auth_config=auth_config, issue=options.issue,
5531 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005532 # Ensure there actually is an issue to close.
5533 cl.GetDescription()
5534 cl.CloseIssue()
5535 return 0
5536
5537
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005538def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005539 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005540 parser.add_option(
5541 '--stat',
5542 action='store_true',
5543 dest='stat',
5544 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005545 auth.add_auth_options(parser)
5546 options, args = parser.parse_args(args)
5547 auth_config = auth.extract_auth_config_from_options(options)
5548 if args:
5549 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005550
5551 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005552 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005553 # Staged changes would be committed along with the patch from last
5554 # upload, hence counted toward the "last upload" side in the final
5555 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005556 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005557 return 1
5558
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005559 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005560 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005561 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005562 if not issue:
5563 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005564 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005565 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005566
5567 # Create a new branch based on the merge-base
5568 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005569 # Clear cached branch in cl object, to avoid overwriting original CL branch
5570 # properties.
5571 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005572 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005573 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005574 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005575 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005576 return rtn
5577
wychen@chromium.org06928532015-02-03 02:11:29 +00005578 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005579 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005580 cmd = ['git', 'diff']
5581 if options.stat:
5582 cmd.append('--stat')
5583 cmd.extend([TMP_BRANCH, branch, '--'])
5584 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005585 finally:
5586 RunGit(['checkout', '-q', branch])
5587 RunGit(['branch', '-D', TMP_BRANCH])
5588
5589 return 0
5590
5591
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005592def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005593 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005594 parser.add_option(
5595 '--no-color',
5596 action='store_true',
5597 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005598 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005599 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005600 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005601
5602 author = RunGit(['config', 'user.email']).strip() or None
5603
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005604 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005605
5606 if args:
5607 if len(args) > 1:
5608 parser.error('Unknown args')
5609 base_branch = args[0]
5610 else:
5611 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005612 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005613
5614 change = cl.GetChange(base_branch, None)
5615 return owners_finder.OwnersFinder(
5616 [f.LocalPath() for f in
5617 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005618 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005619 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005620 disable_color=options.no_color,
5621 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005622
5623
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005624def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005625 """Generates a diff command."""
5626 # Generate diff for the current branch's changes.
5627 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005628 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005629
5630 if args:
5631 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005632 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005633 diff_cmd.append(arg)
5634 else:
5635 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005636
5637 return diff_cmd
5638
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005639
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005640def MatchingFileType(file_name, extensions):
5641 """Returns true if the file name ends with one of the given extensions."""
5642 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005643
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005644
enne@chromium.org555cfe42014-01-29 18:21:39 +00005645@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005646def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005647 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005648 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005649 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005650 parser.add_option('--full', action='store_true',
5651 help='Reformat the full content of all touched files')
5652 parser.add_option('--dry-run', action='store_true',
5653 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005654 parser.add_option('--python', action='store_true',
5655 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005656 parser.add_option('--js', action='store_true',
5657 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005658 parser.add_option('--diff', action='store_true',
5659 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005660 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005661
Daniel Chengc55eecf2016-12-30 03:11:02 -08005662 # Normalize any remaining args against the current path, so paths relative to
5663 # the current directory are still resolved as expected.
5664 args = [os.path.join(os.getcwd(), arg) for arg in args]
5665
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005666 # git diff generates paths against the root of the repository. Change
5667 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005668 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005669 if rel_base_path:
5670 os.chdir(rel_base_path)
5671
digit@chromium.org29e47272013-05-17 17:01:46 +00005672 # Grab the merge-base commit, i.e. the upstream commit of the current
5673 # branch when it was created or the last time it was rebased. This is
5674 # to cover the case where the user may have called "git fetch origin",
5675 # moving the origin branch to a newer commit, but hasn't rebased yet.
5676 upstream_commit = None
5677 cl = Changelist()
5678 upstream_branch = cl.GetUpstreamBranch()
5679 if upstream_branch:
5680 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5681 upstream_commit = upstream_commit.strip()
5682
5683 if not upstream_commit:
5684 DieWithError('Could not find base commit for this branch. '
5685 'Are you in detached state?')
5686
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005687 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5688 diff_output = RunGit(changed_files_cmd)
5689 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005690 # Filter out files deleted by this CL
5691 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005692
Christopher Lamc5ba6922017-01-24 11:19:14 +11005693 if opts.js:
5694 CLANG_EXTS.append('.js')
5695
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005696 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5697 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5698 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005699 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005700
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005701 top_dir = os.path.normpath(
5702 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5703
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005704 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5705 # formatted. This is used to block during the presubmit.
5706 return_value = 0
5707
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005708 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005709 # Locate the clang-format binary in the checkout
5710 try:
5711 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005712 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005713 DieWithError(e)
5714
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005715 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005716 cmd = [clang_format_tool]
5717 if not opts.dry_run and not opts.diff:
5718 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005719 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005720 if opts.diff:
5721 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005722 else:
5723 env = os.environ.copy()
5724 env['PATH'] = str(os.path.dirname(clang_format_tool))
5725 try:
5726 script = clang_format.FindClangFormatScriptInChromiumTree(
5727 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005728 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005729 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005730
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005731 cmd = [sys.executable, script, '-p0']
5732 if not opts.dry_run and not opts.diff:
5733 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005734
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005735 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5736 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005737
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005738 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5739 if opts.diff:
5740 sys.stdout.write(stdout)
5741 if opts.dry_run and len(stdout) > 0:
5742 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005743
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005744 # Similar code to above, but using yapf on .py files rather than clang-format
5745 # on C/C++ files
5746 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005747 yapf_tool = gclient_utils.FindExecutable('yapf')
5748 if yapf_tool is None:
5749 DieWithError('yapf not found in PATH')
5750
5751 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005752 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005753 cmd = [yapf_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 + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005757 if opts.diff:
5758 sys.stdout.write(stdout)
5759 else:
5760 # TODO(sbc): yapf --lines mode still has some issues.
5761 # https://github.com/google/yapf/issues/154
5762 DieWithError('--python currently only works with --full')
5763
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005764 # Dart's formatter does not have the nice property of only operating on
5765 # modified chunks, so hard code full.
5766 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005767 try:
5768 command = [dart_format.FindDartFmtToolInChromiumTree()]
5769 if not opts.dry_run and not opts.diff:
5770 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005771 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005772
ppi@chromium.org6593d932016-03-03 15:41:15 +00005773 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005774 if opts.dry_run and stdout:
5775 return_value = 2
5776 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005777 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5778 'found in this checkout. Files in other languages are still '
5779 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005780
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005781 # Format GN build files. Always run on full build files for canonical form.
5782 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005783 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005784 if opts.dry_run or opts.diff:
5785 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005786 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005787 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5788 shell=sys.platform == 'win32',
5789 cwd=top_dir)
5790 if opts.dry_run and gn_ret == 2:
5791 return_value = 2 # Not formatted.
5792 elif opts.diff and gn_ret == 2:
5793 # TODO this should compute and print the actual diff.
5794 print("This change has GN build file diff for " + gn_diff_file)
5795 elif gn_ret != 0:
5796 # For non-dry run cases (and non-2 return values for dry-run), a
5797 # nonzero error code indicates a failure, probably because the file
5798 # doesn't parse.
5799 DieWithError("gn format failed on " + gn_diff_file +
5800 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005801
Steven Holte2e664bf2017-04-21 13:10:47 -07005802 for xml_dir in GetDirtyMetricsDirs(diff_files):
5803 tool_dir = os.path.join(top_dir, xml_dir)
5804 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5805 if opts.dry_run or opts.diff:
5806 cmd.append('--diff')
5807 stdout = RunCommand(cmd, cwd=top_dir)
5808 if opts.diff:
5809 sys.stdout.write(stdout)
5810 if opts.dry_run and stdout:
5811 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005812
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005813 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005814
Steven Holte2e664bf2017-04-21 13:10:47 -07005815def GetDirtyMetricsDirs(diff_files):
5816 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5817 metrics_xml_dirs = [
5818 os.path.join('tools', 'metrics', 'actions'),
5819 os.path.join('tools', 'metrics', 'histograms'),
5820 os.path.join('tools', 'metrics', 'rappor'),
5821 os.path.join('tools', 'metrics', 'ukm')]
5822 for xml_dir in metrics_xml_dirs:
5823 if any(file.startswith(xml_dir) for file in xml_diff_files):
5824 yield xml_dir
5825
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005826
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005827@subcommand.usage('<codereview url or issue id>')
5828def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005829 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005830 _, args = parser.parse_args(args)
5831
5832 if len(args) != 1:
5833 parser.print_help()
5834 return 1
5835
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005836 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005837 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005838 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005839
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005840 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005841
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005842 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005843 output = RunGit(['config', '--local', '--get-regexp',
5844 r'branch\..*\.%s' % issueprefix],
5845 error_ok=True)
5846 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005847 if issue == target_issue:
5848 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005849
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005850 branches = []
5851 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005852 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005853 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005854 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005855 return 1
5856 if len(branches) == 1:
5857 RunGit(['checkout', branches[0]])
5858 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005859 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005860 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005861 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005862 which = raw_input('Choose by index: ')
5863 try:
5864 RunGit(['checkout', branches[int(which)]])
5865 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005866 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005867 return 1
5868
5869 return 0
5870
5871
maruel@chromium.org29404b52014-09-08 22:58:00 +00005872def CMDlol(parser, args):
5873 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005874 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005875 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5876 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5877 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005878 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005879 return 0
5880
5881
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005882class OptionParser(optparse.OptionParser):
5883 """Creates the option parse and add --verbose support."""
5884 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005885 optparse.OptionParser.__init__(
5886 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005887 self.add_option(
5888 '-v', '--verbose', action='count', default=0,
5889 help='Use 2 times for more debugging info')
5890
5891 def parse_args(self, args=None, values=None):
5892 options, args = optparse.OptionParser.parse_args(self, args, values)
5893 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005894 logging.basicConfig(
5895 level=levels[min(options.verbose, len(levels) - 1)],
5896 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5897 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005898 return options, args
5899
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005900
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005901def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005902 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005903 print('\nYour python version %s is unsupported, please upgrade.\n' %
5904 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005905 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005906
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005907 # Reload settings.
5908 global settings
5909 settings = Settings()
5910
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005911 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005912 dispatcher = subcommand.CommandDispatcher(__name__)
5913 try:
5914 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005915 except auth.AuthenticationError as e:
5916 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005917 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005918 if e.code != 500:
5919 raise
5920 DieWithError(
5921 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5922 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005923 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005924
5925
5926if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005927 # These affect sys.stdout so do it outside of main() to simplify mocks in
5928 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005929 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005930 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005931 try:
5932 sys.exit(main(sys.argv[1:]))
5933 except KeyboardInterrupt:
5934 sys.stderr.write('interrupted\n')
5935 sys.exit(1)