blob: 849e12ea4b1993242992019379675182617cd5fe [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):
1041 def __init__(self, issue=None, patchset=None, hostname=None):
1042 self.issue = issue
1043 self.patchset = patchset
1044 self.hostname = hostname
1045
1046 @property
1047 def valid(self):
1048 return self.issue is not None
1049
1050
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001051def ParseIssueNumberArgument(arg):
1052 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1053 fail_result = _ParsedIssueNumberArgument()
1054
1055 if arg.isdigit():
1056 return _ParsedIssueNumberArgument(issue=int(arg))
1057 if not arg.startswith('http'):
1058 return fail_result
1059 url = gclient_utils.UpgradeToHttps(arg)
1060 try:
1061 parsed_url = urlparse.urlparse(url)
1062 except ValueError:
1063 return fail_result
1064 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
1065 tmp = cls.ParseIssueURL(parsed_url)
1066 if tmp is not None:
1067 return tmp
1068 return fail_result
1069
1070
Aaron Gablea45ee112016-11-22 15:14:38 -08001071class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001072 def __init__(self, issue, url):
1073 self.issue = issue
1074 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001075 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001076
1077 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001078 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001079 self.issue, self.url)
1080
1081
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001082_CommentSummary = collections.namedtuple(
1083 '_CommentSummary', ['date', 'message', 'sender',
1084 # TODO(tandrii): these two aren't known in Gerrit.
1085 'approval', 'disapproval'])
1086
1087
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001088class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001089 """Changelist works with one changelist in local branch.
1090
1091 Supports two codereview backends: Rietveld or Gerrit, selected at object
1092 creation.
1093
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001094 Notes:
1095 * Not safe for concurrent multi-{thread,process} use.
1096 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001097 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001098 """
1099
1100 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1101 """Create a new ChangeList instance.
1102
1103 If issue is given, the codereview must be given too.
1104
1105 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1106 Otherwise, it's decided based on current configuration of the local branch,
1107 with default being 'rietveld' for backwards compatibility.
1108 See _load_codereview_impl for more details.
1109
1110 **kwargs will be passed directly to codereview implementation.
1111 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001112 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001113 global settings
1114 if not settings:
1115 # Happens when git_cl.py is used as a utility library.
1116 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001117
1118 if issue:
1119 assert codereview, 'codereview must be known, if issue is known'
1120
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001121 self.branchref = branchref
1122 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001123 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 self.branch = ShortBranchName(self.branchref)
1125 else:
1126 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001127 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001128 self.lookedup_issue = False
1129 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001130 self.has_description = False
1131 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001132 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001133 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001134 self.cc = None
1135 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001136 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001137
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001138 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001139 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001140 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001141 assert self._codereview_impl
1142 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001143
1144 def _load_codereview_impl(self, codereview=None, **kwargs):
1145 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001146 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1147 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1148 self._codereview = codereview
1149 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001150 return
1151
1152 # Automatic selection based on issue number set for a current branch.
1153 # Rietveld takes precedence over Gerrit.
1154 assert not self.issue
1155 # Whether we find issue or not, we are doing the lookup.
1156 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001157 if self.GetBranch():
1158 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1159 issue = _git_get_branch_config_value(
1160 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1161 if issue:
1162 self._codereview = codereview
1163 self._codereview_impl = cls(self, **kwargs)
1164 self.issue = int(issue)
1165 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001166
1167 # No issue is set for this branch, so decide based on repo-wide settings.
1168 return self._load_codereview_impl(
1169 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1170 **kwargs)
1171
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001172 def IsGerrit(self):
1173 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001174
1175 def GetCCList(self):
1176 """Return the users cc'd on this CL.
1177
agable92bec4f2016-08-24 09:27:27 -07001178 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001179 """
1180 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001181 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001182 more_cc = ','.join(self.watchers)
1183 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1184 return self.cc
1185
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001186 def GetCCListWithoutDefault(self):
1187 """Return the users cc'd on this CL excluding default ones."""
1188 if self.cc is None:
1189 self.cc = ','.join(self.watchers)
1190 return self.cc
1191
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001192 def SetWatchers(self, watchers):
1193 """Set the list of email addresses that should be cc'd based on the changed
1194 files in this CL.
1195 """
1196 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001197
1198 def GetBranch(self):
1199 """Returns the short branch name, e.g. 'master'."""
1200 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001201 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001202 if not branchref:
1203 return None
1204 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205 self.branch = ShortBranchName(self.branchref)
1206 return self.branch
1207
1208 def GetBranchRef(self):
1209 """Returns the full branch name, e.g. 'refs/heads/master'."""
1210 self.GetBranch() # Poke the lazy loader.
1211 return self.branchref
1212
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001213 def ClearBranch(self):
1214 """Clears cached branch data of this object."""
1215 self.branch = self.branchref = None
1216
tandrii5d48c322016-08-18 16:19:37 -07001217 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1218 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1219 kwargs['branch'] = self.GetBranch()
1220 return _git_get_branch_config_value(key, default, **kwargs)
1221
1222 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1223 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1224 assert self.GetBranch(), (
1225 'this CL must have an associated branch to %sset %s%s' %
1226 ('un' if value is None else '',
1227 key,
1228 '' if value is None else ' to %r' % value))
1229 kwargs['branch'] = self.GetBranch()
1230 return _git_set_branch_config_value(key, value, **kwargs)
1231
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001232 @staticmethod
1233 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001234 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001235 e.g. 'origin', 'refs/heads/master'
1236 """
1237 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001238 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1239
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001240 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001241 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001243 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1244 error_ok=True).strip()
1245 if upstream_branch:
1246 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001247 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001248 # Else, try to guess the origin remote.
1249 remote_branches = RunGit(['branch', '-r']).split()
1250 if 'origin/master' in remote_branches:
1251 # Fall back on origin/master if it exits.
1252 remote = 'origin'
1253 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001255 DieWithError(
1256 'Unable to determine default branch to diff against.\n'
1257 'Either pass complete "git diff"-style arguments, like\n'
1258 ' git cl upload origin/master\n'
1259 'or verify this branch is set up to track another \n'
1260 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261
1262 return remote, upstream_branch
1263
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001264 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001265 upstream_branch = self.GetUpstreamBranch()
1266 if not BranchExists(upstream_branch):
1267 DieWithError('The upstream for the current branch (%s) does not exist '
1268 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001269 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001270 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001271
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001272 def GetUpstreamBranch(self):
1273 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001274 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001276 upstream_branch = upstream_branch.replace('refs/heads/',
1277 'refs/remotes/%s/' % remote)
1278 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1279 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 self.upstream_branch = upstream_branch
1281 return self.upstream_branch
1282
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001283 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001284 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001285 remote, branch = None, self.GetBranch()
1286 seen_branches = set()
1287 while branch not in seen_branches:
1288 seen_branches.add(branch)
1289 remote, branch = self.FetchUpstreamTuple(branch)
1290 branch = ShortBranchName(branch)
1291 if remote != '.' or branch.startswith('refs/remotes'):
1292 break
1293 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001294 remotes = RunGit(['remote'], error_ok=True).split()
1295 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001297 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001298 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001299 logging.warn('Could not determine which remote this change is '
1300 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001301 else:
1302 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001303 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 branch = 'HEAD'
1305 if branch.startswith('refs/remotes'):
1306 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001307 elif branch.startswith('refs/branch-heads/'):
1308 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 else:
1310 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001311 return self._remote
1312
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001313 def GitSanityChecks(self, upstream_git_obj):
1314 """Checks git repo status and ensures diff is from local commits."""
1315
sbc@chromium.org79706062015-01-14 21:18:12 +00001316 if upstream_git_obj is None:
1317 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001318 print('ERROR: unable to determine current branch (detached HEAD?)',
1319 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001320 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001321 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001322 return False
1323
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001324 # Verify the commit we're diffing against is in our current branch.
1325 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1326 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1327 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001328 print('ERROR: %s is not in the current branch. You may need to rebase '
1329 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 return False
1331
1332 # List the commits inside the diff, and verify they are all local.
1333 commits_in_diff = RunGit(
1334 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1335 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1336 remote_branch = remote_branch.strip()
1337 if code != 0:
1338 _, remote_branch = self.GetRemoteBranch()
1339
1340 commits_in_remote = RunGit(
1341 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1342
1343 common_commits = set(commits_in_diff) & set(commits_in_remote)
1344 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001345 print('ERROR: Your diff contains %d commits already in %s.\n'
1346 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1347 'the diff. If you are using a custom git flow, you can override'
1348 ' the reference used for this check with "git config '
1349 'gitcl.remotebranch <git-ref>".' % (
1350 len(common_commits), remote_branch, upstream_git_obj),
1351 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001352 return False
1353 return True
1354
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001355 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001356 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001357
1358 Returns None if it is not set.
1359 """
tandrii5d48c322016-08-18 16:19:37 -07001360 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001361
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001362 def GetRemoteUrl(self):
1363 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1364
1365 Returns None if there is no remote.
1366 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001367 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001368 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1369
1370 # If URL is pointing to a local directory, it is probably a git cache.
1371 if os.path.isdir(url):
1372 url = RunGit(['config', 'remote.%s.url' % remote],
1373 error_ok=True,
1374 cwd=url).strip()
1375 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001376
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001377 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001378 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001379 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001380 self.issue = self._GitGetBranchConfigValue(
1381 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001382 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001383 return self.issue
1384
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385 def GetIssueURL(self):
1386 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001387 issue = self.GetIssue()
1388 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001389 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001390 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001391
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001392 def GetDescription(self, pretty=False, force=False):
1393 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001395 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001396 self.has_description = True
1397 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001398 # Set width to 72 columns + 2 space indent.
1399 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001401 lines = self.description.splitlines()
1402 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 return self.description
1404
1405 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001406 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001407 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001408 self.patchset = self._GitGetBranchConfigValue(
1409 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001410 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411 return self.patchset
1412
1413 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001414 """Set this branch's patchset. If patchset=0, clears the patchset."""
1415 assert self.GetBranch()
1416 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001417 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001418 else:
1419 self.patchset = int(patchset)
1420 self._GitSetBranchConfigValue(
1421 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001423 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001424 """Set this branch's issue. If issue isn't given, clears the issue."""
1425 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001426 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001427 issue = int(issue)
1428 self._GitSetBranchConfigValue(
1429 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001430 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001431 codereview_server = self._codereview_impl.GetCodereviewServer()
1432 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001433 self._GitSetBranchConfigValue(
1434 self._codereview_impl.CodereviewServerConfigKey(),
1435 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001436 else:
tandrii5d48c322016-08-18 16:19:37 -07001437 # Reset all of these just to be clean.
1438 reset_suffixes = [
1439 'last-upload-hash',
1440 self._codereview_impl.IssueConfigKey(),
1441 self._codereview_impl.PatchsetConfigKey(),
1442 self._codereview_impl.CodereviewServerConfigKey(),
1443 ] + self._PostUnsetIssueProperties()
1444 for prop in reset_suffixes:
1445 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001447 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448
dnjba1b0f32016-09-02 12:37:42 -07001449 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001450 if not self.GitSanityChecks(upstream_branch):
1451 DieWithError('\nGit sanity check failure')
1452
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001453 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001454 if not root:
1455 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001456 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001457
1458 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001459 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001460 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001461 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001462 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001463 except subprocess2.CalledProcessError:
1464 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001465 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001466 'This branch probably doesn\'t exist anymore. To reset the\n'
1467 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001468 ' git branch --set-upstream-to origin/master %s\n'
1469 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001470 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001471
maruel@chromium.org52424302012-08-29 15:14:30 +00001472 issue = self.GetIssue()
1473 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001474 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001475 description = self.GetDescription()
1476 else:
1477 # If the change was never uploaded, use the log messages of all commits
1478 # up to the branch point, as git cl upload will prefill the description
1479 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001480 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1481 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001482
1483 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001484 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001485 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001486 name,
1487 description,
1488 absroot,
1489 files,
1490 issue,
1491 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001492 author,
1493 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001494
dsansomee2d6fd92016-09-08 00:10:47 -07001495 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001496 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001497 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001498 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001499
1500 def RunHook(self, committing, may_prompt, verbose, change):
1501 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1502 try:
1503 return presubmit_support.DoPresubmitChecks(change, committing,
1504 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1505 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001506 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1507 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001508 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001509 DieWithError(
1510 ('%s\nMaybe your depot_tools is out of date?\n'
1511 'If all fails, contact maruel@') % e)
1512
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001513 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1514 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001515 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1516 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001517 else:
1518 # Assume url.
1519 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1520 urlparse.urlparse(issue_arg))
1521 if not parsed_issue_arg or not parsed_issue_arg.valid:
1522 DieWithError('Failed to parse issue argument "%s". '
1523 'Must be an issue number or a valid URL.' % issue_arg)
1524 return self._codereview_impl.CMDPatchWithParsedIssue(
1525 parsed_issue_arg, reject, nocommit, directory)
1526
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001527 def CMDUpload(self, options, git_diff_args, orig_args):
1528 """Uploads a change to codereview."""
1529 if git_diff_args:
1530 # TODO(ukai): is it ok for gerrit case?
1531 base_branch = git_diff_args[0]
1532 else:
1533 if self.GetBranch() is None:
1534 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1535
1536 # Default to diffing against common ancestor of upstream branch
1537 base_branch = self.GetCommonAncestorWithUpstream()
1538 git_diff_args = [base_branch, 'HEAD']
1539
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001540 # Fast best-effort checks to abort before running potentially
1541 # expensive hooks if uploading is likely to fail anyway. Passing these
1542 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001543 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001544 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001545
1546 # Apply watchlists on upload.
1547 change = self.GetChange(base_branch, None)
1548 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1549 files = [f.LocalPath() for f in change.AffectedFiles()]
1550 if not options.bypass_watchlists:
1551 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1552
1553 if not options.bypass_hooks:
1554 if options.reviewers or options.tbr_owners:
1555 # Set the reviewer list now so that presubmit checks can access it.
1556 change_description = ChangeDescription(change.FullDescriptionText())
1557 change_description.update_reviewers(options.reviewers,
1558 options.tbr_owners,
1559 change)
1560 change.SetDescriptionText(change_description.description)
1561 hook_results = self.RunHook(committing=False,
1562 may_prompt=not options.force,
1563 verbose=options.verbose,
1564 change=change)
1565 if not hook_results.should_continue():
1566 return 1
1567 if not options.reviewers and hook_results.reviewers:
1568 options.reviewers = hook_results.reviewers.split(',')
1569
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001570 # TODO(tandrii): Checking local patchset against remote patchset is only
1571 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1572 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001573 latest_patchset = self.GetMostRecentPatchset()
1574 local_patchset = self.GetPatchset()
1575 if (latest_patchset and local_patchset and
1576 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001577 print('The last upload made from this repository was patchset #%d but '
1578 'the most recent patchset on the server is #%d.'
1579 % (local_patchset, latest_patchset))
1580 print('Uploading will still work, but if you\'ve uploaded to this '
1581 'issue from another machine or branch the patch you\'re '
1582 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001583 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584
1585 print_stats(options.similarity, options.find_copies, git_diff_args)
1586 ret = self.CMDUploadChange(options, git_diff_args, change)
1587 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001588 if options.use_commit_queue:
1589 self.SetCQState(_CQState.COMMIT)
1590 elif options.cq_dry_run:
1591 self.SetCQState(_CQState.DRY_RUN)
1592
tandrii5d48c322016-08-18 16:19:37 -07001593 _git_set_branch_config_value('last-upload-hash',
1594 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001595 # Run post upload hooks, if specified.
1596 if settings.GetRunPostUploadHook():
1597 presubmit_support.DoPostUploadExecuter(
1598 change,
1599 self,
1600 settings.GetRoot(),
1601 options.verbose,
1602 sys.stdout)
1603
1604 # Upload all dependencies if specified.
1605 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001606 print()
1607 print('--dependencies has been specified.')
1608 print('All dependent local branches will be re-uploaded.')
1609 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001610 # Remove the dependencies flag from args so that we do not end up in a
1611 # loop.
1612 orig_args.remove('--dependencies')
1613 ret = upload_branch_deps(self, orig_args)
1614 return ret
1615
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001616 def SetCQState(self, new_state):
1617 """Update the CQ state for latest patchset.
1618
1619 Issue must have been already uploaded and known.
1620 """
1621 assert new_state in _CQState.ALL_STATES
1622 assert self.GetIssue()
1623 return self._codereview_impl.SetCQState(new_state)
1624
qyearsley1fdfcb62016-10-24 13:22:03 -07001625 def TriggerDryRun(self):
1626 """Triggers a dry run and prints a warning on failure."""
1627 # TODO(qyearsley): Either re-use this method in CMDset_commit
1628 # and CMDupload, or change CMDtry to trigger dry runs with
1629 # just SetCQState, and catch keyboard interrupt and other
1630 # errors in that method.
1631 try:
1632 self.SetCQState(_CQState.DRY_RUN)
1633 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1634 return 0
1635 except KeyboardInterrupt:
1636 raise
1637 except:
1638 print('WARNING: failed to trigger CQ Dry Run.\n'
1639 'Either:\n'
1640 ' * your project has no CQ\n'
1641 ' * you don\'t have permission to trigger Dry Run\n'
1642 ' * bug in this code (see stack trace below).\n'
1643 'Consider specifying which bots to trigger manually '
1644 'or asking your project owners for permissions '
1645 'or contacting Chrome Infrastructure team at '
1646 'https://www.chromium.org/infra\n\n')
1647 # Still raise exception so that stack trace is printed.
1648 raise
1649
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001650 # Forward methods to codereview specific implementation.
1651
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001652 def AddComment(self, message):
1653 return self._codereview_impl.AddComment(message)
1654
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001655 def GetCommentsSummary(self):
1656 """Returns list of _CommentSummary for each comment.
1657
1658 Note: comments per file or per line are not included,
1659 only top-level comments are returned.
1660 """
1661 return self._codereview_impl.GetCommentsSummary()
1662
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001663 def CloseIssue(self):
1664 return self._codereview_impl.CloseIssue()
1665
1666 def GetStatus(self):
1667 return self._codereview_impl.GetStatus()
1668
1669 def GetCodereviewServer(self):
1670 return self._codereview_impl.GetCodereviewServer()
1671
tandriide281ae2016-10-12 06:02:30 -07001672 def GetIssueOwner(self):
1673 """Get owner from codereview, which may differ from this checkout."""
1674 return self._codereview_impl.GetIssueOwner()
1675
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001676 def GetApprovingReviewers(self):
1677 return self._codereview_impl.GetApprovingReviewers()
1678
1679 def GetMostRecentPatchset(self):
1680 return self._codereview_impl.GetMostRecentPatchset()
1681
tandriide281ae2016-10-12 06:02:30 -07001682 def CannotTriggerTryJobReason(self):
1683 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1684 return self._codereview_impl.CannotTriggerTryJobReason()
1685
tandrii8c5a3532016-11-04 07:52:02 -07001686 def GetTryjobProperties(self, patchset=None):
1687 """Returns dictionary of properties to launch tryjob."""
1688 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1689
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001690 def __getattr__(self, attr):
1691 # This is because lots of untested code accesses Rietveld-specific stuff
1692 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001693 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001694 # Note that child method defines __getattr__ as well, and forwards it here,
1695 # because _RietveldChangelistImpl is not cleaned up yet, and given
1696 # deprecation of Rietveld, it should probably be just removed.
1697 # Until that time, avoid infinite recursion by bypassing __getattr__
1698 # of implementation class.
1699 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001700
1701
1702class _ChangelistCodereviewBase(object):
1703 """Abstract base class encapsulating codereview specifics of a changelist."""
1704 def __init__(self, changelist):
1705 self._changelist = changelist # instance of Changelist
1706
1707 def __getattr__(self, attr):
1708 # Forward methods to changelist.
1709 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1710 # _RietveldChangelistImpl to avoid this hack?
1711 return getattr(self._changelist, attr)
1712
1713 def GetStatus(self):
1714 """Apply a rough heuristic to give a simple summary of an issue's review
1715 or CQ status, assuming adherence to a common workflow.
1716
1717 Returns None if no issue for this branch, or specific string keywords.
1718 """
1719 raise NotImplementedError()
1720
1721 def GetCodereviewServer(self):
1722 """Returns server URL without end slash, like "https://codereview.com"."""
1723 raise NotImplementedError()
1724
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001725 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001726 """Fetches and returns description from the codereview server."""
1727 raise NotImplementedError()
1728
tandrii5d48c322016-08-18 16:19:37 -07001729 @classmethod
1730 def IssueConfigKey(cls):
1731 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001732 raise NotImplementedError()
1733
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001734 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001735 def PatchsetConfigKey(cls):
1736 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737 raise NotImplementedError()
1738
tandrii5d48c322016-08-18 16:19:37 -07001739 @classmethod
1740 def CodereviewServerConfigKey(cls):
1741 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001742 raise NotImplementedError()
1743
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001744 def _PostUnsetIssueProperties(self):
1745 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001746 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001747
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001748 def GetRieveldObjForPresubmit(self):
1749 # This is an unfortunate Rietveld-embeddedness in presubmit.
1750 # For non-Rietveld codereviews, this probably should return a dummy object.
1751 raise NotImplementedError()
1752
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001753 def GetGerritObjForPresubmit(self):
1754 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1755 return None
1756
dsansomee2d6fd92016-09-08 00:10:47 -07001757 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001758 """Update the description on codereview site."""
1759 raise NotImplementedError()
1760
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001761 def AddComment(self, message):
1762 """Posts a comment to the codereview site."""
1763 raise NotImplementedError()
1764
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001765 def GetCommentsSummary(self):
1766 raise NotImplementedError()
1767
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001768 def CloseIssue(self):
1769 """Closes the issue."""
1770 raise NotImplementedError()
1771
1772 def GetApprovingReviewers(self):
1773 """Returns a list of reviewers approving the change.
1774
1775 Note: not necessarily committers.
1776 """
1777 raise NotImplementedError()
1778
1779 def GetMostRecentPatchset(self):
1780 """Returns the most recent patchset number from the codereview site."""
1781 raise NotImplementedError()
1782
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001783 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1784 directory):
1785 """Fetches and applies the issue.
1786
1787 Arguments:
1788 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1789 reject: if True, reject the failed patch instead of switching to 3-way
1790 merge. Rietveld only.
1791 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1792 only.
1793 directory: switch to directory before applying the patch. Rietveld only.
1794 """
1795 raise NotImplementedError()
1796
1797 @staticmethod
1798 def ParseIssueURL(parsed_url):
1799 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1800 failed."""
1801 raise NotImplementedError()
1802
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001803 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001804 """Best effort check that user is authenticated with codereview server.
1805
1806 Arguments:
1807 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001808 refresh: whether to attempt to refresh credentials. Ignored if not
1809 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001810 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001811 raise NotImplementedError()
1812
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001813 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001814 """Best effort check that uploading isn't supposed to fail for predictable
1815 reasons.
1816
1817 This method should raise informative exception if uploading shouldn't
1818 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001819
1820 Arguments:
1821 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001822 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001823 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001824
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001825 def CMDUploadChange(self, options, args, change):
1826 """Uploads a change to codereview."""
1827 raise NotImplementedError()
1828
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001829 def SetCQState(self, new_state):
1830 """Update the CQ state for latest patchset.
1831
1832 Issue must have been already uploaded and known.
1833 """
1834 raise NotImplementedError()
1835
tandriie113dfd2016-10-11 10:20:12 -07001836 def CannotTriggerTryJobReason(self):
1837 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1838 raise NotImplementedError()
1839
tandriide281ae2016-10-12 06:02:30 -07001840 def GetIssueOwner(self):
1841 raise NotImplementedError()
1842
tandrii8c5a3532016-11-04 07:52:02 -07001843 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001844 raise NotImplementedError()
1845
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001846
1847class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001848 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001849 super(_RietveldChangelistImpl, self).__init__(changelist)
1850 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001851 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001852 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001853
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001854 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001855 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001856 self._props = None
1857 self._rpc_server = None
1858
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001859 def GetCodereviewServer(self):
1860 if not self._rietveld_server:
1861 # If we're on a branch then get the server potentially associated
1862 # with that branch.
1863 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001864 self._rietveld_server = gclient_utils.UpgradeToHttps(
1865 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001866 if not self._rietveld_server:
1867 self._rietveld_server = settings.GetDefaultServerUrl()
1868 return self._rietveld_server
1869
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001870 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001871 """Best effort check that user is authenticated with Rietveld server."""
1872 if self._auth_config.use_oauth2:
1873 authenticator = auth.get_authenticator_for_host(
1874 self.GetCodereviewServer(), self._auth_config)
1875 if not authenticator.has_cached_credentials():
1876 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001877 if refresh:
1878 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001879
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001880 def EnsureCanUploadPatchset(self, force):
1881 # No checks for Rietveld because we are deprecating Rietveld.
1882 pass
1883
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001884 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001885 issue = self.GetIssue()
1886 assert issue
1887 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001888 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001889 except urllib2.HTTPError as e:
1890 if e.code == 404:
1891 DieWithError(
1892 ('\nWhile fetching the description for issue %d, received a '
1893 '404 (not found)\n'
1894 'error. It is likely that you deleted this '
1895 'issue on the server. If this is the\n'
1896 'case, please run\n\n'
1897 ' git cl issue 0\n\n'
1898 'to clear the association with the deleted issue. Then run '
1899 'this command again.') % issue)
1900 else:
1901 DieWithError(
1902 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1903 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001904 print('Warning: Failed to retrieve CL description due to network '
1905 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001906 return ''
1907
1908 def GetMostRecentPatchset(self):
1909 return self.GetIssueProperties()['patchsets'][-1]
1910
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911 def GetIssueProperties(self):
1912 if self._props is None:
1913 issue = self.GetIssue()
1914 if not issue:
1915 self._props = {}
1916 else:
1917 self._props = self.RpcServer().get_issue_properties(issue, True)
1918 return self._props
1919
tandriie113dfd2016-10-11 10:20:12 -07001920 def CannotTriggerTryJobReason(self):
1921 props = self.GetIssueProperties()
1922 if not props:
1923 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1924 if props.get('closed'):
1925 return 'CL %s is closed' % self.GetIssue()
1926 if props.get('private'):
1927 return 'CL %s is private' % self.GetIssue()
1928 return None
1929
tandrii8c5a3532016-11-04 07:52:02 -07001930 def GetTryjobProperties(self, patchset=None):
1931 """Returns dictionary of properties to launch tryjob."""
1932 project = (self.GetIssueProperties() or {}).get('project')
1933 return {
1934 'issue': self.GetIssue(),
1935 'patch_project': project,
1936 'patch_storage': 'rietveld',
1937 'patchset': patchset or self.GetPatchset(),
1938 'rietveld': self.GetCodereviewServer(),
1939 }
1940
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001941 def GetApprovingReviewers(self):
1942 return get_approving_reviewers(self.GetIssueProperties())
1943
tandriide281ae2016-10-12 06:02:30 -07001944 def GetIssueOwner(self):
1945 return (self.GetIssueProperties() or {}).get('owner_email')
1946
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 def AddComment(self, message):
1948 return self.RpcServer().add_comment(self.GetIssue(), message)
1949
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001950 def GetCommentsSummary(self):
1951 summary = []
1952 for message in self.GetIssueProperties().get('messages', []):
1953 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
1954 summary.append(_CommentSummary(
1955 date=date,
1956 disapproval=bool(message['disapproval']),
1957 approval=bool(message['approval']),
1958 sender=message['sender'],
1959 message=message['text'],
1960 ))
1961 return summary
1962
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001963 def GetStatus(self):
1964 """Apply a rough heuristic to give a simple summary of an issue's review
1965 or CQ status, assuming adherence to a common workflow.
1966
1967 Returns None if no issue for this branch, or one of the following keywords:
1968 * 'error' - error from review tool (including deleted issues)
1969 * 'unsent' - not sent for review
1970 * 'waiting' - waiting for review
1971 * 'reply' - waiting for owner to reply to review
1972 * 'lgtm' - LGTM from at least one approved reviewer
1973 * 'commit' - in the commit queue
1974 * 'closed' - closed
1975 """
1976 if not self.GetIssue():
1977 return None
1978
1979 try:
1980 props = self.GetIssueProperties()
1981 except urllib2.HTTPError:
1982 return 'error'
1983
1984 if props.get('closed'):
1985 # Issue is closed.
1986 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001987 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001988 # Issue is in the commit queue.
1989 return 'commit'
1990
1991 try:
1992 reviewers = self.GetApprovingReviewers()
1993 except urllib2.HTTPError:
1994 return 'error'
1995
1996 if reviewers:
1997 # Was LGTM'ed.
1998 return 'lgtm'
1999
2000 messages = props.get('messages') or []
2001
tandrii9d2c7a32016-06-22 03:42:45 -07002002 # Skip CQ messages that don't require owner's action.
2003 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2004 if 'Dry run:' in messages[-1]['text']:
2005 messages.pop()
2006 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2007 # This message always follows prior messages from CQ,
2008 # so skip this too.
2009 messages.pop()
2010 else:
2011 # This is probably a CQ messages warranting user attention.
2012 break
2013
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002014 if not messages:
2015 # No message was sent.
2016 return 'unsent'
2017 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002018 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002019 return 'reply'
2020 return 'waiting'
2021
dsansomee2d6fd92016-09-08 00:10:47 -07002022 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002023 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002024
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002025 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002026 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002027
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002028 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002029 return self.SetFlags({flag: value})
2030
2031 def SetFlags(self, flags):
2032 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002033 """
phajdan.jr68598232016-08-10 03:28:28 -07002034 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002035 try:
tandrii4b233bd2016-07-06 03:50:29 -07002036 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002037 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002038 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002039 if e.code == 404:
2040 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2041 if e.code == 403:
2042 DieWithError(
2043 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002044 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002045 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002046
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002047 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002048 """Returns an upload.RpcServer() to access this review's rietveld instance.
2049 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002050 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002051 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002052 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002053 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002054 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002055
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002056 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002057 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002058 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002059
tandrii5d48c322016-08-18 16:19:37 -07002060 @classmethod
2061 def PatchsetConfigKey(cls):
2062 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002063
tandrii5d48c322016-08-18 16:19:37 -07002064 @classmethod
2065 def CodereviewServerConfigKey(cls):
2066 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002067
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002068 def GetRieveldObjForPresubmit(self):
2069 return self.RpcServer()
2070
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002071 def SetCQState(self, new_state):
2072 props = self.GetIssueProperties()
2073 if props.get('private'):
2074 DieWithError('Cannot set-commit on private issue')
2075
2076 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002077 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002078 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002079 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002080 else:
tandrii4b233bd2016-07-06 03:50:29 -07002081 assert new_state == _CQState.DRY_RUN
2082 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002083
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002084 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2085 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002086 # PatchIssue should never be called with a dirty tree. It is up to the
2087 # caller to check this, but just in case we assert here since the
2088 # consequences of the caller not checking this could be dire.
2089 assert(not git_common.is_dirty_git_tree('apply'))
2090 assert(parsed_issue_arg.valid)
2091 self._changelist.issue = parsed_issue_arg.issue
2092 if parsed_issue_arg.hostname:
2093 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2094
skobes6468b902016-10-24 08:45:10 -07002095 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2096 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2097 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002098 try:
skobes6468b902016-10-24 08:45:10 -07002099 scm_obj.apply_patch(patchset_object)
2100 except Exception as e:
2101 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002102 return 1
2103
2104 # If we had an issue, commit the current state and register the issue.
2105 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002106 self.SetIssue(self.GetIssue())
2107 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002108 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2109 'patch from issue %(i)s at patchset '
2110 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2111 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002112 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002113 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002114 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002115 return 0
2116
2117 @staticmethod
2118 def ParseIssueURL(parsed_url):
2119 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2120 return None
wychen3c1c1722016-08-04 11:46:36 -07002121 # Rietveld patch: https://domain/<number>/#ps<patchset>
2122 match = re.match(r'/(\d+)/$', parsed_url.path)
2123 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2124 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002125 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002126 issue=int(match.group(1)),
2127 patchset=int(match2.group(1)),
2128 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002129 # Typical url: https://domain/<issue_number>[/[other]]
2130 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2131 if match:
skobes6468b902016-10-24 08:45:10 -07002132 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 issue=int(match.group(1)),
2134 hostname=parsed_url.netloc)
2135 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2136 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2137 if match:
skobes6468b902016-10-24 08:45:10 -07002138 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002139 issue=int(match.group(1)),
2140 patchset=int(match.group(2)),
skobes6468b902016-10-24 08:45:10 -07002141 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002142 return None
2143
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002144 def CMDUploadChange(self, options, args, change):
2145 """Upload the patch to Rietveld."""
2146 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2147 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002148 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2149 if options.emulate_svn_auto_props:
2150 upload_args.append('--emulate_svn_auto_props')
2151
2152 change_desc = None
2153
2154 if options.email is not None:
2155 upload_args.extend(['--email', options.email])
2156
2157 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002158 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002159 upload_args.extend(['--title', options.title])
2160 if options.message:
2161 upload_args.extend(['--message', options.message])
2162 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002163 print('This branch is associated with issue %s. '
2164 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002165 else:
nodirca166002016-06-27 10:59:51 -07002166 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002167 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002168 if options.message:
2169 message = options.message
2170 else:
2171 message = CreateDescriptionFromLog(args)
2172 if options.title:
2173 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002174 change_desc = ChangeDescription(message)
2175 if options.reviewers or options.tbr_owners:
2176 change_desc.update_reviewers(options.reviewers,
2177 options.tbr_owners,
2178 change)
2179 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002180 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002181
2182 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002183 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002184 return 1
2185
2186 upload_args.extend(['--message', change_desc.description])
2187 if change_desc.get_reviewers():
2188 upload_args.append('--reviewers=%s' % ','.join(
2189 change_desc.get_reviewers()))
2190 if options.send_mail:
2191 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002192 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002193 upload_args.append('--send_mail')
2194
2195 # We check this before applying rietveld.private assuming that in
2196 # rietveld.cc only addresses which we can send private CLs to are listed
2197 # if rietveld.private is set, and so we should ignore rietveld.cc only
2198 # when --private is specified explicitly on the command line.
2199 if options.private:
2200 logging.warn('rietveld.cc is ignored since private flag is specified. '
2201 'You need to review and add them manually if necessary.')
2202 cc = self.GetCCListWithoutDefault()
2203 else:
2204 cc = self.GetCCList()
2205 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002206 if change_desc.get_cced():
2207 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 if cc:
2209 upload_args.extend(['--cc', cc])
2210
2211 if options.private or settings.GetDefaultPrivateFlag() == "True":
2212 upload_args.append('--private')
2213
2214 upload_args.extend(['--git_similarity', str(options.similarity)])
2215 if not options.find_copies:
2216 upload_args.extend(['--git_no_find_copies'])
2217
2218 # Include the upstream repo's URL in the change -- this is useful for
2219 # projects that have their source spread across multiple repos.
2220 remote_url = self.GetGitBaseUrlFromConfig()
2221 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002222 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2223 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2224 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002226 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002227 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228 if target_ref:
2229 upload_args.extend(['--target_ref', target_ref])
2230
2231 # Look for dependent patchsets. See crbug.com/480453 for more details.
2232 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2233 upstream_branch = ShortBranchName(upstream_branch)
2234 if remote is '.':
2235 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002236 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002238 print()
2239 print('Skipping dependency patchset upload because git config '
2240 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2241 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002242 else:
2243 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002244 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002245 auth_config=auth_config)
2246 branch_cl_issue_url = branch_cl.GetIssueURL()
2247 branch_cl_issue = branch_cl.GetIssue()
2248 branch_cl_patchset = branch_cl.GetPatchset()
2249 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2250 upload_args.extend(
2251 ['--depends_on_patchset', '%s:%s' % (
2252 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002253 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002254 '\n'
2255 'The current branch (%s) is tracking a local branch (%s) with '
2256 'an associated CL.\n'
2257 'Adding %s/#ps%s as a dependency patchset.\n'
2258 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2259 branch_cl_patchset))
2260
2261 project = settings.GetProject()
2262 if project:
2263 upload_args.extend(['--project', project])
2264
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002265 try:
2266 upload_args = ['upload'] + upload_args + args
2267 logging.info('upload.RealMain(%s)', upload_args)
2268 issue, patchset = upload.RealMain(upload_args)
2269 issue = int(issue)
2270 patchset = int(patchset)
2271 except KeyboardInterrupt:
2272 sys.exit(1)
2273 except:
2274 # If we got an exception after the user typed a description for their
2275 # change, back up the description before re-raising.
2276 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002277 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 raise
2279
2280 if not self.GetIssue():
2281 self.SetIssue(issue)
2282 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 return 0
2284
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002285
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002286class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002287 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002288 # auth_config is Rietveld thing, kept here to preserve interface only.
2289 super(_GerritChangelistImpl, self).__init__(changelist)
2290 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002291 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002292 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002293 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002294 # Map from change number (issue) to its detail cache.
2295 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002296
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002297 if codereview_host is not None:
2298 assert not codereview_host.startswith('https://'), codereview_host
2299 self._gerrit_host = codereview_host
2300 self._gerrit_server = 'https://%s' % codereview_host
2301
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002302 def _GetGerritHost(self):
2303 # Lazy load of configs.
2304 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002305 if self._gerrit_host and '.' not in self._gerrit_host:
2306 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2307 # This happens for internal stuff http://crbug.com/614312.
2308 parsed = urlparse.urlparse(self.GetRemoteUrl())
2309 if parsed.scheme == 'sso':
2310 print('WARNING: using non https URLs for remote is likely broken\n'
2311 ' Your current remote is: %s' % self.GetRemoteUrl())
2312 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2313 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002314 return self._gerrit_host
2315
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002316 def _GetGitHost(self):
2317 """Returns git host to be used when uploading change to Gerrit."""
2318 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2319
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002320 def GetCodereviewServer(self):
2321 if not self._gerrit_server:
2322 # If we're on a branch then get the server potentially associated
2323 # with that branch.
2324 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002325 self._gerrit_server = self._GitGetBranchConfigValue(
2326 self.CodereviewServerConfigKey())
2327 if self._gerrit_server:
2328 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002329 if not self._gerrit_server:
2330 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2331 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002332 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002333 parts[0] = parts[0] + '-review'
2334 self._gerrit_host = '.'.join(parts)
2335 self._gerrit_server = 'https://%s' % self._gerrit_host
2336 return self._gerrit_server
2337
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002338 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002339 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002340 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002341
tandrii5d48c322016-08-18 16:19:37 -07002342 @classmethod
2343 def PatchsetConfigKey(cls):
2344 return 'gerritpatchset'
2345
2346 @classmethod
2347 def CodereviewServerConfigKey(cls):
2348 return 'gerritserver'
2349
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002350 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002351 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002352 if settings.GetGerritSkipEnsureAuthenticated():
2353 # For projects with unusual authentication schemes.
2354 # See http://crbug.com/603378.
2355 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002356 # Lazy-loader to identify Gerrit and Git hosts.
2357 if gerrit_util.GceAuthenticator.is_gce():
2358 return
2359 self.GetCodereviewServer()
2360 git_host = self._GetGitHost()
2361 assert self._gerrit_server and self._gerrit_host
2362 cookie_auth = gerrit_util.CookiesAuthenticator()
2363
2364 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2365 git_auth = cookie_auth.get_auth_header(git_host)
2366 if gerrit_auth and git_auth:
2367 if gerrit_auth == git_auth:
2368 return
2369 print((
2370 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2371 ' Check your %s or %s file for credentials of hosts:\n'
2372 ' %s\n'
2373 ' %s\n'
2374 ' %s') %
2375 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2376 git_host, self._gerrit_host,
2377 cookie_auth.get_new_password_message(git_host)))
2378 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002379 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002380 return
2381 else:
2382 missing = (
2383 [] if gerrit_auth else [self._gerrit_host] +
2384 [] if git_auth else [git_host])
2385 DieWithError('Credentials for the following hosts are required:\n'
2386 ' %s\n'
2387 'These are read from %s (or legacy %s)\n'
2388 '%s' % (
2389 '\n '.join(missing),
2390 cookie_auth.get_gitcookies_path(),
2391 cookie_auth.get_netrc_path(),
2392 cookie_auth.get_new_password_message(git_host)))
2393
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002394 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002395 if not self.GetIssue():
2396 return
2397
2398 # Warm change details cache now to avoid RPCs later, reducing latency for
2399 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002400 self._GetChangeDetail(
2401 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002402
2403 status = self._GetChangeDetail()['status']
2404 if status in ('MERGED', 'ABANDONED'):
2405 DieWithError('Change %s has been %s, new uploads are not allowed' %
2406 (self.GetIssueURL(),
2407 'submitted' if status == 'MERGED' else 'abandoned'))
2408
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002409 if gerrit_util.GceAuthenticator.is_gce():
2410 return
2411 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2412 self._GetGerritHost())
2413 if self.GetIssueOwner() == cookies_user:
2414 return
2415 logging.debug('change %s owner is %s, cookies user is %s',
2416 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2417 # Maybe user has linked accounts or smth like that,
2418 # so ask what Gerrit thinks of this user.
2419 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2420 if details['email'] == self.GetIssueOwner():
2421 return
2422 if not force:
2423 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2424 'as %s.\n'
2425 'Uploading may fail due to lack of permissions.' %
2426 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2427 confirm_or_exit(action='upload')
2428
2429
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002430 def _PostUnsetIssueProperties(self):
2431 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002432 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002433
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002434 def GetRieveldObjForPresubmit(self):
2435 class ThisIsNotRietveldIssue(object):
2436 def __nonzero__(self):
2437 # This is a hack to make presubmit_support think that rietveld is not
2438 # defined, yet still ensure that calls directly result in a decent
2439 # exception message below.
2440 return False
2441
2442 def __getattr__(self, attr):
2443 print(
2444 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2445 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2446 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2447 'or use Rietveld for codereview.\n'
2448 'See also http://crbug.com/579160.' % attr)
2449 raise NotImplementedError()
2450 return ThisIsNotRietveldIssue()
2451
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002452 def GetGerritObjForPresubmit(self):
2453 return presubmit_support.GerritAccessor(self._GetGerritHost())
2454
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002455 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002456 """Apply a rough heuristic to give a simple summary of an issue's review
2457 or CQ status, assuming adherence to a common workflow.
2458
2459 Returns None if no issue for this branch, or one of the following keywords:
2460 * 'error' - error from review tool (including deleted issues)
2461 * 'unsent' - no reviewers added
2462 * 'waiting' - waiting for review
2463 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002464 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002465 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002466 * 'commit' - in the commit queue
2467 * 'closed' - abandoned
2468 """
2469 if not self.GetIssue():
2470 return None
2471
2472 try:
2473 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002474 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002475 return 'error'
2476
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002477 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002478 return 'closed'
2479
2480 cq_label = data['labels'].get('Commit-Queue', {})
2481 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002482 votes = cq_label.get('all', [])
2483 highest_vote = 0
2484 for v in votes:
2485 highest_vote = max(highest_vote, v.get('value', 0))
2486 vote_value = str(highest_vote)
2487 if vote_value != '0':
2488 # Add a '+' if the value is not 0 to match the values in the label.
2489 # The cq_label does not have negatives.
2490 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002491 vote_text = cq_label.get('values', {}).get(vote_value, '')
2492 if vote_text.lower() == 'commit':
2493 return 'commit'
2494
2495 lgtm_label = data['labels'].get('Code-Review', {})
2496 if lgtm_label:
2497 if 'rejected' in lgtm_label:
2498 return 'not lgtm'
2499 if 'approved' in lgtm_label:
2500 return 'lgtm'
2501
2502 if not data.get('reviewers', {}).get('REVIEWER', []):
2503 return 'unsent'
2504
2505 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002506 owner = data['owner'].get('_account_id')
2507 while messages:
2508 last_message_author = messages.pop().get('author', {})
2509 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2510 # Ignore replies from CQ.
2511 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002512 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002513 # Some reply from non-owner.
2514 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002515 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002516
2517 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002518 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002519 return data['revisions'][data['current_revision']]['_number']
2520
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002521 def FetchDescription(self, force=False):
2522 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2523 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002524 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002525 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002526
dsansomee2d6fd92016-09-08 00:10:47 -07002527 def UpdateDescriptionRemote(self, description, force=False):
2528 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2529 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002530 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002531 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002532 'unpublished edit. Either publish the edit in the Gerrit web UI '
2533 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002534
2535 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2536 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002537 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002538 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002539
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002540 def AddComment(self, message):
2541 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2542 msg=message)
2543
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002544 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002545 # DETAILED_ACCOUNTS is to get emails in accounts.
2546 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2547 summary = []
2548 for msg in data.get('messages', []):
2549 # Gerrit spits out nanoseconds.
2550 assert len(msg['date'].split('.')[-1]) == 9
2551 date = datetime.datetime.strptime(msg['date'][:-3],
2552 '%Y-%m-%d %H:%M:%S.%f')
2553 summary.append(_CommentSummary(
2554 date=date,
2555 message=msg['message'],
2556 sender=msg['author']['email'],
2557 # These could be inferred from the text messages and correlated with
2558 # Code-Review label maximum, however this is not reliable.
2559 # Leaving as is until the need arises.
2560 approval=False,
2561 disapproval=False,
2562 ))
2563 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002564
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002565 def CloseIssue(self):
2566 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2567
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002568 def GetApprovingReviewers(self):
2569 """Returns a list of reviewers approving the change.
2570
2571 Note: not necessarily committers.
2572 """
2573 raise NotImplementedError()
2574
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002575 def SubmitIssue(self, wait_for_merge=True):
2576 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2577 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002578
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002579 def _GetChangeDetail(self, options=None, issue=None,
2580 no_cache=False):
2581 """Returns details of the issue by querying Gerrit and caching results.
2582
2583 If fresh data is needed, set no_cache=True which will clear cache and
2584 thus new data will be fetched from Gerrit.
2585 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002586 options = options or []
2587 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002588 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002589
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002590 # Optimization to avoid multiple RPCs:
2591 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2592 'CURRENT_COMMIT' not in options):
2593 options.append('CURRENT_COMMIT')
2594
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002595 # Normalize issue and options for consistent keys in cache.
2596 issue = str(issue)
2597 options = [o.upper() for o in options]
2598
2599 # Check in cache first unless no_cache is True.
2600 if no_cache:
2601 self._detail_cache.pop(issue, None)
2602 else:
2603 options_set = frozenset(options)
2604 for cached_options_set, data in self._detail_cache.get(issue, []):
2605 # Assumption: data fetched before with extra options is suitable
2606 # for return for a smaller set of options.
2607 # For example, if we cached data for
2608 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2609 # and request is for options=[CURRENT_REVISION],
2610 # THEN we can return prior cached data.
2611 if options_set.issubset(cached_options_set):
2612 return data
2613
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002614 try:
2615 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2616 options, ignore_404=False)
2617 except gerrit_util.GerritError as e:
2618 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002619 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002620 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002621
2622 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002623 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002624
agable32978d92016-11-01 12:55:02 -07002625 def _GetChangeCommit(self, issue=None):
2626 issue = issue or self.GetIssue()
2627 assert issue, 'issue is required to query Gerrit'
2628 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2629 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002630 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002631 return data
2632
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002633 def CMDLand(self, force, bypass_hooks, verbose):
2634 if git_common.is_dirty_git_tree('land'):
2635 return 1
tandriid60367b2016-06-22 05:25:12 -07002636 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2637 if u'Commit-Queue' in detail.get('labels', {}):
2638 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002639 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2640 'which can test and land changes for you. '
2641 'Are you sure you wish to bypass it?\n',
2642 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002643
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002644 differs = True
tandriic4344b52016-08-29 06:04:54 -07002645 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002646 # Note: git diff outputs nothing if there is no diff.
2647 if not last_upload or RunGit(['diff', last_upload]).strip():
2648 print('WARNING: some changes from local branch haven\'t been uploaded')
2649 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002650 if detail['current_revision'] == last_upload:
2651 differs = False
2652 else:
2653 print('WARNING: local branch contents differ from latest uploaded '
2654 'patchset')
2655 if differs:
2656 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002657 confirm_or_exit(
2658 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2659 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002660 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2661 elif not bypass_hooks:
2662 hook_results = self.RunHook(
2663 committing=True,
2664 may_prompt=not force,
2665 verbose=verbose,
2666 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2667 if not hook_results.should_continue():
2668 return 1
2669
2670 self.SubmitIssue(wait_for_merge=True)
2671 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002672 links = self._GetChangeCommit().get('web_links', [])
2673 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002674 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002675 print('Landed as %s' % link.get('url'))
2676 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002677 return 0
2678
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002679 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2680 directory):
2681 assert not reject
2682 assert not nocommit
2683 assert not directory
2684 assert parsed_issue_arg.valid
2685
2686 self._changelist.issue = parsed_issue_arg.issue
2687
2688 if parsed_issue_arg.hostname:
2689 self._gerrit_host = parsed_issue_arg.hostname
2690 self._gerrit_server = 'https://%s' % self._gerrit_host
2691
tandriic2405f52016-10-10 08:13:15 -07002692 try:
2693 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002694 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002695 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002696
2697 if not parsed_issue_arg.patchset:
2698 # Use current revision by default.
2699 revision_info = detail['revisions'][detail['current_revision']]
2700 patchset = int(revision_info['_number'])
2701 else:
2702 patchset = parsed_issue_arg.patchset
2703 for revision_info in detail['revisions'].itervalues():
2704 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2705 break
2706 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002707 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002708 (parsed_issue_arg.patchset, self.GetIssue()))
2709
2710 fetch_info = revision_info['fetch']['http']
2711 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002712 self.SetIssue(self.GetIssue())
2713 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002714 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002715 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002716 (self.GetIssue(), self.GetPatchset()))
2717 return 0
2718
2719 @staticmethod
2720 def ParseIssueURL(parsed_url):
2721 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2722 return None
2723 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2724 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2725 # Short urls like https://domain/<issue_number> can be used, but don't allow
2726 # specifying the patchset (you'd 404), but we allow that here.
2727 if parsed_url.path == '/':
2728 part = parsed_url.fragment
2729 else:
2730 part = parsed_url.path
2731 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2732 if match:
2733 return _ParsedIssueNumberArgument(
2734 issue=int(match.group(2)),
2735 patchset=int(match.group(4)) if match.group(4) else None,
2736 hostname=parsed_url.netloc)
2737 return None
2738
tandrii16e0b4e2016-06-07 10:34:28 -07002739 def _GerritCommitMsgHookCheck(self, offer_removal):
2740 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2741 if not os.path.exists(hook):
2742 return
2743 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2744 # custom developer made one.
2745 data = gclient_utils.FileRead(hook)
2746 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2747 return
2748 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002749 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002750 'and may interfere with it in subtle ways.\n'
2751 'We recommend you remove the commit-msg hook.')
2752 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002753 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002754 gclient_utils.rm_file_or_tree(hook)
2755 print('Gerrit commit-msg hook removed.')
2756 else:
2757 print('OK, will keep Gerrit commit-msg hook in place.')
2758
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002759 def CMDUploadChange(self, options, args, change):
2760 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002761 if options.squash and options.no_squash:
2762 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002763
2764 if not options.squash and not options.no_squash:
2765 # Load default for user, repo, squash=true, in this order.
2766 options.squash = settings.GetSquashGerritUploads()
2767 elif options.no_squash:
2768 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002769
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002770 # We assume the remote called "origin" is the one we want.
2771 # It is probably not worthwhile to support different workflows.
2772 gerrit_remote = 'origin'
2773
2774 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002775 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002776
Aaron Gableb56ad332017-01-06 15:24:31 -08002777 # This may be None; default fallback value is determined in logic below.
2778 title = options.title
Aaron Gable856585d2017-01-23 15:32:00 -08002779 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002780
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002781 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002782 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002783 if self.GetIssue():
2784 # Try to get the message from a previous upload.
2785 message = self.GetDescription()
2786 if not message:
2787 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002788 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002789 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002790 if not title:
2791 default_title = RunGit(['show', '-s', '--format=%s', 'HEAD']).strip()
2792 title = ask_for_data(
2793 'Title for patchset [%s]: ' % default_title) or default_title
Aaron Gable856585d2017-01-23 15:32:00 -08002794 if title == default_title:
2795 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002796 change_id = self._GetChangeDetail()['change_id']
2797 while True:
2798 footer_change_ids = git_footers.get_footer_change_id(message)
2799 if footer_change_ids == [change_id]:
2800 break
2801 if not footer_change_ids:
2802 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002803 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002804 continue
2805 # There is already a valid footer but with different or several ids.
2806 # Doing this automatically is non-trivial as we don't want to lose
2807 # existing other footers, yet we want to append just 1 desired
2808 # Change-Id. Thus, just create a new footer, but let user verify the
2809 # new description.
2810 message = '%s\n\nChange-Id: %s' % (message, change_id)
2811 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002812 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002813 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002814 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002815 'Please, check the proposed correction to the description, '
2816 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2817 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2818 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002819 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002820 if not options.force:
2821 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002822 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002823 message = change_desc.description
2824 if not message:
2825 DieWithError("Description is empty. Aborting...")
2826 # Continue the while loop.
2827 # Sanity check of this code - we should end up with proper message
2828 # footer.
2829 assert [change_id] == git_footers.get_footer_change_id(message)
2830 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002831 else: # if not self.GetIssue()
2832 if options.message:
2833 message = options.message
2834 else:
2835 message = CreateDescriptionFromLog(args)
2836 if options.title:
2837 message = options.title + '\n\n' + message
2838 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002839 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002840 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002841 # On first upload, patchset title is always this string, while
2842 # --title flag gets converted to first line of message.
2843 title = 'Initial upload'
Aaron Gable856585d2017-01-23 15:32:00 -08002844 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002845 if not change_desc.description:
2846 DieWithError("Description is empty. Aborting...")
2847 message = change_desc.description
2848 change_ids = git_footers.get_footer_change_id(message)
2849 if len(change_ids) > 1:
2850 DieWithError('too many Change-Id footers, at most 1 allowed.')
2851 if not change_ids:
2852 # Generate the Change-Id automatically.
2853 message = git_footers.add_footer_change_id(
2854 message, GenerateGerritChangeId(message))
2855 change_desc.set_description(message)
2856 change_ids = git_footers.get_footer_change_id(message)
2857 assert len(change_ids) == 1
2858 change_id = change_ids[0]
2859
2860 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2861 if remote is '.':
2862 # If our upstream branch is local, we base our squashed commit on its
2863 # squashed version.
2864 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2865 # Check the squashed hash of the parent.
2866 parent = RunGit(['config',
2867 'branch.%s.gerritsquashhash' % upstream_branch_name],
2868 error_ok=True).strip()
2869 # Verify that the upstream branch has been uploaded too, otherwise
2870 # Gerrit will create additional CLs when uploading.
2871 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2872 RunGitSilent(['rev-parse', parent + ':'])):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002873 DieWithError(
Aaron Gable48746652017-01-06 11:49:21 -08002874 '\nUpload upstream branch %s first.\n'
2875 'It is likely that this branch has been rebased since its last '
2876 'upload, so you just need to upload it again.\n'
2877 '(If you uploaded it with --no-squash, then branch dependencies '
2878 'are not supported, and you should reupload with --squash.)'
Christopher Lamf732cd52017-01-24 12:40:11 +11002879 % upstream_branch_name, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880 else:
2881 parent = self.GetCommonAncestorWithUpstream()
2882
2883 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2884 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2885 '-m', message]).strip()
2886 else:
2887 change_desc = ChangeDescription(
2888 options.message or CreateDescriptionFromLog(args))
2889 if not change_desc.description:
2890 DieWithError("Description is empty. Aborting...")
2891
2892 if not git_footers.get_footer_change_id(change_desc.description):
2893 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002894 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2895 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002896 ref_to_push = 'HEAD'
2897 parent = '%s/%s' % (gerrit_remote, branch)
2898 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2899
2900 assert change_desc
2901 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2902 ref_to_push)]).splitlines()
2903 if len(commits) > 1:
2904 print('WARNING: This will upload %d commits. Run the following command '
2905 'to see which commits will be uploaded: ' % len(commits))
2906 print('git log %s..%s' % (parent, ref_to_push))
2907 print('You can also use `git squash-branch` to squash these into a '
2908 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002909 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002910
2911 if options.reviewers or options.tbr_owners:
2912 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2913 change)
2914
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002915 # Extra options that can be specified at push time. Doc:
2916 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2917 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002918 if change_desc.get_reviewers(tbr_only=True):
2919 print('Adding self-LGTM (Code-Review +1) because of TBRs')
2920 refspec_opts.append('l=Code-Review+1')
2921
Aaron Gable9b713dd2016-12-14 16:04:21 -08002922 if title:
2923 if not re.match(r'^[\w ]+$', title):
2924 title = re.sub(r'[^\w ]', '', title)
Aaron Gable856585d2017-01-23 15:32:00 -08002925 if not automatic_title:
2926 print('WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08002927 'and spaces. You can edit it in the UI. '
2928 'See https://crbug.com/663787.\n'
2929 'Cleaned up title: %s' % title)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002930 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2931 # reverse on its side.
Aaron Gable9b713dd2016-12-14 16:04:21 -08002932 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002933
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002934 if options.send_mail:
2935 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002936 DieWithError('Must specify reviewers to send email.', change_desc)
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002937 refspec_opts.append('notify=ALL')
2938 else:
2939 refspec_opts.append('notify=NONE')
2940
tandrii99a72f22016-08-17 14:33:24 -07002941 reviewers = change_desc.get_reviewers()
2942 if reviewers:
Andrii Shyshkalovaf3a9992017-02-09 14:18:01 +01002943 # TODO(tandrii): remove this horrible hack once (Poly)Gerrit fixes their
2944 # side for real (b/34702620).
2945 def clean_invisible_chars(email):
2946 return email.decode('unicode_escape').encode('ascii', 'ignore')
2947 refspec_opts.extend('r=' + clean_invisible_chars(email).strip()
2948 for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002949
agablec6787972016-09-09 16:13:34 -07002950 if options.private:
2951 refspec_opts.append('draft')
2952
rmistry9eadede2016-09-19 11:22:43 -07002953 if options.topic:
2954 # Documentation on Gerrit topics is here:
2955 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
2956 refspec_opts.append('topic=%s' % options.topic)
2957
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002958 refspec_suffix = ''
2959 if refspec_opts:
2960 refspec_suffix = '%' + ','.join(refspec_opts)
2961 assert ' ' not in refspec_suffix, (
2962 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002963 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002964
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002965 try:
2966 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01002967 ['git', 'push', self.GetRemoteUrl(), refspec],
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002968 print_stdout=True,
2969 # Flush after every line: useful for seeing progress when running as
2970 # recipe.
2971 filter_fn=lambda _: sys.stdout.flush())
2972 except subprocess2.CalledProcessError:
2973 DieWithError('Failed to create a change. Please examine output above '
Christopher Lamf732cd52017-01-24 12:40:11 +11002974 'for the reason of the failure. ', change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002975
2976 if options.squash:
2977 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2978 change_numbers = [m.group(1)
2979 for m in map(regex.match, push_stdout.splitlines())
2980 if m]
2981 if len(change_numbers) != 1:
2982 DieWithError(
2983 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11002984 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002985 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002986 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002987
2988 # Add cc's from the CC_LIST and --cc flag (if any).
2989 cc = self.GetCCList().split(',')
2990 if options.cc:
2991 cc.extend(options.cc)
2992 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07002993 if change_desc.get_cced():
2994 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07002995 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08002996 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08002997 self._GetGerritHost(), self.GetIssue(), cc,
2998 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002999 return 0
3000
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003001 def _AddChangeIdToCommitMessage(self, options, args):
3002 """Re-commits using the current message, assumes the commit hook is in
3003 place.
3004 """
3005 log_desc = options.message or CreateDescriptionFromLog(args)
3006 git_command = ['commit', '--amend', '-m', log_desc]
3007 RunGit(git_command)
3008 new_log_desc = CreateDescriptionFromLog(args)
3009 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003010 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003011 return new_log_desc
3012 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003013 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003014
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003015 def SetCQState(self, new_state):
3016 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003017 vote_map = {
3018 _CQState.NONE: 0,
3019 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003020 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003021 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003022 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3023 if new_state == _CQState.DRY_RUN:
3024 # Don't spam everybody reviewer/owner.
3025 kwargs['notify'] = 'NONE'
3026 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003027
tandriie113dfd2016-10-11 10:20:12 -07003028 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003029 try:
3030 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003031 except GerritChangeNotExists:
3032 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003033
3034 if data['status'] in ('ABANDONED', 'MERGED'):
3035 return 'CL %s is closed' % self.GetIssue()
3036
3037 def GetTryjobProperties(self, patchset=None):
3038 """Returns dictionary of properties to launch tryjob."""
3039 data = self._GetChangeDetail(['ALL_REVISIONS'])
3040 patchset = int(patchset or self.GetPatchset())
3041 assert patchset
3042 revision_data = None # Pylint wants it to be defined.
3043 for revision_data in data['revisions'].itervalues():
3044 if int(revision_data['_number']) == patchset:
3045 break
3046 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003047 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003048 (patchset, self.GetIssue()))
3049 return {
3050 'patch_issue': self.GetIssue(),
3051 'patch_set': patchset or self.GetPatchset(),
3052 'patch_project': data['project'],
3053 'patch_storage': 'gerrit',
3054 'patch_ref': revision_data['fetch']['http']['ref'],
3055 'patch_repository_url': revision_data['fetch']['http']['url'],
3056 'patch_gerrit_url': self.GetCodereviewServer(),
3057 }
tandriie113dfd2016-10-11 10:20:12 -07003058
tandriide281ae2016-10-12 06:02:30 -07003059 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003060 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003061
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003062
3063_CODEREVIEW_IMPLEMENTATIONS = {
3064 'rietveld': _RietveldChangelistImpl,
3065 'gerrit': _GerritChangelistImpl,
3066}
3067
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003068
iannuccie53c9352016-08-17 14:40:40 -07003069def _add_codereview_issue_select_options(parser, extra=""):
3070 _add_codereview_select_options(parser)
3071
3072 text = ('Operate on this issue number instead of the current branch\'s '
3073 'implicit issue.')
3074 if extra:
3075 text += ' '+extra
3076 parser.add_option('-i', '--issue', type=int, help=text)
3077
3078
3079def _process_codereview_issue_select_options(parser, options):
3080 _process_codereview_select_options(parser, options)
3081 if options.issue is not None and not options.forced_codereview:
3082 parser.error('--issue must be specified with either --rietveld or --gerrit')
3083
3084
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003085def _add_codereview_select_options(parser):
3086 """Appends --gerrit and --rietveld options to force specific codereview."""
3087 parser.codereview_group = optparse.OptionGroup(
3088 parser, 'EXPERIMENTAL! Codereview override options')
3089 parser.add_option_group(parser.codereview_group)
3090 parser.codereview_group.add_option(
3091 '--gerrit', action='store_true',
3092 help='Force the use of Gerrit for codereview')
3093 parser.codereview_group.add_option(
3094 '--rietveld', action='store_true',
3095 help='Force the use of Rietveld for codereview')
3096
3097
3098def _process_codereview_select_options(parser, options):
3099 if options.gerrit and options.rietveld:
3100 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3101 options.forced_codereview = None
3102 if options.gerrit:
3103 options.forced_codereview = 'gerrit'
3104 elif options.rietveld:
3105 options.forced_codereview = 'rietveld'
3106
3107
tandriif9aefb72016-07-01 09:06:51 -07003108def _get_bug_line_values(default_project, bugs):
3109 """Given default_project and comma separated list of bugs, yields bug line
3110 values.
3111
3112 Each bug can be either:
3113 * a number, which is combined with default_project
3114 * string, which is left as is.
3115
3116 This function may produce more than one line, because bugdroid expects one
3117 project per line.
3118
3119 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3120 ['v8:123', 'chromium:789']
3121 """
3122 default_bugs = []
3123 others = []
3124 for bug in bugs.split(','):
3125 bug = bug.strip()
3126 if bug:
3127 try:
3128 default_bugs.append(int(bug))
3129 except ValueError:
3130 others.append(bug)
3131
3132 if default_bugs:
3133 default_bugs = ','.join(map(str, default_bugs))
3134 if default_project:
3135 yield '%s:%s' % (default_project, default_bugs)
3136 else:
3137 yield default_bugs
3138 for other in sorted(others):
3139 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3140 yield other
3141
3142
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003143class ChangeDescription(object):
3144 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003145 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003146 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003147 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003148 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003149
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003150 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003151 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003152
agable@chromium.org42c20792013-09-12 17:34:49 +00003153 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003154 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003155 return '\n'.join(self._description_lines)
3156
3157 def set_description(self, desc):
3158 if isinstance(desc, basestring):
3159 lines = desc.splitlines()
3160 else:
3161 lines = [line.rstrip() for line in desc]
3162 while lines and not lines[0]:
3163 lines.pop(0)
3164 while lines and not lines[-1]:
3165 lines.pop(-1)
3166 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003167
piman@chromium.org336f9122014-09-04 02:16:55 +00003168 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003169 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003170 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003171 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003172 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003173 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003174
agable@chromium.org42c20792013-09-12 17:34:49 +00003175 # Get the set of R= and TBR= lines and remove them from the desciption.
3176 regexp = re.compile(self.R_LINE)
3177 matches = [regexp.match(line) for line in self._description_lines]
3178 new_desc = [l for i, l in enumerate(self._description_lines)
3179 if not matches[i]]
3180 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003181
agable@chromium.org42c20792013-09-12 17:34:49 +00003182 # Construct new unified R= and TBR= lines.
3183 r_names = []
3184 tbr_names = []
3185 for match in matches:
3186 if not match:
3187 continue
3188 people = cleanup_list([match.group(2).strip()])
3189 if match.group(1) == 'TBR':
3190 tbr_names.extend(people)
3191 else:
3192 r_names.extend(people)
3193 for name in r_names:
3194 if name not in reviewers:
3195 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003196 if add_owners_tbr:
3197 owners_db = owners.Database(change.RepositoryRoot(),
dtu944b6052016-07-14 14:48:21 -07003198 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003199 all_reviewers = set(tbr_names + reviewers)
3200 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3201 all_reviewers)
3202 tbr_names.extend(owners_db.reviewers_for(missing_files,
3203 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003204 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3205 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3206
3207 # Put the new lines in the description where the old first R= line was.
3208 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3209 if 0 <= line_loc < len(self._description_lines):
3210 if new_tbr_line:
3211 self._description_lines.insert(line_loc, new_tbr_line)
3212 if new_r_line:
3213 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003214 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003215 if new_r_line:
3216 self.append_footer(new_r_line)
3217 if new_tbr_line:
3218 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003219
Aaron Gable3a16ed12017-03-23 10:51:55 -07003220 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003221 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003222 self.set_description([
3223 '# Enter a description of the change.',
3224 '# This will be displayed on the codereview site.',
3225 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003226 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003227 '--------------------',
3228 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003229
agable@chromium.org42c20792013-09-12 17:34:49 +00003230 regexp = re.compile(self.BUG_LINE)
3231 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003232 prefix = settings.GetBugPrefix()
3233 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003234 if git_footer:
3235 self.append_footer('Bug: %s' % ', '.join(values))
3236 else:
3237 for value in values:
3238 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003239
agable@chromium.org42c20792013-09-12 17:34:49 +00003240 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003241 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003242 if not content:
3243 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003244 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003245
3246 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003247 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3248 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003249 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003250 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003251
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003252 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003253 """Adds a footer line to the description.
3254
3255 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3256 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3257 that Gerrit footers are always at the end.
3258 """
3259 parsed_footer_line = git_footers.parse_footer(line)
3260 if parsed_footer_line:
3261 # Line is a gerrit footer in the form: Footer-Key: any value.
3262 # Thus, must be appended observing Gerrit footer rules.
3263 self.set_description(
3264 git_footers.add_footer(self.description,
3265 key=parsed_footer_line[0],
3266 value=parsed_footer_line[1]))
3267 return
3268
3269 if not self._description_lines:
3270 self._description_lines.append(line)
3271 return
3272
3273 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3274 if gerrit_footers:
3275 # git_footers.split_footers ensures that there is an empty line before
3276 # actual (gerrit) footers, if any. We have to keep it that way.
3277 assert top_lines and top_lines[-1] == ''
3278 top_lines, separator = top_lines[:-1], top_lines[-1:]
3279 else:
3280 separator = [] # No need for separator if there are no gerrit_footers.
3281
3282 prev_line = top_lines[-1] if top_lines else ''
3283 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3284 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3285 top_lines.append('')
3286 top_lines.append(line)
3287 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003288
tandrii99a72f22016-08-17 14:33:24 -07003289 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003290 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003291 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003292 reviewers = [match.group(2).strip()
3293 for match in matches
3294 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003295 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003296
bradnelsond975b302016-10-23 12:20:23 -07003297 def get_cced(self):
3298 """Retrieves the list of reviewers."""
3299 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3300 cced = [match.group(2).strip() for match in matches if match]
3301 return cleanup_list(cced)
3302
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003303 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3304 """Updates this commit description given the parent.
3305
3306 This is essentially what Gnumbd used to do.
3307 Consult https://goo.gl/WMmpDe for more details.
3308 """
3309 assert parent_msg # No, orphan branch creation isn't supported.
3310 assert parent_hash
3311 assert dest_ref
3312 parent_footer_map = git_footers.parse_footers(parent_msg)
3313 # This will also happily parse svn-position, which GnumbD is no longer
3314 # supporting. While we'd generate correct footers, the verifier plugin
3315 # installed in Gerrit will block such commit (ie git push below will fail).
3316 parent_position = git_footers.get_position(parent_footer_map)
3317
3318 # Cherry-picks may have last line obscuring their prior footers,
3319 # from git_footers perspective. This is also what Gnumbd did.
3320 cp_line = None
3321 if (self._description_lines and
3322 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3323 cp_line = self._description_lines.pop()
3324
3325 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3326
3327 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3328 # user interference with actual footers we'd insert below.
3329 for i, (k, v) in enumerate(parsed_footers):
3330 if k.startswith('Cr-'):
3331 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3332
3333 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003334 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003335 if parent_position[0] == dest_ref:
3336 # Same branch as parent.
3337 number = int(parent_position[1]) + 1
3338 else:
3339 number = 1 # New branch, and extra lineage.
3340 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3341 int(parent_position[1])))
3342
3343 parsed_footers.append(('Cr-Commit-Position',
3344 '%s@{#%d}' % (dest_ref, number)))
3345 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3346
3347 self._description_lines = top_lines
3348 if cp_line:
3349 self._description_lines.append(cp_line)
3350 if self._description_lines[-1] != '':
3351 self._description_lines.append('') # Ensure footer separator.
3352 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3353
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003354
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003355def get_approving_reviewers(props):
3356 """Retrieves the reviewers that approved a CL from the issue properties with
3357 messages.
3358
3359 Note that the list may contain reviewers that are not committer, thus are not
3360 considered by the CQ.
3361 """
3362 return sorted(
3363 set(
3364 message['sender']
3365 for message in props['messages']
3366 if message['approval'] and message['sender'] in props['reviewers']
3367 )
3368 )
3369
3370
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003371def FindCodereviewSettingsFile(filename='codereview.settings'):
3372 """Finds the given file starting in the cwd and going up.
3373
3374 Only looks up to the top of the repository unless an
3375 'inherit-review-settings-ok' file exists in the root of the repository.
3376 """
3377 inherit_ok_file = 'inherit-review-settings-ok'
3378 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003379 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003380 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3381 root = '/'
3382 while True:
3383 if filename in os.listdir(cwd):
3384 if os.path.isfile(os.path.join(cwd, filename)):
3385 return open(os.path.join(cwd, filename))
3386 if cwd == root:
3387 break
3388 cwd = os.path.dirname(cwd)
3389
3390
3391def LoadCodereviewSettingsFromFile(fileobj):
3392 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003393 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003394
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003395 def SetProperty(name, setting, unset_error_ok=False):
3396 fullname = 'rietveld.' + name
3397 if setting in keyvals:
3398 RunGit(['config', fullname, keyvals[setting]])
3399 else:
3400 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3401
tandrii48df5812016-10-17 03:55:37 -07003402 if not keyvals.get('GERRIT_HOST', False):
3403 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003404 # Only server setting is required. Other settings can be absent.
3405 # In that case, we ignore errors raised during option deletion attempt.
3406 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003407 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003408 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3409 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003410 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003411 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3412 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003413 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003414 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3415 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003416
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003417 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003418 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003419
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003420 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003421 RunGit(['config', 'gerrit.squash-uploads',
3422 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003423
tandrii@chromium.org28253532016-04-14 13:46:56 +00003424 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003425 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003426 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3427
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003428 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003429 # should be of the form
3430 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3431 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003432 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3433 keyvals['ORIGIN_URL_CONFIG']])
3434
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003436def urlretrieve(source, destination):
3437 """urllib is broken for SSL connections via a proxy therefore we
3438 can't use urllib.urlretrieve()."""
3439 with open(destination, 'w') as f:
3440 f.write(urllib2.urlopen(source).read())
3441
3442
ukai@chromium.org712d6102013-11-27 00:52:58 +00003443def hasSheBang(fname):
3444 """Checks fname is a #! script."""
3445 with open(fname) as f:
3446 return f.read(2).startswith('#!')
3447
3448
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003449# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3450def DownloadHooks(*args, **kwargs):
3451 pass
3452
3453
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003454def DownloadGerritHook(force):
3455 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003456
3457 Args:
3458 force: True to update hooks. False to install hooks if not present.
3459 """
3460 if not settings.GetIsGerrit():
3461 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003462 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003463 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3464 if not os.access(dst, os.X_OK):
3465 if os.path.exists(dst):
3466 if not force:
3467 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003468 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003469 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003470 if not hasSheBang(dst):
3471 DieWithError('Not a script: %s\n'
3472 'You need to download from\n%s\n'
3473 'into .git/hooks/commit-msg and '
3474 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003475 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3476 except Exception:
3477 if os.path.exists(dst):
3478 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003479 DieWithError('\nFailed to download hooks.\n'
3480 'You need to download from\n%s\n'
3481 'into .git/hooks/commit-msg and '
3482 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003483
3484
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003485def GetRietveldCodereviewSettingsInteractively():
3486 """Prompt the user for settings."""
3487 server = settings.GetDefaultServerUrl(error_ok=True)
3488 prompt = 'Rietveld server (host[:port])'
3489 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3490 newserver = ask_for_data(prompt + ':')
3491 if not server and not newserver:
3492 newserver = DEFAULT_SERVER
3493 if newserver:
3494 newserver = gclient_utils.UpgradeToHttps(newserver)
3495 if newserver != server:
3496 RunGit(['config', 'rietveld.server', newserver])
3497
3498 def SetProperty(initial, caption, name, is_url):
3499 prompt = caption
3500 if initial:
3501 prompt += ' ("x" to clear) [%s]' % initial
3502 new_val = ask_for_data(prompt + ':')
3503 if new_val == 'x':
3504 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3505 elif new_val:
3506 if is_url:
3507 new_val = gclient_utils.UpgradeToHttps(new_val)
3508 if new_val != initial:
3509 RunGit(['config', 'rietveld.' + name, new_val])
3510
3511 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3512 SetProperty(settings.GetDefaultPrivateFlag(),
3513 'Private flag (rietveld only)', 'private', False)
3514 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3515 'tree-status-url', False)
3516 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3517 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3518 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3519 'run-post-upload-hook', False)
3520
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003521
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003522class _GitCookiesChecker(object):
3523 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003524
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003525 _GOOGLESOURCE = 'googlesource.com'
3526
3527 def __init__(self):
3528 # Cached list of [host, identity, source], where source is either
3529 # .gitcookies or .netrc.
3530 self._all_hosts = None
3531
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003532 def ensure_configured_gitcookies(self):
3533 """Runs checks and suggests fixes to make git use .gitcookies from default
3534 path."""
3535 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3536 configured_path = RunGitSilent(
3537 ['config', '--global', 'http.cookiefile']).strip()
3538 if configured_path:
3539 self._ensure_default_gitcookies_path(configured_path, default)
3540 else:
3541 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003542
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003543 @staticmethod
3544 def _ensure_default_gitcookies_path(configured_path, default_path):
3545 assert configured_path
3546 if configured_path == default_path:
3547 print('git is already configured to use your .gitcookies from %s' %
3548 configured_path)
3549 return
3550
3551 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3552 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3553 (configured_path, default_path))
3554
3555 if not os.path.exists(configured_path):
3556 print('However, your configured .gitcookies file is missing.')
3557 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3558 action='reconfigure')
3559 RunGit(['config', '--global', 'http.cookiefile', default_path])
3560 return
3561
3562 if os.path.exists(default_path):
3563 print('WARNING: default .gitcookies file already exists %s' %
3564 default_path)
3565 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3566 default_path)
3567
3568 confirm_or_exit('Move existing .gitcookies to default location?',
3569 action='move')
3570 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003571 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003572 print('Moved and reconfigured git to use .gitcookies from %s' %
3573 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003574
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003575 @staticmethod
3576 def _configure_gitcookies_path(default_path):
3577 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3578 if os.path.exists(netrc_path):
3579 print('You seem to be using outdated .netrc for git credentials: %s' %
3580 netrc_path)
3581 print('This tool will guide you through setting up recommended '
3582 '.gitcookies store for git credentials.\n'
3583 '\n'
3584 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3585 ' git config --global --unset http.cookiefile\n'
3586 ' mv %s %s.backup\n\n' % (default_path, default_path))
3587 confirm_or_exit(action='setup .gitcookies')
3588 RunGit(['config', '--global', 'http.cookiefile', default_path])
3589 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003590
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003591 def get_hosts_with_creds(self, include_netrc=False):
3592 if self._all_hosts is None:
3593 a = gerrit_util.CookiesAuthenticator()
3594 self._all_hosts = [
3595 (h, u, s)
3596 for h, u, s in itertools.chain(
3597 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3598 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3599 )
3600 if h.endswith(self._GOOGLESOURCE)
3601 ]
3602
3603 if include_netrc:
3604 return self._all_hosts
3605 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3606
3607 def print_current_creds(self, include_netrc=False):
3608 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3609 if not hosts:
3610 print('No Git/Gerrit credentials found')
3611 return
3612 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3613 header = [('Host', 'User', 'Which file'),
3614 ['=' * l for l in lengths]]
3615 for row in (header + hosts):
3616 print('\t'.join((('%%+%ds' % l) % s)
3617 for l, s in zip(lengths, row)))
3618
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003619 @staticmethod
3620 def _parse_identity(identity):
3621 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3622 username, domain = identity.split('.', 1)
3623 if username.startswith('git-'):
3624 username = username[len('git-'):]
3625 return username, domain
3626
3627 def _get_usernames_of_domain(self, domain):
3628 """Returns list of usernames referenced by .gitcookies in a given domain."""
3629 identities_by_domain = {}
3630 for _, identity, _ in self.get_hosts_with_creds():
3631 username, domain = self._parse_identity(identity)
3632 identities_by_domain.setdefault(domain, []).append(username)
3633 return identities_by_domain.get(domain)
3634
3635 def _canonical_git_googlesource_host(self, host):
3636 """Normalizes Gerrit hosts (with '-review') to Git host."""
3637 assert host.endswith(self._GOOGLESOURCE)
3638 # Prefix doesn't include '.' at the end.
3639 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3640 if prefix.endswith('-review'):
3641 prefix = prefix[:-len('-review')]
3642 return prefix + '.' + self._GOOGLESOURCE
3643
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003644 def _canonical_gerrit_googlesource_host(self, host):
3645 git_host = self._canonical_git_googlesource_host(host)
3646 prefix = git_host.split('.', 1)[0]
3647 return prefix + '-review.' + self._GOOGLESOURCE
3648
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003649 def has_generic_host(self):
3650 """Returns whether generic .googlesource.com has been configured.
3651
3652 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3653 """
3654 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3655 if host == '.' + self._GOOGLESOURCE:
3656 return True
3657 return False
3658
3659 def _get_git_gerrit_identity_pairs(self):
3660 """Returns map from canonic host to pair of identities (Git, Gerrit).
3661
3662 One of identities might be None, meaning not configured.
3663 """
3664 host_to_identity_pairs = {}
3665 for host, identity, _ in self.get_hosts_with_creds():
3666 canonical = self._canonical_git_googlesource_host(host)
3667 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3668 idx = 0 if canonical == host else 1
3669 pair[idx] = identity
3670 return host_to_identity_pairs
3671
3672 def get_partially_configured_hosts(self):
3673 return set(
3674 host for host, identities_pair in
3675 self._get_git_gerrit_identity_pairs().iteritems()
3676 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3677
3678 def get_conflicting_hosts(self):
3679 return set(
3680 host for host, (i1, i2) in
3681 self._get_git_gerrit_identity_pairs().iteritems()
3682 if None not in (i1, i2) and i1 != i2)
3683
3684 def get_duplicated_hosts(self):
3685 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3686 return set(host for host, count in counters.iteritems() if count > 1)
3687
3688 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3689 'chromium.googlesource.com': 'chromium.org',
3690 'chrome-internal.googlesource.com': 'google.com',
3691 }
3692
3693 def get_hosts_with_wrong_identities(self):
3694 """Finds hosts which **likely** reference wrong identities.
3695
3696 Note: skips hosts which have conflicting identities for Git and Gerrit.
3697 """
3698 hosts = set()
3699 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3700 pair = self._get_git_gerrit_identity_pairs().get(host)
3701 if pair and pair[0] == pair[1]:
3702 _, domain = self._parse_identity(pair[0])
3703 if domain != expected:
3704 hosts.add(host)
3705 return hosts
3706
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003707 @staticmethod
3708 def print_hosts(hosts, extra_column_func=None):
3709 hosts = sorted(hosts)
3710 assert hosts
3711 if extra_column_func is None:
3712 extras = [''] * len(hosts)
3713 else:
3714 extras = [extra_column_func(host) for host in hosts]
3715 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3716 for he in zip(hosts, extras):
3717 print(tmpl % he)
3718 print()
3719
3720 def find_and_report_problems(self):
3721 """Returns True if there was at least one problem, else False."""
3722 problems = [False]
3723 def add_problem():
3724 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003725 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003726 problems[0] = True
3727
3728 if self.has_generic_host():
3729 add_problem()
3730 print(' .googlesource.com record detected\n'
3731 ' Chrome Infrastructure team recommends to list full host names '
3732 'explicitly.\n')
3733
3734 dups = self.get_duplicated_hosts()
3735 if dups:
3736 add_problem()
3737 print(' The following hosts were defined twice:\n')
3738 self.print_hosts(dups)
3739
3740 partial = self.get_partially_configured_hosts()
3741 if partial:
3742 add_problem()
3743 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3744 'These hosts are missing:')
3745 self.print_hosts(partial)
3746
3747 conflicting = self.get_conflicting_hosts()
3748 if conflicting:
3749 add_problem()
3750 print(' The following Git hosts have differing credentials from their '
3751 'Gerrit counterparts:\n')
3752 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3753 tuple(self._get_git_gerrit_identity_pairs()[host]))
3754
3755 wrong = self.get_hosts_with_wrong_identities()
3756 if wrong:
3757 add_problem()
3758 print(' These hosts likely use wrong identity:\n')
3759 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3760 (self._get_git_gerrit_identity_pairs()[host][0],
3761 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3762 return problems[0]
3763
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003764
3765def CMDcreds_check(parser, args):
3766 """Checks credentials and suggests changes."""
3767 _, _ = parser.parse_args(args)
3768
3769 if gerrit_util.GceAuthenticator.is_gce():
3770 DieWithError('this command is not designed for GCE, are you on a bot?')
3771
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003772 checker = _GitCookiesChecker()
3773 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003774
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003775 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003776 checker.print_current_creds(include_netrc=True)
3777
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003778 if not checker.find_and_report_problems():
3779 print('\nNo problems detected in your .gitcookies')
3780 return 0
3781 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003782
3783
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003784@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003785def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003786 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003787
tandrii5d0a0422016-09-14 06:24:35 -07003788 print('WARNING: git cl config works for Rietveld only')
3789 # TODO(tandrii): remove this once we switch to Gerrit.
3790 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003791 parser.add_option('--activate-update', action='store_true',
3792 help='activate auto-updating [rietveld] section in '
3793 '.git/config')
3794 parser.add_option('--deactivate-update', action='store_true',
3795 help='deactivate auto-updating [rietveld] section in '
3796 '.git/config')
3797 options, args = parser.parse_args(args)
3798
3799 if options.deactivate_update:
3800 RunGit(['config', 'rietveld.autoupdate', 'false'])
3801 return
3802
3803 if options.activate_update:
3804 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3805 return
3806
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003807 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003808 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003809 return 0
3810
3811 url = args[0]
3812 if not url.endswith('codereview.settings'):
3813 url = os.path.join(url, 'codereview.settings')
3814
3815 # Load code review settings and download hooks (if available).
3816 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3817 return 0
3818
3819
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003820def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003821 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003822 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3823 branch = ShortBranchName(branchref)
3824 _, args = parser.parse_args(args)
3825 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003826 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003827 return RunGit(['config', 'branch.%s.base-url' % branch],
3828 error_ok=False).strip()
3829 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003830 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003831 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3832 error_ok=False).strip()
3833
3834
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003835def color_for_status(status):
3836 """Maps a Changelist status to color, for CMDstatus and other tools."""
3837 return {
3838 'unsent': Fore.RED,
3839 'waiting': Fore.BLUE,
3840 'reply': Fore.YELLOW,
3841 'lgtm': Fore.GREEN,
3842 'commit': Fore.MAGENTA,
3843 'closed': Fore.CYAN,
3844 'error': Fore.WHITE,
3845 }.get(status, Fore.WHITE)
3846
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003847
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003848def get_cl_statuses(changes, fine_grained, max_processes=None):
3849 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003850
3851 If fine_grained is true, this will fetch CL statuses from the server.
3852 Otherwise, simply indicate if there's a matching url for the given branches.
3853
3854 If max_processes is specified, it is used as the maximum number of processes
3855 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3856 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003857
3858 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003859 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003860 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003861 upload.verbosity = 0
3862
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003863 if not changes:
3864 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003865
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003866 if not fine_grained:
3867 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003868 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003869 for cl in changes:
3870 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003871 return
3872
3873 # First, sort out authentication issues.
3874 logging.debug('ensuring credentials exist')
3875 for cl in changes:
3876 cl.EnsureAuthenticated(force=False, refresh=True)
3877
3878 def fetch(cl):
3879 try:
3880 return (cl, cl.GetStatus())
3881 except:
3882 # See http://crbug.com/629863.
3883 logging.exception('failed to fetch status for %s:', cl)
3884 raise
3885
3886 threads_count = len(changes)
3887 if max_processes:
3888 threads_count = max(1, min(threads_count, max_processes))
3889 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3890
3891 pool = ThreadPool(threads_count)
3892 fetched_cls = set()
3893 try:
3894 it = pool.imap_unordered(fetch, changes).__iter__()
3895 while True:
3896 try:
3897 cl, status = it.next(timeout=5)
3898 except multiprocessing.TimeoutError:
3899 break
3900 fetched_cls.add(cl)
3901 yield cl, status
3902 finally:
3903 pool.close()
3904
3905 # Add any branches that failed to fetch.
3906 for cl in set(changes) - fetched_cls:
3907 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003908
rmistry@google.com2dd99862015-06-22 12:22:18 +00003909
3910def upload_branch_deps(cl, args):
3911 """Uploads CLs of local branches that are dependents of the current branch.
3912
3913 If the local branch dependency tree looks like:
3914 test1 -> test2.1 -> test3.1
3915 -> test3.2
3916 -> test2.2 -> test3.3
3917
3918 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3919 run on the dependent branches in this order:
3920 test2.1, test3.1, test3.2, test2.2, test3.3
3921
3922 Note: This function does not rebase your local dependent branches. Use it when
3923 you make a change to the parent branch that will not conflict with its
3924 dependent branches, and you would like their dependencies updated in
3925 Rietveld.
3926 """
3927 if git_common.is_dirty_git_tree('upload-branch-deps'):
3928 return 1
3929
3930 root_branch = cl.GetBranch()
3931 if root_branch is None:
3932 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3933 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01003934 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003935 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3936 'patchset dependencies without an uploaded CL.')
3937
3938 branches = RunGit(['for-each-ref',
3939 '--format=%(refname:short) %(upstream:short)',
3940 'refs/heads'])
3941 if not branches:
3942 print('No local branches found.')
3943 return 0
3944
3945 # Create a dictionary of all local branches to the branches that are dependent
3946 # on it.
3947 tracked_to_dependents = collections.defaultdict(list)
3948 for b in branches.splitlines():
3949 tokens = b.split()
3950 if len(tokens) == 2:
3951 branch_name, tracked = tokens
3952 tracked_to_dependents[tracked].append(branch_name)
3953
vapiera7fbd5a2016-06-16 09:17:49 -07003954 print()
3955 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003956 dependents = []
3957 def traverse_dependents_preorder(branch, padding=''):
3958 dependents_to_process = tracked_to_dependents.get(branch, [])
3959 padding += ' '
3960 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003961 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003962 dependents.append(dependent)
3963 traverse_dependents_preorder(dependent, padding)
3964 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003965 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003966
3967 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003968 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003969 return 0
3970
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003971 confirm_or_exit('This command will checkout all dependent branches and run '
3972 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003973
andybons@chromium.org962f9462016-02-03 20:00:42 +00003974 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003975 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003976 args.extend(['-t', 'Updated patchset dependency'])
3977
rmistry@google.com2dd99862015-06-22 12:22:18 +00003978 # Record all dependents that failed to upload.
3979 failures = {}
3980 # Go through all dependents, checkout the branch and upload.
3981 try:
3982 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003983 print()
3984 print('--------------------------------------')
3985 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003986 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003987 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003988 try:
3989 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003990 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003991 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003992 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00003993 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003994 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003995 finally:
3996 # Swap back to the original root branch.
3997 RunGit(['checkout', '-q', root_branch])
3998
vapiera7fbd5a2016-06-16 09:17:49 -07003999 print()
4000 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004001 for dependent_branch in dependents:
4002 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004003 print(' %s : %s' % (dependent_branch, upload_status))
4004 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004005
4006 return 0
4007
4008
kmarshall3bff56b2016-06-06 18:31:47 -07004009def CMDarchive(parser, args):
4010 """Archives and deletes branches associated with closed changelists."""
4011 parser.add_option(
4012 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004013 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004014 parser.add_option(
4015 '-f', '--force', action='store_true',
4016 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004017 parser.add_option(
4018 '-d', '--dry-run', action='store_true',
4019 help='Skip the branch tagging and removal steps.')
4020 parser.add_option(
4021 '-t', '--notags', action='store_true',
4022 help='Do not tag archived branches. '
4023 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004024
4025 auth.add_auth_options(parser)
4026 options, args = parser.parse_args(args)
4027 if args:
4028 parser.error('Unsupported args: %s' % ' '.join(args))
4029 auth_config = auth.extract_auth_config_from_options(options)
4030
4031 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4032 if not branches:
4033 return 0
4034
vapiera7fbd5a2016-06-16 09:17:49 -07004035 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004036 changes = [Changelist(branchref=b, auth_config=auth_config)
4037 for b in branches.splitlines()]
4038 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4039 statuses = get_cl_statuses(changes,
4040 fine_grained=True,
4041 max_processes=options.maxjobs)
4042 proposal = [(cl.GetBranch(),
4043 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4044 for cl, status in statuses
4045 if status == 'closed']
4046 proposal.sort()
4047
4048 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004050 return 0
4051
4052 current_branch = GetCurrentBranch()
4053
vapiera7fbd5a2016-06-16 09:17:49 -07004054 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004055 if options.notags:
4056 for next_item in proposal:
4057 print(' ' + next_item[0])
4058 else:
4059 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4060 for next_item in proposal:
4061 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004062
kmarshall9249e012016-08-23 12:02:16 -07004063 # Quit now on precondition failure or if instructed by the user, either
4064 # via an interactive prompt or by command line flags.
4065 if options.dry_run:
4066 print('\nNo changes were made (dry run).\n')
4067 return 0
4068 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004069 print('You are currently on a branch \'%s\' which is associated with a '
4070 'closed codereview issue, so archive cannot proceed. Please '
4071 'checkout another branch and run this command again.' %
4072 current_branch)
4073 return 1
kmarshall9249e012016-08-23 12:02:16 -07004074 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004075 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4076 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004078 return 1
4079
4080 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004081 if not options.notags:
4082 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004083 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004084
vapiera7fbd5a2016-06-16 09:17:49 -07004085 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004086
4087 return 0
4088
4089
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004091 """Show status of changelists.
4092
4093 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004094 - Red not sent for review or broken
4095 - Blue waiting for review
4096 - Yellow waiting for you to reply to review
4097 - Green LGTM'ed
4098 - Magenta in the commit queue
4099 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004100
4101 Also see 'git cl comments'.
4102 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004103 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004104 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004105 parser.add_option('-f', '--fast', action='store_true',
4106 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004107 parser.add_option(
4108 '-j', '--maxjobs', action='store', type=int,
4109 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004110
4111 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004112 _add_codereview_issue_select_options(
4113 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004114 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004115 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004116 if args:
4117 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004118 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004119
iannuccie53c9352016-08-17 14:40:40 -07004120 if options.issue is not None and not options.field:
4121 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004122
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004123 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004124 cl = Changelist(auth_config=auth_config, issue=options.issue,
4125 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004126 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004127 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004128 elif options.field == 'id':
4129 issueid = cl.GetIssue()
4130 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004131 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004132 elif options.field == 'patch':
4133 patchset = cl.GetPatchset()
4134 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004135 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004136 elif options.field == 'status':
4137 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004138 elif options.field == 'url':
4139 url = cl.GetIssueURL()
4140 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004141 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004142 return 0
4143
4144 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4145 if not branches:
4146 print('No local branch found.')
4147 return 0
4148
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004149 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004150 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004151 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004152 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004153 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004154 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004155 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004156
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004157 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004158 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4159 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4160 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004161 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004162 c, status = output.next()
4163 branch_statuses[c.GetBranch()] = status
4164 status = branch_statuses.pop(branch)
4165 url = cl.GetIssueURL()
4166 if url and (not status or status == 'error'):
4167 # The issue probably doesn't exist anymore.
4168 url += ' (broken)'
4169
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004170 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004171 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004172 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004173 color = ''
4174 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004175 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004177 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004178 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004179
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004180
4181 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004182 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004183 print('Current branch: %s' % branch)
4184 for cl in changes:
4185 if cl.GetBranch() == branch:
4186 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004187 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004188 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004189 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004190 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004191 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Issue description:')
4193 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194 return 0
4195
4196
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004197def colorize_CMDstatus_doc():
4198 """To be called once in main() to add colors to git cl status help."""
4199 colors = [i for i in dir(Fore) if i[0].isupper()]
4200
4201 def colorize_line(line):
4202 for color in colors:
4203 if color in line.upper():
4204 # Extract whitespaces first and the leading '-'.
4205 indent = len(line) - len(line.lstrip(' ')) + 1
4206 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4207 return line
4208
4209 lines = CMDstatus.__doc__.splitlines()
4210 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4211
4212
phajdan.jre328cf92016-08-22 04:12:17 -07004213def write_json(path, contents):
4214 with open(path, 'w') as f:
4215 json.dump(contents, f)
4216
4217
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004218@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004220 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004221
4222 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004223 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004224 parser.add_option('-r', '--reverse', action='store_true',
4225 help='Lookup the branch(es) for the specified issues. If '
4226 'no issues are specified, all branches with mapped '
4227 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004228 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004229 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004230 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004231 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004232
dnj@chromium.org406c4402015-03-03 17:22:28 +00004233 if options.reverse:
4234 branches = RunGit(['for-each-ref', 'refs/heads',
4235 '--format=%(refname:short)']).splitlines()
4236
4237 # Reverse issue lookup.
4238 issue_branch_map = {}
4239 for branch in branches:
4240 cl = Changelist(branchref=branch)
4241 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4242 if not args:
4243 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004244 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004245 for issue in args:
4246 if not issue:
4247 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004248 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004249 print('Branch for issue number %s: %s' % (
4250 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004251 if options.json:
4252 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004253 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004254 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004255 if len(args) > 0:
4256 try:
4257 issue = int(args[0])
4258 except ValueError:
4259 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004260 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004261 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004262 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004263 if options.json:
4264 write_json(options.json, {
4265 'issue': cl.GetIssue(),
4266 'issue_url': cl.GetIssueURL(),
4267 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004268 return 0
4269
4270
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004271def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004272 """Shows or posts review comments for any changelist."""
4273 parser.add_option('-a', '--add-comment', dest='comment',
4274 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004275 parser.add_option('-i', '--issue', dest='issue',
4276 help='review issue id (defaults to current issue). '
4277 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004278 parser.add_option('-j', '--json-file',
4279 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004280 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004281 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004282 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004283 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004284 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004285
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004286 issue = None
4287 if options.issue:
4288 try:
4289 issue = int(options.issue)
4290 except ValueError:
4291 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004292 if not options.forced_codereview:
4293 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004294
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004295 cl = Changelist(issue=issue,
4296 # TODO(tandrii): remove 'rietveld' default.
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01004297 codereview=options.forced_codereview or (
4298 'rietveld' if issue else None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004299 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004300
4301 if options.comment:
4302 cl.AddComment(options.comment)
4303 return 0
4304
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004305 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4306 for comment in summary:
4307 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004308 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004309 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004310 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004311 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004312 color = Fore.MAGENTA
4313 else:
4314 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004315 print('\n%s%s %s%s\n%s' % (
4316 color,
4317 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4318 comment.sender,
4319 Fore.RESET,
4320 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4321
smut@google.comc85ac942015-09-15 16:34:43 +00004322 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004323 def pre_serialize(c):
4324 dct = c.__dict__.copy()
4325 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4326 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004327 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004328 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004329 return 0
4330
4331
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004332@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004333def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004334 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004335 parser.add_option('-d', '--display', action='store_true',
4336 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004337 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004338 help='New description to set for this issue (- for stdin, '
4339 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004340 parser.add_option('-f', '--force', action='store_true',
4341 help='Delete any unpublished Gerrit edits for this issue '
4342 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004343
4344 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004345 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004346 options, args = parser.parse_args(args)
4347 _process_codereview_select_options(parser, options)
4348
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004349 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004350 if len(args) > 0:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004351 target_issue_arg = ParseIssueNumberArgument(args[0])
4352 if not target_issue_arg.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004353 parser.print_help()
4354 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004355
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004356 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004357
martiniss6eda05f2016-06-30 10:18:35 -07004358 kwargs = {
4359 'auth_config': auth_config,
4360 'codereview': options.forced_codereview,
4361 }
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004362 if target_issue_arg:
4363 kwargs['issue'] = target_issue_arg.issue
4364 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004365
4366 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004367
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004368 if not cl.GetIssue():
4369 DieWithError('This branch has no associated changelist.')
4370 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004371
smut@google.com34fb6b12015-07-13 20:03:26 +00004372 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004373 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004374 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004375
4376 if options.new_description:
4377 text = options.new_description
4378 if text == '-':
4379 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004380 elif text == '+':
4381 base_branch = cl.GetCommonAncestorWithUpstream()
4382 change = cl.GetChange(base_branch, None, local_description=True)
4383 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004384
4385 description.set_description(text)
4386 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004387 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004388
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004389 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004390 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004391 return 0
4392
4393
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004394def CreateDescriptionFromLog(args):
4395 """Pulls out the commit log to use as a base for the CL description."""
4396 log_args = []
4397 if len(args) == 1 and not args[0].endswith('.'):
4398 log_args = [args[0] + '..']
4399 elif len(args) == 1 and args[0].endswith('...'):
4400 log_args = [args[0][:-1]]
4401 elif len(args) == 2:
4402 log_args = [args[0] + '..' + args[1]]
4403 else:
4404 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004405 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004406
4407
thestig@chromium.org44202a22014-03-11 19:22:18 +00004408def CMDlint(parser, args):
4409 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004410 parser.add_option('--filter', action='append', metavar='-x,+y',
4411 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004412 auth.add_auth_options(parser)
4413 options, args = parser.parse_args(args)
4414 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004415
4416 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004417 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004418 try:
4419 import cpplint
4420 import cpplint_chromium
4421 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004422 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004423 return 1
4424
4425 # Change the current working directory before calling lint so that it
4426 # shows the correct base.
4427 previous_cwd = os.getcwd()
4428 os.chdir(settings.GetRoot())
4429 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004430 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004431 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4432 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004433 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004435 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004436
4437 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004438 command = args + files
4439 if options.filter:
4440 command = ['--filter=' + ','.join(options.filter)] + command
4441 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004442
4443 white_regex = re.compile(settings.GetLintRegex())
4444 black_regex = re.compile(settings.GetLintIgnoreRegex())
4445 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4446 for filename in filenames:
4447 if white_regex.match(filename):
4448 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004449 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004450 else:
4451 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4452 extra_check_functions)
4453 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004454 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004455 finally:
4456 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004457 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004458 if cpplint._cpplint_state.error_count != 0:
4459 return 1
4460 return 0
4461
4462
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004463def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004464 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004465 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004466 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004467 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004468 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004469 auth.add_auth_options(parser)
4470 options, args = parser.parse_args(args)
4471 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004472
sbc@chromium.org71437c02015-04-09 19:29:40 +00004473 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004474 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475 return 1
4476
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004477 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004478 if args:
4479 base_branch = args[0]
4480 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004481 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004482 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004483
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004484 cl.RunHook(
4485 committing=not options.upload,
4486 may_prompt=False,
4487 verbose=options.verbose,
4488 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004489 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004490
4491
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004492def GenerateGerritChangeId(message):
4493 """Returns Ixxxxxx...xxx change id.
4494
4495 Works the same way as
4496 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4497 but can be called on demand on all platforms.
4498
4499 The basic idea is to generate git hash of a state of the tree, original commit
4500 message, author/committer info and timestamps.
4501 """
4502 lines = []
4503 tree_hash = RunGitSilent(['write-tree'])
4504 lines.append('tree %s' % tree_hash.strip())
4505 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4506 if code == 0:
4507 lines.append('parent %s' % parent.strip())
4508 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4509 lines.append('author %s' % author.strip())
4510 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4511 lines.append('committer %s' % committer.strip())
4512 lines.append('')
4513 # Note: Gerrit's commit-hook actually cleans message of some lines and
4514 # whitespace. This code is not doing this, but it clearly won't decrease
4515 # entropy.
4516 lines.append(message)
4517 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4518 stdin='\n'.join(lines))
4519 return 'I%s' % change_hash.strip()
4520
4521
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004522def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004523 """Computes the remote branch ref to use for the CL.
4524
4525 Args:
4526 remote (str): The git remote for the CL.
4527 remote_branch (str): The git remote branch for the CL.
4528 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004529 """
4530 if not (remote and remote_branch):
4531 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004532
wittman@chromium.org455dc922015-01-26 20:15:50 +00004533 if target_branch:
4534 # Cannonicalize branch references to the equivalent local full symbolic
4535 # refs, which are then translated into the remote full symbolic refs
4536 # below.
4537 if '/' not in target_branch:
4538 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4539 else:
4540 prefix_replacements = (
4541 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4542 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4543 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4544 )
4545 match = None
4546 for regex, replacement in prefix_replacements:
4547 match = re.search(regex, target_branch)
4548 if match:
4549 remote_branch = target_branch.replace(match.group(0), replacement)
4550 break
4551 if not match:
4552 # This is a branch path but not one we recognize; use as-is.
4553 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004554 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4555 # Handle the refs that need to land in different refs.
4556 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004557
wittman@chromium.org455dc922015-01-26 20:15:50 +00004558 # Create the true path to the remote branch.
4559 # Does the following translation:
4560 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4561 # * refs/remotes/origin/master -> refs/heads/master
4562 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4563 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4564 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4565 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4566 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4567 'refs/heads/')
4568 elif remote_branch.startswith('refs/remotes/branch-heads'):
4569 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004570
wittman@chromium.org455dc922015-01-26 20:15:50 +00004571 return remote_branch
4572
4573
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004574def cleanup_list(l):
4575 """Fixes a list so that comma separated items are put as individual items.
4576
4577 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4578 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4579 """
4580 items = sum((i.split(',') for i in l), [])
4581 stripped_items = (i.strip() for i in items)
4582 return sorted(filter(None, stripped_items))
4583
4584
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004585@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004586def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004587 """Uploads the current changelist to codereview.
4588
4589 Can skip dependency patchset uploads for a branch by running:
4590 git config branch.branch_name.skip-deps-uploads True
4591 To unset run:
4592 git config --unset branch.branch_name.skip-deps-uploads
4593 Can also set the above globally by using the --global flag.
4594 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004595 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4596 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004597 parser.add_option('--bypass-watchlists', action='store_true',
4598 dest='bypass_watchlists',
4599 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004600 parser.add_option('-f', action='store_true', dest='force',
4601 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004602 parser.add_option('--message', '-m', dest='message',
4603 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004604 parser.add_option('-b', '--bug',
4605 help='pre-populate the bug number(s) for this issue. '
4606 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004607 parser.add_option('--message-file', dest='message_file',
4608 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004609 parser.add_option('--title', '-t', dest='title',
4610 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004611 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004612 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004613 help='reviewer email addresses')
4614 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004615 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004616 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004617 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004618 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004619 parser.add_option('--emulate_svn_auto_props',
4620 '--emulate-svn-auto-props',
4621 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004622 dest="emulate_svn_auto_props",
4623 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004624 parser.add_option('-c', '--use-commit-queue', action='store_true',
4625 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004626 parser.add_option('--private', action='store_true',
4627 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004628 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004629 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004630 metavar='TARGET',
4631 help='Apply CL to remote ref TARGET. ' +
4632 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004633 parser.add_option('--squash', action='store_true',
4634 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004635 parser.add_option('--no-squash', action='store_true',
4636 help='Don\'t squash multiple commits into one ' +
4637 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004638 parser.add_option('--topic', default=None,
4639 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004640 parser.add_option('--email', default=None,
4641 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004642 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4643 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004644 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4645 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004646 help='Send the patchset to do a CQ dry run right after '
4647 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004648 parser.add_option('--dependencies', action='store_true',
4649 help='Uploads CLs of all the local branches that depend on '
4650 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004651
rmistry@google.com2dd99862015-06-22 12:22:18 +00004652 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004653 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004654 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004655 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004656 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004657 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004658 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004659
sbc@chromium.org71437c02015-04-09 19:29:40 +00004660 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004661 return 1
4662
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004663 options.reviewers = cleanup_list(options.reviewers)
4664 options.cc = cleanup_list(options.cc)
4665
tandriib80458a2016-06-23 12:20:07 -07004666 if options.message_file:
4667 if options.message:
4668 parser.error('only one of --message and --message-file allowed.')
4669 options.message = gclient_utils.FileRead(options.message_file)
4670 options.message_file = None
4671
tandrii4d0545a2016-07-06 03:56:49 -07004672 if options.cq_dry_run and options.use_commit_queue:
4673 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4674
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004675 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4676 settings.GetIsGerrit()
4677
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004678 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004679 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004680
4681
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004682@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004684 """DEPRECATED: Used to commit the current changelist via git-svn."""
4685 message = ('git-cl no longer supports committing to SVN repositories via '
4686 'git-svn. You probably want to use `git cl land` instead.')
4687 print(message)
4688 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004689
4690
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004691# Two special branches used by git cl land.
4692MERGE_BRANCH = 'git-cl-commit'
4693CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4694
4695
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004696@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004697def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004698 """Commits the current changelist via git.
4699
4700 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4701 upstream and closes the issue automatically and atomically.
4702
4703 Otherwise (in case of Rietveld):
4704 Squashes branch into a single commit.
4705 Updates commit message with metadata (e.g. pointer to review).
4706 Pushes the code upstream.
4707 Updates review and closes.
4708 """
4709 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4710 help='bypass upload presubmit hook')
4711 parser.add_option('-m', dest='message',
4712 help="override review description")
4713 parser.add_option('-f', action='store_true', dest='force',
4714 help="force yes to questions (don't prompt)")
4715 parser.add_option('-c', dest='contributor',
4716 help="external contributor for patch (appended to " +
4717 "description and used as author for git). Should be " +
4718 "formatted as 'First Last <email@example.com>'")
4719 add_git_similarity(parser)
4720 auth.add_auth_options(parser)
4721 (options, args) = parser.parse_args(args)
4722 auth_config = auth.extract_auth_config_from_options(options)
4723
4724 cl = Changelist(auth_config=auth_config)
4725
4726 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4727 if cl.IsGerrit():
4728 if options.message:
4729 # This could be implemented, but it requires sending a new patch to
4730 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4731 # Besides, Gerrit has the ability to change the commit message on submit
4732 # automatically, thus there is no need to support this option (so far?).
4733 parser.error('-m MESSAGE option is not supported for Gerrit.')
4734 if options.contributor:
4735 parser.error(
4736 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4737 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4738 'the contributor\'s "name <email>". If you can\'t upload such a '
4739 'commit for review, contact your repository admin and request'
4740 '"Forge-Author" permission.')
4741 if not cl.GetIssue():
4742 DieWithError('You must upload the change first to Gerrit.\n'
4743 ' If you would rather have `git cl land` upload '
4744 'automatically for you, see http://crbug.com/642759')
4745 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4746 options.verbose)
4747
4748 current = cl.GetBranch()
4749 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4750 if remote == '.':
4751 print()
4752 print('Attempting to push branch %r into another local branch!' % current)
4753 print()
4754 print('Either reparent this branch on top of origin/master:')
4755 print(' git reparent-branch --root')
4756 print()
4757 print('OR run `git rebase-update` if you think the parent branch is ')
4758 print('already committed.')
4759 print()
4760 print(' Current parent: %r' % upstream_branch)
4761 return 1
4762
4763 if not args:
4764 # Default to merging against our best guess of the upstream branch.
4765 args = [cl.GetUpstreamBranch()]
4766
4767 if options.contributor:
4768 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4769 print("Please provide contibutor as 'First Last <email@example.com>'")
4770 return 1
4771
4772 base_branch = args[0]
4773
4774 if git_common.is_dirty_git_tree('land'):
4775 return 1
4776
4777 # This rev-list syntax means "show all commits not in my branch that
4778 # are in base_branch".
4779 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4780 base_branch]).splitlines()
4781 if upstream_commits:
4782 print('Base branch "%s" has %d commits '
4783 'not in this branch.' % (base_branch, len(upstream_commits)))
4784 print('Run "git merge %s" before attempting to land.' % base_branch)
4785 return 1
4786
4787 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4788 if not options.bypass_hooks:
4789 author = None
4790 if options.contributor:
4791 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4792 hook_results = cl.RunHook(
4793 committing=True,
4794 may_prompt=not options.force,
4795 verbose=options.verbose,
4796 change=cl.GetChange(merge_base, author))
4797 if not hook_results.should_continue():
4798 return 1
4799
4800 # Check the tree status if the tree status URL is set.
4801 status = GetTreeStatus()
4802 if 'closed' == status:
4803 print('The tree is closed. Please wait for it to reopen. Use '
4804 '"git cl land --bypass-hooks" to commit on a closed tree.')
4805 return 1
4806 elif 'unknown' == status:
4807 print('Unable to determine tree status. Please verify manually and '
4808 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4809 return 1
4810
4811 change_desc = ChangeDescription(options.message)
4812 if not change_desc.description and cl.GetIssue():
4813 change_desc = ChangeDescription(cl.GetDescription())
4814
4815 if not change_desc.description:
4816 if not cl.GetIssue() and options.bypass_hooks:
4817 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4818 else:
4819 print('No description set.')
4820 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4821 return 1
4822
4823 # Keep a separate copy for the commit message, because the commit message
4824 # contains the link to the Rietveld issue, while the Rietveld message contains
4825 # the commit viewvc url.
4826 if cl.GetIssue():
4827 change_desc.update_reviewers(cl.GetApprovingReviewers())
4828
4829 commit_desc = ChangeDescription(change_desc.description)
4830 if cl.GetIssue():
4831 # Xcode won't linkify this URL unless there is a non-whitespace character
4832 # after it. Add a period on a new line to circumvent this. Also add a space
4833 # before the period to make sure that Gitiles continues to correctly resolve
4834 # the URL.
4835 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4836 if options.contributor:
4837 commit_desc.append_footer('Patch from %s.' % options.contributor)
4838
4839 print('Description:')
4840 print(commit_desc.description)
4841
4842 branches = [merge_base, cl.GetBranchRef()]
4843 if not options.force:
4844 print_stats(options.similarity, options.find_copies, branches)
4845
4846 # We want to squash all this branch's commits into one commit with the proper
4847 # description. We do this by doing a "reset --soft" to the base branch (which
4848 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004849 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004850 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4851 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4852 result = RunGitWithCode(showref_cmd)
4853 if result[0] == 0:
4854 RunGit(['branch', '-D', branch])
4855
4856 # We might be in a directory that's present in this branch but not in the
4857 # trunk. Move up to the top of the tree so that git commands that expect a
4858 # valid CWD won't fail after we check out the merge branch.
4859 rel_base_path = settings.GetRelativeRoot()
4860 if rel_base_path:
4861 os.chdir(rel_base_path)
4862
4863 # Stuff our change into the merge branch.
4864 # We wrap in a try...finally block so if anything goes wrong,
4865 # we clean up the branches.
4866 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004867 revision = None
4868 try:
4869 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4870 RunGit(['reset', '--soft', merge_base])
4871 if options.contributor:
4872 RunGit(
4873 [
4874 'commit', '--author', options.contributor,
4875 '-m', commit_desc.description,
4876 ])
4877 else:
4878 RunGit(['commit', '-m', commit_desc.description])
4879
4880 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4881 mirror = settings.GetGitMirror(remote)
4882 if mirror:
4883 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004884 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004885 else:
4886 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004887 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004888 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4889
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004890 retcode = PushToGitWithAutoRebase(
4891 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004892 if retcode == 0:
4893 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004894 if git_numberer_enabled:
4895 change_desc = ChangeDescription(
4896 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004897 except: # pylint: disable=bare-except
4898 if _IS_BEING_TESTED:
4899 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4900 + '-' * 30 + '8<' + '-' * 30)
4901 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4902 raise
4903 finally:
4904 # And then swap back to the original branch and clean up.
4905 RunGit(['checkout', '-q', cl.GetBranch()])
4906 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004907 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004908
4909 if not revision:
4910 print('Failed to push. If this persists, please file a bug.')
4911 return 1
4912
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004913 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004914 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004915 if viewvc_url and revision:
4916 change_desc.append_footer(
4917 'Committed: %s%s' % (viewvc_url, revision))
4918 elif revision:
4919 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004920 print('Closing issue '
4921 '(you may be prompted for your codereview password)...')
4922 cl.UpdateDescription(change_desc.description)
4923 cl.CloseIssue()
4924 props = cl.GetIssueProperties()
4925 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004926 comment = "Committed patchset #%d (id:%d) manually as %s" % (
4927 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004928 if options.bypass_hooks:
4929 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4930 else:
4931 comment += ' (presubmit successful).'
4932 cl.RpcServer().add_comment(cl.GetIssue(), comment)
4933
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004934 if os.path.isfile(POSTUPSTREAM_HOOK):
4935 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
4936
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004937 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004938
4939
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004940def PushToGitWithAutoRebase(remote, branch, original_description,
4941 git_numberer_enabled, max_attempts=3):
4942 """Pushes current HEAD commit on top of remote's branch.
4943
4944 Attempts to fetch and autorebase on push failures.
4945 Adds git number footers on the fly.
4946
4947 Returns integer code from last command.
4948 """
4949 cherry = RunGit(['rev-parse', 'HEAD']).strip()
4950 code = 0
4951 attempts_left = max_attempts
4952 while attempts_left:
4953 attempts_left -= 1
4954 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
4955
4956 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
4957 # If fetch fails, retry.
4958 print('Fetching %s/%s...' % (remote, branch))
4959 code, out = RunGitWithCode(
4960 ['retry', 'fetch', remote,
4961 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
4962 if code:
4963 print('Fetch failed with exit code %d.' % code)
4964 print(out.strip())
4965 continue
4966
4967 print('Cherry-picking commit on top of latest %s' % branch)
4968 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
4969 suppress_stderr=True)
4970 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
4971 code, out = RunGitWithCode(['cherry-pick', cherry])
4972 if code:
4973 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
4974 'the following files have merge conflicts:' %
4975 (branch, parent_hash))
4976 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
4977 print('Please rebase your patch and try again.')
4978 RunGitWithCode(['cherry-pick', '--abort'])
4979 break
4980
4981 commit_desc = ChangeDescription(original_description)
4982 if git_numberer_enabled:
4983 logging.debug('Adding git number footers')
4984 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
4985 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
4986 branch)
4987 # Ensure timestamps are monotonically increasing.
4988 timestamp = max(1 + _get_committer_timestamp(parent_hash),
4989 _get_committer_timestamp('HEAD'))
4990 _git_amend_head(commit_desc.description, timestamp)
4991
4992 code, out = RunGitWithCode(
4993 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
4994 print(out)
4995 if code == 0:
4996 break
4997 if IsFatalPushFailure(out):
4998 print('Fatal push error. Make sure your .netrc credentials and git '
4999 'user.email are correct and you have push access to the repo.')
5000 break
5001 return code
5002
5003
5004def IsFatalPushFailure(push_stdout):
5005 """True if retrying push won't help."""
5006 return '(prohibited by Gerrit)' in push_stdout
5007
5008
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005009@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005010def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005011 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005012 parser.add_option('-b', dest='newbranch',
5013 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005014 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005015 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005016 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5017 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005018 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005019 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005020 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005021 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005022 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005023 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005024
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005025
5026 group = optparse.OptionGroup(
5027 parser,
5028 'Options for continuing work on the current issue uploaded from a '
5029 'different clone (e.g. different machine). Must be used independently '
5030 'from the other options. No issue number should be specified, and the '
5031 'branch must have an issue number associated with it')
5032 group.add_option('--reapply', action='store_true', dest='reapply',
5033 help='Reset the branch and reapply the issue.\n'
5034 'CAUTION: This will undo any local changes in this '
5035 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005036
5037 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005038 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005039 parser.add_option_group(group)
5040
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005041 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005042 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005043 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005044 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005045 auth_config = auth.extract_auth_config_from_options(options)
5046
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005047
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005048 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005049 if options.newbranch:
5050 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005051 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005052 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005053
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005054 cl = Changelist(auth_config=auth_config,
5055 codereview=options.forced_codereview)
5056 if not cl.GetIssue():
5057 parser.error('current branch must have an associated issue')
5058
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005059 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005060 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005061 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005062
5063 RunGit(['reset', '--hard', upstream])
5064 if options.pull:
5065 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005066
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005067 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5068 options.directory)
5069
5070 if len(args) != 1 or not args[0]:
5071 parser.error('Must specify issue number or url')
5072
5073 # We don't want uncommitted changes mixed up with the patch.
5074 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005075 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005076
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005077 if options.newbranch:
5078 if options.force:
5079 RunGit(['branch', '-D', options.newbranch],
5080 stderr=subprocess2.PIPE, error_ok=True)
5081 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005082 elif not GetCurrentBranch():
5083 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005084
5085 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
5086
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005087 if cl.IsGerrit():
5088 if options.reject:
5089 parser.error('--reject is not supported with Gerrit codereview.')
5090 if options.nocommit:
5091 parser.error('--nocommit is not supported with Gerrit codereview.')
5092 if options.directory:
5093 parser.error('--directory is not supported with Gerrit codereview.')
5094
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005095 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005096 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005097
5098
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005099def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005100 """Fetches the tree status and returns either 'open', 'closed',
5101 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005102 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005103 if url:
5104 status = urllib2.urlopen(url).read().lower()
5105 if status.find('closed') != -1 or status == '0':
5106 return 'closed'
5107 elif status.find('open') != -1 or status == '1':
5108 return 'open'
5109 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005110 return 'unset'
5111
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005112
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005113def GetTreeStatusReason():
5114 """Fetches the tree status from a json url and returns the message
5115 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005116 url = settings.GetTreeStatusUrl()
5117 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005118 connection = urllib2.urlopen(json_url)
5119 status = json.loads(connection.read())
5120 connection.close()
5121 return status['message']
5122
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005123
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005124def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005125 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005126 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005127 status = GetTreeStatus()
5128 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005129 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005130 return 2
5131
vapiera7fbd5a2016-06-16 09:17:49 -07005132 print('The tree is %s' % status)
5133 print()
5134 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005135 if status != 'open':
5136 return 1
5137 return 0
5138
5139
maruel@chromium.org15192402012-09-06 12:38:29 +00005140def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005141 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005142 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005143 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005144 '-b', '--bot', action='append',
5145 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5146 'times to specify multiple builders. ex: '
5147 '"-b win_rel -b win_layout". See '
5148 'the try server waterfall for the builders name and the tests '
5149 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005150 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005151 '-B', '--bucket', default='',
5152 help=('Buildbucket bucket to send the try requests.'))
5153 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005154 '-m', '--master', default='',
5155 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005156 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005157 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005158 help='Revision to use for the try job; default: the revision will '
5159 'be determined by the try recipe that builder runs, which usually '
5160 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005161 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005162 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005163 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005164 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005165 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005166 '--project',
5167 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005168 'in recipe to determine to which repository or directory to '
5169 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005170 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005171 '-p', '--property', dest='properties', action='append', default=[],
5172 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005173 'key2=value2 etc. The value will be treated as '
5174 'json if decodable, or as string otherwise. '
5175 'NOTE: using this may make your try job not usable for CQ, '
5176 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005177 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005178 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5179 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005180 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005181 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005182 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005183 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005184
machenbach@chromium.org45453142015-09-15 08:45:22 +00005185 # Make sure that all properties are prop=value pairs.
5186 bad_params = [x for x in options.properties if '=' not in x]
5187 if bad_params:
5188 parser.error('Got properties with missing "=": %s' % bad_params)
5189
maruel@chromium.org15192402012-09-06 12:38:29 +00005190 if args:
5191 parser.error('Unknown arguments: %s' % args)
5192
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005193 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005194 if not cl.GetIssue():
5195 parser.error('Need to upload first')
5196
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005197 if cl.IsGerrit():
5198 # HACK: warm up Gerrit change detail cache to save on RPCs.
5199 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5200
tandriie113dfd2016-10-11 10:20:12 -07005201 error_message = cl.CannotTriggerTryJobReason()
5202 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005203 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005204
borenet6c0efe62016-10-19 08:13:29 -07005205 if options.bucket and options.master:
5206 parser.error('Only one of --bucket and --master may be used.')
5207
qyearsley1fdfcb62016-10-24 13:22:03 -07005208 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005209
qyearsleydd49f942016-10-28 11:57:22 -07005210 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5211 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005212 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005213 if options.verbose:
5214 print('git cl try with no bots now defaults to CQ Dry Run.')
5215 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005216
borenet6c0efe62016-10-19 08:13:29 -07005217 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005218 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005219 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005220 'of bot requires an initial job from a parent (usually a builder). '
5221 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005222 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005223 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005224
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005225 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005226 # TODO(tandrii): Checking local patchset against remote patchset is only
5227 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5228 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005229 print('Warning: Codereview server has newer patchsets (%s) than most '
5230 'recent upload from local checkout (%s). Did a previous upload '
5231 'fail?\n'
5232 'By default, git cl try uses the latest patchset from '
5233 'codereview, continuing to use patchset %s.\n' %
5234 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005235
tandrii568043b2016-10-11 07:49:18 -07005236 try:
borenet6c0efe62016-10-19 08:13:29 -07005237 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5238 patchset)
tandrii568043b2016-10-11 07:49:18 -07005239 except BuildbucketResponseException as ex:
5240 print('ERROR: %s' % ex)
5241 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005242 return 0
5243
5244
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005245def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005246 """Prints info about try jobs associated with current CL."""
5247 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005248 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005249 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005250 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005251 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005252 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005253 '--color', action='store_true', default=setup_color.IS_TTY,
5254 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005255 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005256 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5257 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005258 group.add_option(
5259 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005260 parser.add_option_group(group)
5261 auth.add_auth_options(parser)
5262 options, args = parser.parse_args(args)
5263 if args:
5264 parser.error('Unrecognized args: %s' % ' '.join(args))
5265
5266 auth_config = auth.extract_auth_config_from_options(options)
5267 cl = Changelist(auth_config=auth_config)
5268 if not cl.GetIssue():
5269 parser.error('Need to upload first')
5270
tandrii221ab252016-10-06 08:12:04 -07005271 patchset = options.patchset
5272 if not patchset:
5273 patchset = cl.GetMostRecentPatchset()
5274 if not patchset:
5275 parser.error('Codereview doesn\'t know about issue %s. '
5276 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005277 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005278 cl.GetIssue())
5279
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005280 # TODO(tandrii): Checking local patchset against remote patchset is only
5281 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5282 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005283 print('Warning: Codereview server has newer patchsets (%s) than most '
5284 'recent upload from local checkout (%s). Did a previous upload '
5285 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005286 'By default, git cl try-results uses the latest patchset from '
5287 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005288 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005289 try:
tandrii221ab252016-10-06 08:12:04 -07005290 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005291 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005292 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005293 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005294 if options.json:
5295 write_try_results_json(options.json, jobs)
5296 else:
5297 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005298 return 0
5299
5300
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005301@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005303 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005304 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005305 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005306 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005307
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005308 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005309 if args:
5310 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005311 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005312 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005313 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005314 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005315
5316 # Clear configured merge-base, if there is one.
5317 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005318 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005319 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005320 return 0
5321
5322
thestig@chromium.org00858c82013-12-02 23:08:03 +00005323def CMDweb(parser, args):
5324 """Opens the current CL in the web browser."""
5325 _, args = parser.parse_args(args)
5326 if args:
5327 parser.error('Unrecognized args: %s' % ' '.join(args))
5328
5329 issue_url = Changelist().GetIssueURL()
5330 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005331 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005332 return 1
5333
5334 webbrowser.open(issue_url)
5335 return 0
5336
5337
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005338def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005339 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005340 parser.add_option('-d', '--dry-run', action='store_true',
5341 help='trigger in dry run mode')
5342 parser.add_option('-c', '--clear', action='store_true',
5343 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005344 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005345 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005346 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005347 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005348 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005349 if args:
5350 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005351 if options.dry_run and options.clear:
5352 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5353
iannuccie53c9352016-08-17 14:40:40 -07005354 cl = Changelist(auth_config=auth_config, issue=options.issue,
5355 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005356 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005357 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005358 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005359 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005360 state = _CQState.DRY_RUN
5361 else:
5362 state = _CQState.COMMIT
5363 if not cl.GetIssue():
5364 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005365 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005366 return 0
5367
5368
groby@chromium.org411034a2013-02-26 15:12:01 +00005369def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005370 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005371 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005372 auth.add_auth_options(parser)
5373 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005374 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005375 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005376 if args:
5377 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005378 cl = Changelist(auth_config=auth_config, issue=options.issue,
5379 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005380 # Ensure there actually is an issue to close.
5381 cl.GetDescription()
5382 cl.CloseIssue()
5383 return 0
5384
5385
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005386def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005387 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005388 parser.add_option(
5389 '--stat',
5390 action='store_true',
5391 dest='stat',
5392 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005393 auth.add_auth_options(parser)
5394 options, args = parser.parse_args(args)
5395 auth_config = auth.extract_auth_config_from_options(options)
5396 if args:
5397 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005398
5399 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005400 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005401 # Staged changes would be committed along with the patch from last
5402 # upload, hence counted toward the "last upload" side in the final
5403 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005404 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005405 return 1
5406
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005407 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005408 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005409 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005410 if not issue:
5411 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005412 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005413 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005414
5415 # Create a new branch based on the merge-base
5416 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005417 # Clear cached branch in cl object, to avoid overwriting original CL branch
5418 # properties.
5419 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005420 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005421 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005422 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005423 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005424 return rtn
5425
wychen@chromium.org06928532015-02-03 02:11:29 +00005426 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005427 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005428 cmd = ['git', 'diff']
5429 if options.stat:
5430 cmd.append('--stat')
5431 cmd.extend([TMP_BRANCH, branch, '--'])
5432 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005433 finally:
5434 RunGit(['checkout', '-q', branch])
5435 RunGit(['branch', '-D', TMP_BRANCH])
5436
5437 return 0
5438
5439
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005440def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005441 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005442 parser.add_option(
5443 '--no-color',
5444 action='store_true',
5445 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005446 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005447 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005448 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005449
5450 author = RunGit(['config', 'user.email']).strip() or None
5451
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005452 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005453
5454 if args:
5455 if len(args) > 1:
5456 parser.error('Unknown args')
5457 base_branch = args[0]
5458 else:
5459 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005460 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005461
5462 change = cl.GetChange(base_branch, None)
5463 return owners_finder.OwnersFinder(
5464 [f.LocalPath() for f in
5465 cl.GetChange(base_branch, None).AffectedFiles()],
5466 change.RepositoryRoot(), author,
dtu944b6052016-07-14 14:48:21 -07005467 fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005468 disable_color=options.no_color).run()
5469
5470
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005471def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005472 """Generates a diff command."""
5473 # Generate diff for the current branch's changes.
5474 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005475 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005476
5477 if args:
5478 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005479 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005480 diff_cmd.append(arg)
5481 else:
5482 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005483
5484 return diff_cmd
5485
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005486
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005487def MatchingFileType(file_name, extensions):
5488 """Returns true if the file name ends with one of the given extensions."""
5489 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005490
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005491
enne@chromium.org555cfe42014-01-29 18:21:39 +00005492@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005493def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005494 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005495 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005496 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005497 parser.add_option('--full', action='store_true',
5498 help='Reformat the full content of all touched files')
5499 parser.add_option('--dry-run', action='store_true',
5500 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005501 parser.add_option('--python', action='store_true',
5502 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005503 parser.add_option('--js', action='store_true',
5504 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005505 parser.add_option('--diff', action='store_true',
5506 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005507 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005508
Daniel Chengc55eecf2016-12-30 03:11:02 -08005509 # Normalize any remaining args against the current path, so paths relative to
5510 # the current directory are still resolved as expected.
5511 args = [os.path.join(os.getcwd(), arg) for arg in args]
5512
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005513 # git diff generates paths against the root of the repository. Change
5514 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005515 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005516 if rel_base_path:
5517 os.chdir(rel_base_path)
5518
digit@chromium.org29e47272013-05-17 17:01:46 +00005519 # Grab the merge-base commit, i.e. the upstream commit of the current
5520 # branch when it was created or the last time it was rebased. This is
5521 # to cover the case where the user may have called "git fetch origin",
5522 # moving the origin branch to a newer commit, but hasn't rebased yet.
5523 upstream_commit = None
5524 cl = Changelist()
5525 upstream_branch = cl.GetUpstreamBranch()
5526 if upstream_branch:
5527 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5528 upstream_commit = upstream_commit.strip()
5529
5530 if not upstream_commit:
5531 DieWithError('Could not find base commit for this branch. '
5532 'Are you in detached state?')
5533
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005534 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5535 diff_output = RunGit(changed_files_cmd)
5536 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005537 # Filter out files deleted by this CL
5538 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005539
Christopher Lamc5ba6922017-01-24 11:19:14 +11005540 if opts.js:
5541 CLANG_EXTS.append('.js')
5542
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005543 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5544 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5545 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005546 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005547
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005548 top_dir = os.path.normpath(
5549 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5550
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005551 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5552 # formatted. This is used to block during the presubmit.
5553 return_value = 0
5554
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005555 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005556 # Locate the clang-format binary in the checkout
5557 try:
5558 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005559 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005560 DieWithError(e)
5561
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005562 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005563 cmd = [clang_format_tool]
5564 if not opts.dry_run and not opts.diff:
5565 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005566 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005567 if opts.diff:
5568 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005569 else:
5570 env = os.environ.copy()
5571 env['PATH'] = str(os.path.dirname(clang_format_tool))
5572 try:
5573 script = clang_format.FindClangFormatScriptInChromiumTree(
5574 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005575 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005576 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005577
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005578 cmd = [sys.executable, script, '-p0']
5579 if not opts.dry_run and not opts.diff:
5580 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005581
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005582 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5583 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005584
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005585 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5586 if opts.diff:
5587 sys.stdout.write(stdout)
5588 if opts.dry_run and len(stdout) > 0:
5589 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005590
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005591 # Similar code to above, but using yapf on .py files rather than clang-format
5592 # on C/C++ files
5593 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005594 yapf_tool = gclient_utils.FindExecutable('yapf')
5595 if yapf_tool is None:
5596 DieWithError('yapf not found in PATH')
5597
5598 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005599 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005600 cmd = [yapf_tool]
5601 if not opts.dry_run and not opts.diff:
5602 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005603 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005604 if opts.diff:
5605 sys.stdout.write(stdout)
5606 else:
5607 # TODO(sbc): yapf --lines mode still has some issues.
5608 # https://github.com/google/yapf/issues/154
5609 DieWithError('--python currently only works with --full')
5610
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005611 # Dart's formatter does not have the nice property of only operating on
5612 # modified chunks, so hard code full.
5613 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005614 try:
5615 command = [dart_format.FindDartFmtToolInChromiumTree()]
5616 if not opts.dry_run and not opts.diff:
5617 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005618 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005619
ppi@chromium.org6593d932016-03-03 15:41:15 +00005620 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005621 if opts.dry_run and stdout:
5622 return_value = 2
5623 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005624 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5625 'found in this checkout. Files in other languages are still '
5626 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005627
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005628 # Format GN build files. Always run on full build files for canonical form.
5629 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005630 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005631 if opts.dry_run or opts.diff:
5632 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005633 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005634 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5635 shell=sys.platform == 'win32',
5636 cwd=top_dir)
5637 if opts.dry_run and gn_ret == 2:
5638 return_value = 2 # Not formatted.
5639 elif opts.diff and gn_ret == 2:
5640 # TODO this should compute and print the actual diff.
5641 print("This change has GN build file diff for " + gn_diff_file)
5642 elif gn_ret != 0:
5643 # For non-dry run cases (and non-2 return values for dry-run), a
5644 # nonzero error code indicates a failure, probably because the file
5645 # doesn't parse.
5646 DieWithError("gn format failed on " + gn_diff_file +
5647 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005648
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005649 metrics_xml_files = [
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005650 os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
5651 os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
5652 os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005653 for xml_file in metrics_xml_files:
5654 if xml_file in diff_files:
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005655 tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
5656 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005657 if opts.dry_run or opts.diff:
5658 cmd.append('--diff')
5659 stdout = RunCommand(cmd, cwd=top_dir)
5660 if opts.diff:
5661 sys.stdout.write(stdout)
5662 if opts.dry_run and stdout:
5663 return_value = 2 # Not formatted.
5664
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005665 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005666
5667
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005668@subcommand.usage('<codereview url or issue id>')
5669def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005670 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005671 _, args = parser.parse_args(args)
5672
5673 if len(args) != 1:
5674 parser.print_help()
5675 return 1
5676
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005677 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005678 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005679 parser.print_help()
5680 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005681 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005682
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005683 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005684 output = RunGit(['config', '--local', '--get-regexp',
5685 r'branch\..*\.%s' % issueprefix],
5686 error_ok=True)
5687 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005688 if issue == target_issue:
5689 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005690
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005691 branches = []
5692 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005693 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005694 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005695 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005696 return 1
5697 if len(branches) == 1:
5698 RunGit(['checkout', branches[0]])
5699 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005700 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005701 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005702 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005703 which = raw_input('Choose by index: ')
5704 try:
5705 RunGit(['checkout', branches[int(which)]])
5706 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005707 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005708 return 1
5709
5710 return 0
5711
5712
maruel@chromium.org29404b52014-09-08 22:58:00 +00005713def CMDlol(parser, args):
5714 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005715 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005716 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5717 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5718 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005719 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005720 return 0
5721
5722
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005723class OptionParser(optparse.OptionParser):
5724 """Creates the option parse and add --verbose support."""
5725 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005726 optparse.OptionParser.__init__(
5727 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005728 self.add_option(
5729 '-v', '--verbose', action='count', default=0,
5730 help='Use 2 times for more debugging info')
5731
5732 def parse_args(self, args=None, values=None):
5733 options, args = optparse.OptionParser.parse_args(self, args, values)
5734 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005735 logging.basicConfig(
5736 level=levels[min(options.verbose, len(levels) - 1)],
5737 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5738 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005739 return options, args
5740
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005741
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005742def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005743 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005744 print('\nYour python version %s is unsupported, please upgrade.\n' %
5745 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005746 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005747
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005748 # Reload settings.
5749 global settings
5750 settings = Settings()
5751
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005752 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005753 dispatcher = subcommand.CommandDispatcher(__name__)
5754 try:
5755 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005756 except auth.AuthenticationError as e:
5757 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005758 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005759 if e.code != 500:
5760 raise
5761 DieWithError(
5762 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5763 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005764 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005765
5766
5767if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005768 # These affect sys.stdout so do it outside of main() to simplify mocks in
5769 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005770 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005771 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005772 try:
5773 sys.exit(main(sys.argv[1:]))
5774 except KeyboardInterrupt:
5775 sys.stderr.write('interrupted\n')
5776 sys.exit(1)