blob: 8ad75be073503e225c13028957ccc14bd1666ba7 [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
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001405 def GetDescriptionFooters(self):
1406 """Returns (non_footer_lines, footers) for the commit message.
1407
1408 Returns:
1409 non_footer_lines (list(str)) - Simple list of description lines without
1410 any footer. The lines do not contain newlines, nor does the list contain
1411 the empty line between the message and the footers.
1412 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1413 [("Change-Id", "Ideadbeef...."), ...]
1414 """
1415 raw_description = self.GetDescription()
1416 msg_lines, _, footers = git_footers.split_footers(raw_description)
1417 if footers:
1418 msg_lines = msg_lines[:len(msg_lines)-1]
1419 return msg_lines, footers
1420
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001422 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001423 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001424 self.patchset = self._GitGetBranchConfigValue(
1425 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001426 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427 return self.patchset
1428
1429 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001430 """Set this branch's patchset. If patchset=0, clears the patchset."""
1431 assert self.GetBranch()
1432 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001433 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001434 else:
1435 self.patchset = int(patchset)
1436 self._GitSetBranchConfigValue(
1437 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001438
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001439 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001440 """Set this branch's issue. If issue isn't given, clears the issue."""
1441 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001442 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001443 issue = int(issue)
1444 self._GitSetBranchConfigValue(
1445 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001447 codereview_server = self._codereview_impl.GetCodereviewServer()
1448 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001449 self._GitSetBranchConfigValue(
1450 self._codereview_impl.CodereviewServerConfigKey(),
1451 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001452 else:
tandrii5d48c322016-08-18 16:19:37 -07001453 # Reset all of these just to be clean.
1454 reset_suffixes = [
1455 'last-upload-hash',
1456 self._codereview_impl.IssueConfigKey(),
1457 self._codereview_impl.PatchsetConfigKey(),
1458 self._codereview_impl.CodereviewServerConfigKey(),
1459 ] + self._PostUnsetIssueProperties()
1460 for prop in reset_suffixes:
1461 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001462 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001463 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001464
dnjba1b0f32016-09-02 12:37:42 -07001465 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001466 if not self.GitSanityChecks(upstream_branch):
1467 DieWithError('\nGit sanity check failure')
1468
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001469 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001470 if not root:
1471 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001472 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001473
1474 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001475 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001476 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001477 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001478 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001479 except subprocess2.CalledProcessError:
1480 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001481 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001482 'This branch probably doesn\'t exist anymore. To reset the\n'
1483 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001484 ' git branch --set-upstream-to origin/master %s\n'
1485 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001486 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001487
maruel@chromium.org52424302012-08-29 15:14:30 +00001488 issue = self.GetIssue()
1489 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001490 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001491 description = self.GetDescription()
1492 else:
1493 # If the change was never uploaded, use the log messages of all commits
1494 # up to the branch point, as git cl upload will prefill the description
1495 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001496 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1497 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001498
1499 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001500 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001501 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001502 name,
1503 description,
1504 absroot,
1505 files,
1506 issue,
1507 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001508 author,
1509 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001510
dsansomee2d6fd92016-09-08 00:10:47 -07001511 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001512 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001513 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001514 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001515
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001516 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1517 """Sets the description for this CL remotely.
1518
1519 You can get description_lines and footers with GetDescriptionFooters.
1520
1521 Args:
1522 description_lines (list(str)) - List of CL description lines without
1523 newline characters.
1524 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1525 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1526 `List-Of-Tokens`). It will be case-normalized so that each token is
1527 title-cased.
1528 """
1529 new_description = '\n'.join(description_lines)
1530 if footers:
1531 new_description += '\n'
1532 for k, v in footers:
1533 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1534 if not git_footers.FOOTER_PATTERN.match(foot):
1535 raise ValueError('Invalid footer %r' % foot)
1536 new_description += foot + '\n'
1537 self.UpdateDescription(new_description, force)
1538
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001539 def RunHook(self, committing, may_prompt, verbose, change):
1540 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1541 try:
1542 return presubmit_support.DoPresubmitChecks(change, committing,
1543 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1544 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001545 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1546 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001547 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001548 DieWithError(
1549 ('%s\nMaybe your depot_tools is out of date?\n'
1550 'If all fails, contact maruel@') % e)
1551
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001552 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1553 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001554 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1555 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001556 else:
1557 # Assume url.
1558 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1559 urlparse.urlparse(issue_arg))
1560 if not parsed_issue_arg or not parsed_issue_arg.valid:
1561 DieWithError('Failed to parse issue argument "%s". '
1562 'Must be an issue number or a valid URL.' % issue_arg)
1563 return self._codereview_impl.CMDPatchWithParsedIssue(
1564 parsed_issue_arg, reject, nocommit, directory)
1565
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001566 def CMDUpload(self, options, git_diff_args, orig_args):
1567 """Uploads a change to codereview."""
1568 if git_diff_args:
1569 # TODO(ukai): is it ok for gerrit case?
1570 base_branch = git_diff_args[0]
1571 else:
1572 if self.GetBranch() is None:
1573 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1574
1575 # Default to diffing against common ancestor of upstream branch
1576 base_branch = self.GetCommonAncestorWithUpstream()
1577 git_diff_args = [base_branch, 'HEAD']
1578
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001579 # Fast best-effort checks to abort before running potentially
1580 # expensive hooks if uploading is likely to fail anyway. Passing these
1581 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001582 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001583 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001584
1585 # Apply watchlists on upload.
1586 change = self.GetChange(base_branch, None)
1587 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1588 files = [f.LocalPath() for f in change.AffectedFiles()]
1589 if not options.bypass_watchlists:
1590 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1591
1592 if not options.bypass_hooks:
1593 if options.reviewers or options.tbr_owners:
1594 # Set the reviewer list now so that presubmit checks can access it.
1595 change_description = ChangeDescription(change.FullDescriptionText())
1596 change_description.update_reviewers(options.reviewers,
1597 options.tbr_owners,
1598 change)
1599 change.SetDescriptionText(change_description.description)
1600 hook_results = self.RunHook(committing=False,
1601 may_prompt=not options.force,
1602 verbose=options.verbose,
1603 change=change)
1604 if not hook_results.should_continue():
1605 return 1
1606 if not options.reviewers and hook_results.reviewers:
1607 options.reviewers = hook_results.reviewers.split(',')
1608
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001609 # TODO(tandrii): Checking local patchset against remote patchset is only
1610 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1611 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001612 latest_patchset = self.GetMostRecentPatchset()
1613 local_patchset = self.GetPatchset()
1614 if (latest_patchset and local_patchset and
1615 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001616 print('The last upload made from this repository was patchset #%d but '
1617 'the most recent patchset on the server is #%d.'
1618 % (local_patchset, latest_patchset))
1619 print('Uploading will still work, but if you\'ve uploaded to this '
1620 'issue from another machine or branch the patch you\'re '
1621 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001622 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001623
1624 print_stats(options.similarity, options.find_copies, git_diff_args)
1625 ret = self.CMDUploadChange(options, git_diff_args, change)
1626 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001627 if options.use_commit_queue:
1628 self.SetCQState(_CQState.COMMIT)
1629 elif options.cq_dry_run:
1630 self.SetCQState(_CQState.DRY_RUN)
1631
tandrii5d48c322016-08-18 16:19:37 -07001632 _git_set_branch_config_value('last-upload-hash',
1633 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001634 # Run post upload hooks, if specified.
1635 if settings.GetRunPostUploadHook():
1636 presubmit_support.DoPostUploadExecuter(
1637 change,
1638 self,
1639 settings.GetRoot(),
1640 options.verbose,
1641 sys.stdout)
1642
1643 # Upload all dependencies if specified.
1644 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001645 print()
1646 print('--dependencies has been specified.')
1647 print('All dependent local branches will be re-uploaded.')
1648 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001649 # Remove the dependencies flag from args so that we do not end up in a
1650 # loop.
1651 orig_args.remove('--dependencies')
1652 ret = upload_branch_deps(self, orig_args)
1653 return ret
1654
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001655 def SetCQState(self, new_state):
1656 """Update the CQ state for latest patchset.
1657
1658 Issue must have been already uploaded and known.
1659 """
1660 assert new_state in _CQState.ALL_STATES
1661 assert self.GetIssue()
1662 return self._codereview_impl.SetCQState(new_state)
1663
qyearsley1fdfcb62016-10-24 13:22:03 -07001664 def TriggerDryRun(self):
1665 """Triggers a dry run and prints a warning on failure."""
1666 # TODO(qyearsley): Either re-use this method in CMDset_commit
1667 # and CMDupload, or change CMDtry to trigger dry runs with
1668 # just SetCQState, and catch keyboard interrupt and other
1669 # errors in that method.
1670 try:
1671 self.SetCQState(_CQState.DRY_RUN)
1672 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1673 return 0
1674 except KeyboardInterrupt:
1675 raise
1676 except:
1677 print('WARNING: failed to trigger CQ Dry Run.\n'
1678 'Either:\n'
1679 ' * your project has no CQ\n'
1680 ' * you don\'t have permission to trigger Dry Run\n'
1681 ' * bug in this code (see stack trace below).\n'
1682 'Consider specifying which bots to trigger manually '
1683 'or asking your project owners for permissions '
1684 'or contacting Chrome Infrastructure team at '
1685 'https://www.chromium.org/infra\n\n')
1686 # Still raise exception so that stack trace is printed.
1687 raise
1688
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001689 # Forward methods to codereview specific implementation.
1690
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001691 def AddComment(self, message):
1692 return self._codereview_impl.AddComment(message)
1693
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001694 def GetCommentsSummary(self):
1695 """Returns list of _CommentSummary for each comment.
1696
1697 Note: comments per file or per line are not included,
1698 only top-level comments are returned.
1699 """
1700 return self._codereview_impl.GetCommentsSummary()
1701
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702 def CloseIssue(self):
1703 return self._codereview_impl.CloseIssue()
1704
1705 def GetStatus(self):
1706 return self._codereview_impl.GetStatus()
1707
1708 def GetCodereviewServer(self):
1709 return self._codereview_impl.GetCodereviewServer()
1710
tandriide281ae2016-10-12 06:02:30 -07001711 def GetIssueOwner(self):
1712 """Get owner from codereview, which may differ from this checkout."""
1713 return self._codereview_impl.GetIssueOwner()
1714
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001715 def GetApprovingReviewers(self):
1716 return self._codereview_impl.GetApprovingReviewers()
1717
1718 def GetMostRecentPatchset(self):
1719 return self._codereview_impl.GetMostRecentPatchset()
1720
tandriide281ae2016-10-12 06:02:30 -07001721 def CannotTriggerTryJobReason(self):
1722 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1723 return self._codereview_impl.CannotTriggerTryJobReason()
1724
tandrii8c5a3532016-11-04 07:52:02 -07001725 def GetTryjobProperties(self, patchset=None):
1726 """Returns dictionary of properties to launch tryjob."""
1727 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1728
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001729 def __getattr__(self, attr):
1730 # This is because lots of untested code accesses Rietveld-specific stuff
1731 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001732 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001733 # Note that child method defines __getattr__ as well, and forwards it here,
1734 # because _RietveldChangelistImpl is not cleaned up yet, and given
1735 # deprecation of Rietveld, it should probably be just removed.
1736 # Until that time, avoid infinite recursion by bypassing __getattr__
1737 # of implementation class.
1738 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001739
1740
1741class _ChangelistCodereviewBase(object):
1742 """Abstract base class encapsulating codereview specifics of a changelist."""
1743 def __init__(self, changelist):
1744 self._changelist = changelist # instance of Changelist
1745
1746 def __getattr__(self, attr):
1747 # Forward methods to changelist.
1748 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1749 # _RietveldChangelistImpl to avoid this hack?
1750 return getattr(self._changelist, attr)
1751
1752 def GetStatus(self):
1753 """Apply a rough heuristic to give a simple summary of an issue's review
1754 or CQ status, assuming adherence to a common workflow.
1755
1756 Returns None if no issue for this branch, or specific string keywords.
1757 """
1758 raise NotImplementedError()
1759
1760 def GetCodereviewServer(self):
1761 """Returns server URL without end slash, like "https://codereview.com"."""
1762 raise NotImplementedError()
1763
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001764 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001765 """Fetches and returns description from the codereview server."""
1766 raise NotImplementedError()
1767
tandrii5d48c322016-08-18 16:19:37 -07001768 @classmethod
1769 def IssueConfigKey(cls):
1770 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001771 raise NotImplementedError()
1772
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001773 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001774 def PatchsetConfigKey(cls):
1775 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001776 raise NotImplementedError()
1777
tandrii5d48c322016-08-18 16:19:37 -07001778 @classmethod
1779 def CodereviewServerConfigKey(cls):
1780 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001781 raise NotImplementedError()
1782
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001783 def _PostUnsetIssueProperties(self):
1784 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001785 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001786
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001787 def GetRieveldObjForPresubmit(self):
1788 # This is an unfortunate Rietveld-embeddedness in presubmit.
1789 # For non-Rietveld codereviews, this probably should return a dummy object.
1790 raise NotImplementedError()
1791
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001792 def GetGerritObjForPresubmit(self):
1793 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1794 return None
1795
dsansomee2d6fd92016-09-08 00:10:47 -07001796 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797 """Update the description on codereview site."""
1798 raise NotImplementedError()
1799
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001800 def AddComment(self, message):
1801 """Posts a comment to the codereview site."""
1802 raise NotImplementedError()
1803
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001804 def GetCommentsSummary(self):
1805 raise NotImplementedError()
1806
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 def CloseIssue(self):
1808 """Closes the issue."""
1809 raise NotImplementedError()
1810
1811 def GetApprovingReviewers(self):
1812 """Returns a list of reviewers approving the change.
1813
1814 Note: not necessarily committers.
1815 """
1816 raise NotImplementedError()
1817
1818 def GetMostRecentPatchset(self):
1819 """Returns the most recent patchset number from the codereview site."""
1820 raise NotImplementedError()
1821
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001822 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1823 directory):
1824 """Fetches and applies the issue.
1825
1826 Arguments:
1827 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1828 reject: if True, reject the failed patch instead of switching to 3-way
1829 merge. Rietveld only.
1830 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1831 only.
1832 directory: switch to directory before applying the patch. Rietveld only.
1833 """
1834 raise NotImplementedError()
1835
1836 @staticmethod
1837 def ParseIssueURL(parsed_url):
1838 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1839 failed."""
1840 raise NotImplementedError()
1841
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001842 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001843 """Best effort check that user is authenticated with codereview server.
1844
1845 Arguments:
1846 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001847 refresh: whether to attempt to refresh credentials. Ignored if not
1848 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001849 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001850 raise NotImplementedError()
1851
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001852 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001853 """Best effort check that uploading isn't supposed to fail for predictable
1854 reasons.
1855
1856 This method should raise informative exception if uploading shouldn't
1857 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001858
1859 Arguments:
1860 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001861 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001862 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001863
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001864 def CMDUploadChange(self, options, args, change):
1865 """Uploads a change to codereview."""
1866 raise NotImplementedError()
1867
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001868 def SetCQState(self, new_state):
1869 """Update the CQ state for latest patchset.
1870
1871 Issue must have been already uploaded and known.
1872 """
1873 raise NotImplementedError()
1874
tandriie113dfd2016-10-11 10:20:12 -07001875 def CannotTriggerTryJobReason(self):
1876 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1877 raise NotImplementedError()
1878
tandriide281ae2016-10-12 06:02:30 -07001879 def GetIssueOwner(self):
1880 raise NotImplementedError()
1881
tandrii8c5a3532016-11-04 07:52:02 -07001882 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001883 raise NotImplementedError()
1884
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001885
1886class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001887 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001888 super(_RietveldChangelistImpl, self).__init__(changelist)
1889 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001890 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001891 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001892
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001893 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001894 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001895 self._props = None
1896 self._rpc_server = None
1897
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001898 def GetCodereviewServer(self):
1899 if not self._rietveld_server:
1900 # If we're on a branch then get the server potentially associated
1901 # with that branch.
1902 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001903 self._rietveld_server = gclient_utils.UpgradeToHttps(
1904 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905 if not self._rietveld_server:
1906 self._rietveld_server = settings.GetDefaultServerUrl()
1907 return self._rietveld_server
1908
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001909 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001910 """Best effort check that user is authenticated with Rietveld server."""
1911 if self._auth_config.use_oauth2:
1912 authenticator = auth.get_authenticator_for_host(
1913 self.GetCodereviewServer(), self._auth_config)
1914 if not authenticator.has_cached_credentials():
1915 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001916 if refresh:
1917 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001918
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001919 def EnsureCanUploadPatchset(self, force):
1920 # No checks for Rietveld because we are deprecating Rietveld.
1921 pass
1922
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001923 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001924 issue = self.GetIssue()
1925 assert issue
1926 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001927 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001928 except urllib2.HTTPError as e:
1929 if e.code == 404:
1930 DieWithError(
1931 ('\nWhile fetching the description for issue %d, received a '
1932 '404 (not found)\n'
1933 'error. It is likely that you deleted this '
1934 'issue on the server. If this is the\n'
1935 'case, please run\n\n'
1936 ' git cl issue 0\n\n'
1937 'to clear the association with the deleted issue. Then run '
1938 'this command again.') % issue)
1939 else:
1940 DieWithError(
1941 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1942 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001943 print('Warning: Failed to retrieve CL description due to network '
1944 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001945 return ''
1946
1947 def GetMostRecentPatchset(self):
1948 return self.GetIssueProperties()['patchsets'][-1]
1949
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001950 def GetIssueProperties(self):
1951 if self._props is None:
1952 issue = self.GetIssue()
1953 if not issue:
1954 self._props = {}
1955 else:
1956 self._props = self.RpcServer().get_issue_properties(issue, True)
1957 return self._props
1958
tandriie113dfd2016-10-11 10:20:12 -07001959 def CannotTriggerTryJobReason(self):
1960 props = self.GetIssueProperties()
1961 if not props:
1962 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1963 if props.get('closed'):
1964 return 'CL %s is closed' % self.GetIssue()
1965 if props.get('private'):
1966 return 'CL %s is private' % self.GetIssue()
1967 return None
1968
tandrii8c5a3532016-11-04 07:52:02 -07001969 def GetTryjobProperties(self, patchset=None):
1970 """Returns dictionary of properties to launch tryjob."""
1971 project = (self.GetIssueProperties() or {}).get('project')
1972 return {
1973 'issue': self.GetIssue(),
1974 'patch_project': project,
1975 'patch_storage': 'rietveld',
1976 'patchset': patchset or self.GetPatchset(),
1977 'rietveld': self.GetCodereviewServer(),
1978 }
1979
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001980 def GetApprovingReviewers(self):
1981 return get_approving_reviewers(self.GetIssueProperties())
1982
tandriide281ae2016-10-12 06:02:30 -07001983 def GetIssueOwner(self):
1984 return (self.GetIssueProperties() or {}).get('owner_email')
1985
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001986 def AddComment(self, message):
1987 return self.RpcServer().add_comment(self.GetIssue(), message)
1988
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001989 def GetCommentsSummary(self):
1990 summary = []
1991 for message in self.GetIssueProperties().get('messages', []):
1992 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
1993 summary.append(_CommentSummary(
1994 date=date,
1995 disapproval=bool(message['disapproval']),
1996 approval=bool(message['approval']),
1997 sender=message['sender'],
1998 message=message['text'],
1999 ))
2000 return summary
2001
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002002 def GetStatus(self):
2003 """Apply a rough heuristic to give a simple summary of an issue's review
2004 or CQ status, assuming adherence to a common workflow.
2005
2006 Returns None if no issue for this branch, or one of the following keywords:
2007 * 'error' - error from review tool (including deleted issues)
2008 * 'unsent' - not sent for review
2009 * 'waiting' - waiting for review
2010 * 'reply' - waiting for owner to reply to review
2011 * 'lgtm' - LGTM from at least one approved reviewer
2012 * 'commit' - in the commit queue
2013 * 'closed' - closed
2014 """
2015 if not self.GetIssue():
2016 return None
2017
2018 try:
2019 props = self.GetIssueProperties()
2020 except urllib2.HTTPError:
2021 return 'error'
2022
2023 if props.get('closed'):
2024 # Issue is closed.
2025 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002026 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002027 # Issue is in the commit queue.
2028 return 'commit'
2029
2030 try:
2031 reviewers = self.GetApprovingReviewers()
2032 except urllib2.HTTPError:
2033 return 'error'
2034
2035 if reviewers:
2036 # Was LGTM'ed.
2037 return 'lgtm'
2038
2039 messages = props.get('messages') or []
2040
tandrii9d2c7a32016-06-22 03:42:45 -07002041 # Skip CQ messages that don't require owner's action.
2042 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2043 if 'Dry run:' in messages[-1]['text']:
2044 messages.pop()
2045 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2046 # This message always follows prior messages from CQ,
2047 # so skip this too.
2048 messages.pop()
2049 else:
2050 # This is probably a CQ messages warranting user attention.
2051 break
2052
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002053 if not messages:
2054 # No message was sent.
2055 return 'unsent'
2056 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002057 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002058 return 'reply'
2059 return 'waiting'
2060
dsansomee2d6fd92016-09-08 00:10:47 -07002061 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002062 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002063
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002064 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002065 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002066
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002067 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002068 return self.SetFlags({flag: value})
2069
2070 def SetFlags(self, flags):
2071 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002072 """
phajdan.jr68598232016-08-10 03:28:28 -07002073 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002074 try:
tandrii4b233bd2016-07-06 03:50:29 -07002075 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002076 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002077 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002078 if e.code == 404:
2079 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2080 if e.code == 403:
2081 DieWithError(
2082 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002083 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002084 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002085
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002086 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002087 """Returns an upload.RpcServer() to access this review's rietveld instance.
2088 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002089 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002090 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002091 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002092 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002093 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002094
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002095 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002096 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002097 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002098
tandrii5d48c322016-08-18 16:19:37 -07002099 @classmethod
2100 def PatchsetConfigKey(cls):
2101 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002102
tandrii5d48c322016-08-18 16:19:37 -07002103 @classmethod
2104 def CodereviewServerConfigKey(cls):
2105 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002106
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002107 def GetRieveldObjForPresubmit(self):
2108 return self.RpcServer()
2109
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002110 def SetCQState(self, new_state):
2111 props = self.GetIssueProperties()
2112 if props.get('private'):
2113 DieWithError('Cannot set-commit on private issue')
2114
2115 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002116 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002117 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002118 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002119 else:
tandrii4b233bd2016-07-06 03:50:29 -07002120 assert new_state == _CQState.DRY_RUN
2121 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002122
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002123 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2124 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002125 # PatchIssue should never be called with a dirty tree. It is up to the
2126 # caller to check this, but just in case we assert here since the
2127 # consequences of the caller not checking this could be dire.
2128 assert(not git_common.is_dirty_git_tree('apply'))
2129 assert(parsed_issue_arg.valid)
2130 self._changelist.issue = parsed_issue_arg.issue
2131 if parsed_issue_arg.hostname:
2132 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2133
skobes6468b902016-10-24 08:45:10 -07002134 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2135 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2136 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002137 try:
skobes6468b902016-10-24 08:45:10 -07002138 scm_obj.apply_patch(patchset_object)
2139 except Exception as e:
2140 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 return 1
2142
2143 # If we had an issue, commit the current state and register the issue.
2144 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002145 self.SetIssue(self.GetIssue())
2146 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2148 'patch from issue %(i)s at patchset '
2149 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2150 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002151 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002153 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 return 0
2155
2156 @staticmethod
2157 def ParseIssueURL(parsed_url):
2158 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2159 return None
wychen3c1c1722016-08-04 11:46:36 -07002160 # Rietveld patch: https://domain/<number>/#ps<patchset>
2161 match = re.match(r'/(\d+)/$', parsed_url.path)
2162 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2163 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002164 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002165 issue=int(match.group(1)),
2166 patchset=int(match2.group(1)),
2167 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002168 # Typical url: https://domain/<issue_number>[/[other]]
2169 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2170 if match:
skobes6468b902016-10-24 08:45:10 -07002171 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 issue=int(match.group(1)),
2173 hostname=parsed_url.netloc)
2174 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2175 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2176 if match:
skobes6468b902016-10-24 08:45:10 -07002177 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 issue=int(match.group(1)),
2179 patchset=int(match.group(2)),
skobes6468b902016-10-24 08:45:10 -07002180 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002181 return None
2182
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002183 def CMDUploadChange(self, options, args, change):
2184 """Upload the patch to Rietveld."""
2185 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2186 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002187 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2188 if options.emulate_svn_auto_props:
2189 upload_args.append('--emulate_svn_auto_props')
2190
2191 change_desc = None
2192
2193 if options.email is not None:
2194 upload_args.extend(['--email', options.email])
2195
2196 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002197 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002198 upload_args.extend(['--title', options.title])
2199 if options.message:
2200 upload_args.extend(['--message', options.message])
2201 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002202 print('This branch is associated with issue %s. '
2203 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 else:
nodirca166002016-06-27 10:59:51 -07002205 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002206 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002207 if options.message:
2208 message = options.message
2209 else:
2210 message = CreateDescriptionFromLog(args)
2211 if options.title:
2212 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002213 change_desc = ChangeDescription(message)
2214 if options.reviewers or options.tbr_owners:
2215 change_desc.update_reviewers(options.reviewers,
2216 options.tbr_owners,
2217 change)
2218 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002219 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002220
2221 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002222 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002223 return 1
2224
2225 upload_args.extend(['--message', change_desc.description])
2226 if change_desc.get_reviewers():
2227 upload_args.append('--reviewers=%s' % ','.join(
2228 change_desc.get_reviewers()))
2229 if options.send_mail:
2230 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002231 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002232 upload_args.append('--send_mail')
2233
2234 # We check this before applying rietveld.private assuming that in
2235 # rietveld.cc only addresses which we can send private CLs to are listed
2236 # if rietveld.private is set, and so we should ignore rietveld.cc only
2237 # when --private is specified explicitly on the command line.
2238 if options.private:
2239 logging.warn('rietveld.cc is ignored since private flag is specified. '
2240 'You need to review and add them manually if necessary.')
2241 cc = self.GetCCListWithoutDefault()
2242 else:
2243 cc = self.GetCCList()
2244 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002245 if change_desc.get_cced():
2246 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002247 if cc:
2248 upload_args.extend(['--cc', cc])
2249
2250 if options.private or settings.GetDefaultPrivateFlag() == "True":
2251 upload_args.append('--private')
2252
2253 upload_args.extend(['--git_similarity', str(options.similarity)])
2254 if not options.find_copies:
2255 upload_args.extend(['--git_no_find_copies'])
2256
2257 # Include the upstream repo's URL in the change -- this is useful for
2258 # projects that have their source spread across multiple repos.
2259 remote_url = self.GetGitBaseUrlFromConfig()
2260 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002261 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2262 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2263 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002264 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002265 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002266 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002267 if target_ref:
2268 upload_args.extend(['--target_ref', target_ref])
2269
2270 # Look for dependent patchsets. See crbug.com/480453 for more details.
2271 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2272 upstream_branch = ShortBranchName(upstream_branch)
2273 if remote is '.':
2274 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002275 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002276 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002277 print()
2278 print('Skipping dependency patchset upload because git config '
2279 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2280 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002281 else:
2282 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002283 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284 auth_config=auth_config)
2285 branch_cl_issue_url = branch_cl.GetIssueURL()
2286 branch_cl_issue = branch_cl.GetIssue()
2287 branch_cl_patchset = branch_cl.GetPatchset()
2288 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2289 upload_args.extend(
2290 ['--depends_on_patchset', '%s:%s' % (
2291 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002292 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002293 '\n'
2294 'The current branch (%s) is tracking a local branch (%s) with '
2295 'an associated CL.\n'
2296 'Adding %s/#ps%s as a dependency patchset.\n'
2297 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2298 branch_cl_patchset))
2299
2300 project = settings.GetProject()
2301 if project:
2302 upload_args.extend(['--project', project])
2303
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002304 try:
2305 upload_args = ['upload'] + upload_args + args
2306 logging.info('upload.RealMain(%s)', upload_args)
2307 issue, patchset = upload.RealMain(upload_args)
2308 issue = int(issue)
2309 patchset = int(patchset)
2310 except KeyboardInterrupt:
2311 sys.exit(1)
2312 except:
2313 # If we got an exception after the user typed a description for their
2314 # change, back up the description before re-raising.
2315 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002316 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002317 raise
2318
2319 if not self.GetIssue():
2320 self.SetIssue(issue)
2321 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002322 return 0
2323
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002324
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002325class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002326 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002327 # auth_config is Rietveld thing, kept here to preserve interface only.
2328 super(_GerritChangelistImpl, self).__init__(changelist)
2329 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002330 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002331 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002332 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002333 # Map from change number (issue) to its detail cache.
2334 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002335
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002336 if codereview_host is not None:
2337 assert not codereview_host.startswith('https://'), codereview_host
2338 self._gerrit_host = codereview_host
2339 self._gerrit_server = 'https://%s' % codereview_host
2340
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002341 def _GetGerritHost(self):
2342 # Lazy load of configs.
2343 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002344 if self._gerrit_host and '.' not in self._gerrit_host:
2345 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2346 # This happens for internal stuff http://crbug.com/614312.
2347 parsed = urlparse.urlparse(self.GetRemoteUrl())
2348 if parsed.scheme == 'sso':
2349 print('WARNING: using non https URLs for remote is likely broken\n'
2350 ' Your current remote is: %s' % self.GetRemoteUrl())
2351 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2352 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002353 return self._gerrit_host
2354
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002355 def _GetGitHost(self):
2356 """Returns git host to be used when uploading change to Gerrit."""
2357 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2358
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002359 def GetCodereviewServer(self):
2360 if not self._gerrit_server:
2361 # If we're on a branch then get the server potentially associated
2362 # with that branch.
2363 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002364 self._gerrit_server = self._GitGetBranchConfigValue(
2365 self.CodereviewServerConfigKey())
2366 if self._gerrit_server:
2367 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002368 if not self._gerrit_server:
2369 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2370 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002371 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002372 parts[0] = parts[0] + '-review'
2373 self._gerrit_host = '.'.join(parts)
2374 self._gerrit_server = 'https://%s' % self._gerrit_host
2375 return self._gerrit_server
2376
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002377 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002378 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002379 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002380
tandrii5d48c322016-08-18 16:19:37 -07002381 @classmethod
2382 def PatchsetConfigKey(cls):
2383 return 'gerritpatchset'
2384
2385 @classmethod
2386 def CodereviewServerConfigKey(cls):
2387 return 'gerritserver'
2388
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002389 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002390 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002391 if settings.GetGerritSkipEnsureAuthenticated():
2392 # For projects with unusual authentication schemes.
2393 # See http://crbug.com/603378.
2394 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002395 # Lazy-loader to identify Gerrit and Git hosts.
2396 if gerrit_util.GceAuthenticator.is_gce():
2397 return
2398 self.GetCodereviewServer()
2399 git_host = self._GetGitHost()
2400 assert self._gerrit_server and self._gerrit_host
2401 cookie_auth = gerrit_util.CookiesAuthenticator()
2402
2403 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2404 git_auth = cookie_auth.get_auth_header(git_host)
2405 if gerrit_auth and git_auth:
2406 if gerrit_auth == git_auth:
2407 return
2408 print((
2409 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2410 ' Check your %s or %s file for credentials of hosts:\n'
2411 ' %s\n'
2412 ' %s\n'
2413 ' %s') %
2414 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2415 git_host, self._gerrit_host,
2416 cookie_auth.get_new_password_message(git_host)))
2417 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002418 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002419 return
2420 else:
2421 missing = (
2422 [] if gerrit_auth else [self._gerrit_host] +
2423 [] if git_auth else [git_host])
2424 DieWithError('Credentials for the following hosts are required:\n'
2425 ' %s\n'
2426 'These are read from %s (or legacy %s)\n'
2427 '%s' % (
2428 '\n '.join(missing),
2429 cookie_auth.get_gitcookies_path(),
2430 cookie_auth.get_netrc_path(),
2431 cookie_auth.get_new_password_message(git_host)))
2432
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002433 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002434 if not self.GetIssue():
2435 return
2436
2437 # Warm change details cache now to avoid RPCs later, reducing latency for
2438 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002439 self._GetChangeDetail(
2440 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002441
2442 status = self._GetChangeDetail()['status']
2443 if status in ('MERGED', 'ABANDONED'):
2444 DieWithError('Change %s has been %s, new uploads are not allowed' %
2445 (self.GetIssueURL(),
2446 'submitted' if status == 'MERGED' else 'abandoned'))
2447
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002448 if gerrit_util.GceAuthenticator.is_gce():
2449 return
2450 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2451 self._GetGerritHost())
2452 if self.GetIssueOwner() == cookies_user:
2453 return
2454 logging.debug('change %s owner is %s, cookies user is %s',
2455 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2456 # Maybe user has linked accounts or smth like that,
2457 # so ask what Gerrit thinks of this user.
2458 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2459 if details['email'] == self.GetIssueOwner():
2460 return
2461 if not force:
2462 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2463 'as %s.\n'
2464 'Uploading may fail due to lack of permissions.' %
2465 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2466 confirm_or_exit(action='upload')
2467
2468
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002469 def _PostUnsetIssueProperties(self):
2470 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002471 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002472
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002473 def GetRieveldObjForPresubmit(self):
2474 class ThisIsNotRietveldIssue(object):
2475 def __nonzero__(self):
2476 # This is a hack to make presubmit_support think that rietveld is not
2477 # defined, yet still ensure that calls directly result in a decent
2478 # exception message below.
2479 return False
2480
2481 def __getattr__(self, attr):
2482 print(
2483 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2484 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2485 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2486 'or use Rietveld for codereview.\n'
2487 'See also http://crbug.com/579160.' % attr)
2488 raise NotImplementedError()
2489 return ThisIsNotRietveldIssue()
2490
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002491 def GetGerritObjForPresubmit(self):
2492 return presubmit_support.GerritAccessor(self._GetGerritHost())
2493
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002494 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002495 """Apply a rough heuristic to give a simple summary of an issue's review
2496 or CQ status, assuming adherence to a common workflow.
2497
2498 Returns None if no issue for this branch, or one of the following keywords:
2499 * 'error' - error from review tool (including deleted issues)
2500 * 'unsent' - no reviewers added
2501 * 'waiting' - waiting for review
2502 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002503 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002504 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002505 * 'commit' - in the commit queue
2506 * 'closed' - abandoned
2507 """
2508 if not self.GetIssue():
2509 return None
2510
2511 try:
2512 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002513 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002514 return 'error'
2515
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002516 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002517 return 'closed'
2518
2519 cq_label = data['labels'].get('Commit-Queue', {})
2520 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002521 votes = cq_label.get('all', [])
2522 highest_vote = 0
2523 for v in votes:
2524 highest_vote = max(highest_vote, v.get('value', 0))
2525 vote_value = str(highest_vote)
2526 if vote_value != '0':
2527 # Add a '+' if the value is not 0 to match the values in the label.
2528 # The cq_label does not have negatives.
2529 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002530 vote_text = cq_label.get('values', {}).get(vote_value, '')
2531 if vote_text.lower() == 'commit':
2532 return 'commit'
2533
2534 lgtm_label = data['labels'].get('Code-Review', {})
2535 if lgtm_label:
2536 if 'rejected' in lgtm_label:
2537 return 'not lgtm'
2538 if 'approved' in lgtm_label:
2539 return 'lgtm'
2540
2541 if not data.get('reviewers', {}).get('REVIEWER', []):
2542 return 'unsent'
2543
2544 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002545 owner = data['owner'].get('_account_id')
2546 while messages:
2547 last_message_author = messages.pop().get('author', {})
2548 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2549 # Ignore replies from CQ.
2550 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002551 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002552 # Some reply from non-owner.
2553 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002555
2556 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002557 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002558 return data['revisions'][data['current_revision']]['_number']
2559
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002560 def FetchDescription(self, force=False):
2561 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2562 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002563 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002564 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002565
dsansomee2d6fd92016-09-08 00:10:47 -07002566 def UpdateDescriptionRemote(self, description, force=False):
2567 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2568 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002569 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002570 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002571 'unpublished edit. Either publish the edit in the Gerrit web UI '
2572 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002573
2574 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2575 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002576 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002577 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002578
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002579 def AddComment(self, message):
2580 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2581 msg=message)
2582
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002583 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002584 # DETAILED_ACCOUNTS is to get emails in accounts.
2585 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2586 summary = []
2587 for msg in data.get('messages', []):
2588 # Gerrit spits out nanoseconds.
2589 assert len(msg['date'].split('.')[-1]) == 9
2590 date = datetime.datetime.strptime(msg['date'][:-3],
2591 '%Y-%m-%d %H:%M:%S.%f')
2592 summary.append(_CommentSummary(
2593 date=date,
2594 message=msg['message'],
2595 sender=msg['author']['email'],
2596 # These could be inferred from the text messages and correlated with
2597 # Code-Review label maximum, however this is not reliable.
2598 # Leaving as is until the need arises.
2599 approval=False,
2600 disapproval=False,
2601 ))
2602 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002603
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002604 def CloseIssue(self):
2605 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2606
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002607 def GetApprovingReviewers(self):
2608 """Returns a list of reviewers approving the change.
2609
2610 Note: not necessarily committers.
2611 """
2612 raise NotImplementedError()
2613
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002614 def SubmitIssue(self, wait_for_merge=True):
2615 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2616 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002617
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002618 def _GetChangeDetail(self, options=None, issue=None,
2619 no_cache=False):
2620 """Returns details of the issue by querying Gerrit and caching results.
2621
2622 If fresh data is needed, set no_cache=True which will clear cache and
2623 thus new data will be fetched from Gerrit.
2624 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002625 options = options or []
2626 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002627 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002628
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002629 # Optimization to avoid multiple RPCs:
2630 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2631 'CURRENT_COMMIT' not in options):
2632 options.append('CURRENT_COMMIT')
2633
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002634 # Normalize issue and options for consistent keys in cache.
2635 issue = str(issue)
2636 options = [o.upper() for o in options]
2637
2638 # Check in cache first unless no_cache is True.
2639 if no_cache:
2640 self._detail_cache.pop(issue, None)
2641 else:
2642 options_set = frozenset(options)
2643 for cached_options_set, data in self._detail_cache.get(issue, []):
2644 # Assumption: data fetched before with extra options is suitable
2645 # for return for a smaller set of options.
2646 # For example, if we cached data for
2647 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2648 # and request is for options=[CURRENT_REVISION],
2649 # THEN we can return prior cached data.
2650 if options_set.issubset(cached_options_set):
2651 return data
2652
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002653 try:
2654 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2655 options, ignore_404=False)
2656 except gerrit_util.GerritError as e:
2657 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002658 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002659 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002660
2661 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002662 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002663
agable32978d92016-11-01 12:55:02 -07002664 def _GetChangeCommit(self, issue=None):
2665 issue = issue or self.GetIssue()
2666 assert issue, 'issue is required to query Gerrit'
2667 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2668 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002669 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002670 return data
2671
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002672 def CMDLand(self, force, bypass_hooks, verbose):
2673 if git_common.is_dirty_git_tree('land'):
2674 return 1
tandriid60367b2016-06-22 05:25:12 -07002675 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2676 if u'Commit-Queue' in detail.get('labels', {}):
2677 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002678 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2679 'which can test and land changes for you. '
2680 'Are you sure you wish to bypass it?\n',
2681 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002682
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002683 differs = True
tandriic4344b52016-08-29 06:04:54 -07002684 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002685 # Note: git diff outputs nothing if there is no diff.
2686 if not last_upload or RunGit(['diff', last_upload]).strip():
2687 print('WARNING: some changes from local branch haven\'t been uploaded')
2688 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002689 if detail['current_revision'] == last_upload:
2690 differs = False
2691 else:
2692 print('WARNING: local branch contents differ from latest uploaded '
2693 'patchset')
2694 if differs:
2695 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002696 confirm_or_exit(
2697 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2698 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002699 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2700 elif not bypass_hooks:
2701 hook_results = self.RunHook(
2702 committing=True,
2703 may_prompt=not force,
2704 verbose=verbose,
2705 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2706 if not hook_results.should_continue():
2707 return 1
2708
2709 self.SubmitIssue(wait_for_merge=True)
2710 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002711 links = self._GetChangeCommit().get('web_links', [])
2712 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002713 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002714 print('Landed as %s' % link.get('url'))
2715 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002716 return 0
2717
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002718 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2719 directory):
2720 assert not reject
2721 assert not nocommit
2722 assert not directory
2723 assert parsed_issue_arg.valid
2724
2725 self._changelist.issue = parsed_issue_arg.issue
2726
2727 if parsed_issue_arg.hostname:
2728 self._gerrit_host = parsed_issue_arg.hostname
2729 self._gerrit_server = 'https://%s' % self._gerrit_host
2730
tandriic2405f52016-10-10 08:13:15 -07002731 try:
2732 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002733 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002734 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002735
2736 if not parsed_issue_arg.patchset:
2737 # Use current revision by default.
2738 revision_info = detail['revisions'][detail['current_revision']]
2739 patchset = int(revision_info['_number'])
2740 else:
2741 patchset = parsed_issue_arg.patchset
2742 for revision_info in detail['revisions'].itervalues():
2743 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2744 break
2745 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002746 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002747 (parsed_issue_arg.patchset, self.GetIssue()))
2748
2749 fetch_info = revision_info['fetch']['http']
2750 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002751 self.SetIssue(self.GetIssue())
2752 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002753 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002754 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002755 (self.GetIssue(), self.GetPatchset()))
2756 return 0
2757
2758 @staticmethod
2759 def ParseIssueURL(parsed_url):
2760 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2761 return None
2762 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2763 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2764 # Short urls like https://domain/<issue_number> can be used, but don't allow
2765 # specifying the patchset (you'd 404), but we allow that here.
2766 if parsed_url.path == '/':
2767 part = parsed_url.fragment
2768 else:
2769 part = parsed_url.path
2770 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2771 if match:
2772 return _ParsedIssueNumberArgument(
2773 issue=int(match.group(2)),
2774 patchset=int(match.group(4)) if match.group(4) else None,
2775 hostname=parsed_url.netloc)
2776 return None
2777
tandrii16e0b4e2016-06-07 10:34:28 -07002778 def _GerritCommitMsgHookCheck(self, offer_removal):
2779 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2780 if not os.path.exists(hook):
2781 return
2782 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2783 # custom developer made one.
2784 data = gclient_utils.FileRead(hook)
2785 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2786 return
2787 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002788 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002789 'and may interfere with it in subtle ways.\n'
2790 'We recommend you remove the commit-msg hook.')
2791 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002792 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002793 gclient_utils.rm_file_or_tree(hook)
2794 print('Gerrit commit-msg hook removed.')
2795 else:
2796 print('OK, will keep Gerrit commit-msg hook in place.')
2797
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002798 def CMDUploadChange(self, options, args, change):
2799 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002800 if options.squash and options.no_squash:
2801 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002802
2803 if not options.squash and not options.no_squash:
2804 # Load default for user, repo, squash=true, in this order.
2805 options.squash = settings.GetSquashGerritUploads()
2806 elif options.no_squash:
2807 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002808
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002809 # We assume the remote called "origin" is the one we want.
2810 # It is probably not worthwhile to support different workflows.
2811 gerrit_remote = 'origin'
2812
2813 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002814 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002815
Aaron Gableb56ad332017-01-06 15:24:31 -08002816 # This may be None; default fallback value is determined in logic below.
2817 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002818 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002819
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002820 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002821 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002822 if self.GetIssue():
2823 # Try to get the message from a previous upload.
2824 message = self.GetDescription()
2825 if not message:
2826 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002827 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002828 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002829 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002830 if options.message:
2831 # For compatibility with Rietveld, if -m|--message is given on
2832 # command line, title should be the first line of that message,
2833 # which shouldn't be confused with CL description.
2834 default_title = options.message.strip().split()[0]
2835 else:
2836 default_title = RunGit(
2837 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002838 if options.force:
2839 title = default_title
2840 else:
2841 title = ask_for_data(
2842 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002843 if title == default_title:
2844 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002845 change_id = self._GetChangeDetail()['change_id']
2846 while True:
2847 footer_change_ids = git_footers.get_footer_change_id(message)
2848 if footer_change_ids == [change_id]:
2849 break
2850 if not footer_change_ids:
2851 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002852 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002853 continue
2854 # There is already a valid footer but with different or several ids.
2855 # Doing this automatically is non-trivial as we don't want to lose
2856 # existing other footers, yet we want to append just 1 desired
2857 # Change-Id. Thus, just create a new footer, but let user verify the
2858 # new description.
2859 message = '%s\n\nChange-Id: %s' % (message, change_id)
2860 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002861 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002862 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002863 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002864 'Please, check the proposed correction to the description, '
2865 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2866 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2867 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002868 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002869 if not options.force:
2870 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002871 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002872 message = change_desc.description
2873 if not message:
2874 DieWithError("Description is empty. Aborting...")
2875 # Continue the while loop.
2876 # Sanity check of this code - we should end up with proper message
2877 # footer.
2878 assert [change_id] == git_footers.get_footer_change_id(message)
2879 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002880 else: # if not self.GetIssue()
2881 if options.message:
2882 message = options.message
2883 else:
2884 message = CreateDescriptionFromLog(args)
2885 if options.title:
2886 message = options.title + '\n\n' + message
2887 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002889 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002890 # On first upload, patchset title is always this string, while
2891 # --title flag gets converted to first line of message.
2892 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002893 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002894 if not change_desc.description:
2895 DieWithError("Description is empty. Aborting...")
2896 message = change_desc.description
2897 change_ids = git_footers.get_footer_change_id(message)
2898 if len(change_ids) > 1:
2899 DieWithError('too many Change-Id footers, at most 1 allowed.')
2900 if not change_ids:
2901 # Generate the Change-Id automatically.
2902 message = git_footers.add_footer_change_id(
2903 message, GenerateGerritChangeId(message))
2904 change_desc.set_description(message)
2905 change_ids = git_footers.get_footer_change_id(message)
2906 assert len(change_ids) == 1
2907 change_id = change_ids[0]
2908
2909 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Aaron Gablef97e33d2017-03-30 15:44:27 -07002910 parent = self._ComputeParent(remote, upstream_branch, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002911 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2912 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2913 '-m', message]).strip()
2914 else:
2915 change_desc = ChangeDescription(
2916 options.message or CreateDescriptionFromLog(args))
2917 if not change_desc.description:
2918 DieWithError("Description is empty. Aborting...")
2919
2920 if not git_footers.get_footer_change_id(change_desc.description):
2921 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002922 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2923 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002924 ref_to_push = 'HEAD'
2925 parent = '%s/%s' % (gerrit_remote, branch)
2926 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2927
2928 assert change_desc
2929 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2930 ref_to_push)]).splitlines()
2931 if len(commits) > 1:
2932 print('WARNING: This will upload %d commits. Run the following command '
2933 'to see which commits will be uploaded: ' % len(commits))
2934 print('git log %s..%s' % (parent, ref_to_push))
2935 print('You can also use `git squash-branch` to squash these into a '
2936 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002937 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002938
2939 if options.reviewers or options.tbr_owners:
2940 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2941 change)
2942
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002943 # Extra options that can be specified at push time. Doc:
2944 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002945 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002946 if change_desc.get_reviewers(tbr_only=True):
2947 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002948 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002949
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002950
2951 # TODO(tandrii): options.message should be posted as a comment
2952 # if --send-email is set on non-initial upload as Rietveld used to do it.
2953
Aaron Gable9b713dd2016-12-14 16:04:21 -08002954 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002955 if not re.match(r'^[\w ]+$', title):
2956 title = re.sub(r'[^\w ]', '', title)
2957 if not automatic_title:
2958 print('WARNING: Patchset title may only contain alphanumeric chars '
2959 'and spaces. You can edit it in the UI. '
2960 'See https://crbug.com/663787.\n'
2961 'Cleaned up title: %s' % title)
2962 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2963 # reverse on its side.
2964 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002965
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002966 if options.send_mail:
2967 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002968 DieWithError('Must specify reviewers to send email.', change_desc)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002969 refspec_opts.append('notify=ALL')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002970 else:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002971 refspec_opts.append('notify=NONE')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002972
tandrii99a72f22016-08-17 14:33:24 -07002973 reviewers = change_desc.get_reviewers()
2974 if reviewers:
Andrii Shyshkalovfbee1652017-04-10 14:00:51 +02002975 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002976
agablec6787972016-09-09 16:13:34 -07002977 if options.private:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002978 refspec_opts.append('draft')
agablec6787972016-09-09 16:13:34 -07002979
rmistry9eadede2016-09-19 11:22:43 -07002980 if options.topic:
2981 # Documentation on Gerrit topics is here:
2982 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002983 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002984
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002985 refspec_suffix = ''
2986 if refspec_opts:
2987 refspec_suffix = '%' + ','.join(refspec_opts)
2988 assert ' ' not in refspec_suffix, (
2989 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2990 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2991
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002992 try:
2993 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002994 ['git', 'push', self.GetRemoteUrl(), refspec],
2995 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002996 # Flush after every line: useful for seeing progress when running as
2997 # recipe.
2998 filter_fn=lambda _: sys.stdout.flush())
2999 except subprocess2.CalledProcessError:
3000 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003001 'for the reason of the failure.\n'
3002 'Hint: run command below to diangose common Git/Gerrit '
3003 'credential problems:\n'
3004 ' git cl creds-check\n',
3005 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003006
3007 if options.squash:
3008 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3009 change_numbers = [m.group(1)
3010 for m in map(regex.match, push_stdout.splitlines())
3011 if m]
3012 if len(change_numbers) != 1:
3013 DieWithError(
3014 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003015 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003016 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003017 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003018
3019 # Add cc's from the CC_LIST and --cc flag (if any).
3020 cc = self.GetCCList().split(',')
3021 if options.cc:
3022 cc.extend(options.cc)
3023 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003024 if change_desc.get_cced():
3025 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07003026 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08003027 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08003028 self._GetGerritHost(), self.GetIssue(), cc,
3029 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003030 return 0
3031
Aaron Gablef97e33d2017-03-30 15:44:27 -07003032 def _ComputeParent(self, remote, upstream_branch, change_desc):
3033 if remote != '.':
3034 return self.GetCommonAncestorWithUpstream()
3035
3036 # If our upstream branch is local, we base our squashed commit on its
3037 # squashed version.
3038 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3039
3040 # TODO(tandrii): Remove this master-specific hack
3041 # Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=682104
3042 if upstream_branch_name == 'master':
3043 return RunGitSilent(['rev-parse', 'origin/master']).strip()
3044
3045 # Check the squashed hash of the parent.
3046 parent = RunGit(['config',
3047 'branch.%s.gerritsquashhash' % upstream_branch_name],
3048 error_ok=True).strip()
3049 # Verify that the upstream branch has been uploaded too, otherwise
3050 # Gerrit will create additional CLs when uploading.
3051 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3052 RunGitSilent(['rev-parse', parent + ':'])):
3053 DieWithError(
3054 '\nUpload upstream branch %s first.\n'
3055 'It is likely that this branch has been rebased since its last '
3056 'upload, so you just need to upload it again.\n'
3057 '(If you uploaded it with --no-squash, then branch dependencies '
3058 'are not supported, and you should reupload with --squash.)'
3059 % upstream_branch_name,
3060 change_desc)
3061 return parent
3062
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003063 def _AddChangeIdToCommitMessage(self, options, args):
3064 """Re-commits using the current message, assumes the commit hook is in
3065 place.
3066 """
3067 log_desc = options.message or CreateDescriptionFromLog(args)
3068 git_command = ['commit', '--amend', '-m', log_desc]
3069 RunGit(git_command)
3070 new_log_desc = CreateDescriptionFromLog(args)
3071 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003072 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003073 return new_log_desc
3074 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003075 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003076
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003077 def SetCQState(self, new_state):
3078 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003079 vote_map = {
3080 _CQState.NONE: 0,
3081 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003082 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003083 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003084 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3085 if new_state == _CQState.DRY_RUN:
3086 # Don't spam everybody reviewer/owner.
3087 kwargs['notify'] = 'NONE'
3088 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003089
tandriie113dfd2016-10-11 10:20:12 -07003090 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003091 try:
3092 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003093 except GerritChangeNotExists:
3094 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003095
3096 if data['status'] in ('ABANDONED', 'MERGED'):
3097 return 'CL %s is closed' % self.GetIssue()
3098
3099 def GetTryjobProperties(self, patchset=None):
3100 """Returns dictionary of properties to launch tryjob."""
3101 data = self._GetChangeDetail(['ALL_REVISIONS'])
3102 patchset = int(patchset or self.GetPatchset())
3103 assert patchset
3104 revision_data = None # Pylint wants it to be defined.
3105 for revision_data in data['revisions'].itervalues():
3106 if int(revision_data['_number']) == patchset:
3107 break
3108 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003109 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003110 (patchset, self.GetIssue()))
3111 return {
3112 'patch_issue': self.GetIssue(),
3113 'patch_set': patchset or self.GetPatchset(),
3114 'patch_project': data['project'],
3115 'patch_storage': 'gerrit',
3116 'patch_ref': revision_data['fetch']['http']['ref'],
3117 'patch_repository_url': revision_data['fetch']['http']['url'],
3118 'patch_gerrit_url': self.GetCodereviewServer(),
3119 }
tandriie113dfd2016-10-11 10:20:12 -07003120
tandriide281ae2016-10-12 06:02:30 -07003121 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003122 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003123
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003124
3125_CODEREVIEW_IMPLEMENTATIONS = {
3126 'rietveld': _RietveldChangelistImpl,
3127 'gerrit': _GerritChangelistImpl,
3128}
3129
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003130
iannuccie53c9352016-08-17 14:40:40 -07003131def _add_codereview_issue_select_options(parser, extra=""):
3132 _add_codereview_select_options(parser)
3133
3134 text = ('Operate on this issue number instead of the current branch\'s '
3135 'implicit issue.')
3136 if extra:
3137 text += ' '+extra
3138 parser.add_option('-i', '--issue', type=int, help=text)
3139
3140
3141def _process_codereview_issue_select_options(parser, options):
3142 _process_codereview_select_options(parser, options)
3143 if options.issue is not None and not options.forced_codereview:
3144 parser.error('--issue must be specified with either --rietveld or --gerrit')
3145
3146
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003147def _add_codereview_select_options(parser):
3148 """Appends --gerrit and --rietveld options to force specific codereview."""
3149 parser.codereview_group = optparse.OptionGroup(
3150 parser, 'EXPERIMENTAL! Codereview override options')
3151 parser.add_option_group(parser.codereview_group)
3152 parser.codereview_group.add_option(
3153 '--gerrit', action='store_true',
3154 help='Force the use of Gerrit for codereview')
3155 parser.codereview_group.add_option(
3156 '--rietveld', action='store_true',
3157 help='Force the use of Rietveld for codereview')
3158
3159
3160def _process_codereview_select_options(parser, options):
3161 if options.gerrit and options.rietveld:
3162 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3163 options.forced_codereview = None
3164 if options.gerrit:
3165 options.forced_codereview = 'gerrit'
3166 elif options.rietveld:
3167 options.forced_codereview = 'rietveld'
3168
3169
tandriif9aefb72016-07-01 09:06:51 -07003170def _get_bug_line_values(default_project, bugs):
3171 """Given default_project and comma separated list of bugs, yields bug line
3172 values.
3173
3174 Each bug can be either:
3175 * a number, which is combined with default_project
3176 * string, which is left as is.
3177
3178 This function may produce more than one line, because bugdroid expects one
3179 project per line.
3180
3181 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3182 ['v8:123', 'chromium:789']
3183 """
3184 default_bugs = []
3185 others = []
3186 for bug in bugs.split(','):
3187 bug = bug.strip()
3188 if bug:
3189 try:
3190 default_bugs.append(int(bug))
3191 except ValueError:
3192 others.append(bug)
3193
3194 if default_bugs:
3195 default_bugs = ','.join(map(str, default_bugs))
3196 if default_project:
3197 yield '%s:%s' % (default_project, default_bugs)
3198 else:
3199 yield default_bugs
3200 for other in sorted(others):
3201 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3202 yield other
3203
3204
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003205class ChangeDescription(object):
3206 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003207 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003208 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003209 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003210 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003211
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003212 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003213 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003214
agable@chromium.org42c20792013-09-12 17:34:49 +00003215 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003216 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003217 return '\n'.join(self._description_lines)
3218
3219 def set_description(self, desc):
3220 if isinstance(desc, basestring):
3221 lines = desc.splitlines()
3222 else:
3223 lines = [line.rstrip() for line in desc]
3224 while lines and not lines[0]:
3225 lines.pop(0)
3226 while lines and not lines[-1]:
3227 lines.pop(-1)
3228 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003229
piman@chromium.org336f9122014-09-04 02:16:55 +00003230 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003231 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003232 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003233 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003234 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003235 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003236
agable@chromium.org42c20792013-09-12 17:34:49 +00003237 # Get the set of R= and TBR= lines and remove them from the desciption.
3238 regexp = re.compile(self.R_LINE)
3239 matches = [regexp.match(line) for line in self._description_lines]
3240 new_desc = [l for i, l in enumerate(self._description_lines)
3241 if not matches[i]]
3242 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003243
agable@chromium.org42c20792013-09-12 17:34:49 +00003244 # Construct new unified R= and TBR= lines.
3245 r_names = []
3246 tbr_names = []
3247 for match in matches:
3248 if not match:
3249 continue
3250 people = cleanup_list([match.group(2).strip()])
3251 if match.group(1) == 'TBR':
3252 tbr_names.extend(people)
3253 else:
3254 r_names.extend(people)
3255 for name in r_names:
3256 if name not in reviewers:
3257 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003258 if add_owners_tbr:
3259 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003260 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003261 all_reviewers = set(tbr_names + reviewers)
3262 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3263 all_reviewers)
3264 tbr_names.extend(owners_db.reviewers_for(missing_files,
3265 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003266 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3267 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3268
3269 # Put the new lines in the description where the old first R= line was.
3270 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3271 if 0 <= line_loc < len(self._description_lines):
3272 if new_tbr_line:
3273 self._description_lines.insert(line_loc, new_tbr_line)
3274 if new_r_line:
3275 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003276 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003277 if new_r_line:
3278 self.append_footer(new_r_line)
3279 if new_tbr_line:
3280 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003281
Aaron Gable3a16ed12017-03-23 10:51:55 -07003282 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003283 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003284 self.set_description([
3285 '# Enter a description of the change.',
3286 '# This will be displayed on the codereview site.',
3287 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003288 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003289 '--------------------',
3290 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003291
agable@chromium.org42c20792013-09-12 17:34:49 +00003292 regexp = re.compile(self.BUG_LINE)
3293 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003294 prefix = settings.GetBugPrefix()
3295 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003296 if git_footer:
3297 self.append_footer('Bug: %s' % ', '.join(values))
3298 else:
3299 for value in values:
3300 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003301
agable@chromium.org42c20792013-09-12 17:34:49 +00003302 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003303 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003304 if not content:
3305 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003306 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003307
3308 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003309 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3310 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003311 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003312 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003313
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003314 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003315 """Adds a footer line to the description.
3316
3317 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3318 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3319 that Gerrit footers are always at the end.
3320 """
3321 parsed_footer_line = git_footers.parse_footer(line)
3322 if parsed_footer_line:
3323 # Line is a gerrit footer in the form: Footer-Key: any value.
3324 # Thus, must be appended observing Gerrit footer rules.
3325 self.set_description(
3326 git_footers.add_footer(self.description,
3327 key=parsed_footer_line[0],
3328 value=parsed_footer_line[1]))
3329 return
3330
3331 if not self._description_lines:
3332 self._description_lines.append(line)
3333 return
3334
3335 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3336 if gerrit_footers:
3337 # git_footers.split_footers ensures that there is an empty line before
3338 # actual (gerrit) footers, if any. We have to keep it that way.
3339 assert top_lines and top_lines[-1] == ''
3340 top_lines, separator = top_lines[:-1], top_lines[-1:]
3341 else:
3342 separator = [] # No need for separator if there are no gerrit_footers.
3343
3344 prev_line = top_lines[-1] if top_lines else ''
3345 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3346 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3347 top_lines.append('')
3348 top_lines.append(line)
3349 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003350
tandrii99a72f22016-08-17 14:33:24 -07003351 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003352 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003353 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003354 reviewers = [match.group(2).strip()
3355 for match in matches
3356 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003357 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003358
bradnelsond975b302016-10-23 12:20:23 -07003359 def get_cced(self):
3360 """Retrieves the list of reviewers."""
3361 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3362 cced = [match.group(2).strip() for match in matches if match]
3363 return cleanup_list(cced)
3364
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003365 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3366 """Updates this commit description given the parent.
3367
3368 This is essentially what Gnumbd used to do.
3369 Consult https://goo.gl/WMmpDe for more details.
3370 """
3371 assert parent_msg # No, orphan branch creation isn't supported.
3372 assert parent_hash
3373 assert dest_ref
3374 parent_footer_map = git_footers.parse_footers(parent_msg)
3375 # This will also happily parse svn-position, which GnumbD is no longer
3376 # supporting. While we'd generate correct footers, the verifier plugin
3377 # installed in Gerrit will block such commit (ie git push below will fail).
3378 parent_position = git_footers.get_position(parent_footer_map)
3379
3380 # Cherry-picks may have last line obscuring their prior footers,
3381 # from git_footers perspective. This is also what Gnumbd did.
3382 cp_line = None
3383 if (self._description_lines and
3384 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3385 cp_line = self._description_lines.pop()
3386
3387 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3388
3389 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3390 # user interference with actual footers we'd insert below.
3391 for i, (k, v) in enumerate(parsed_footers):
3392 if k.startswith('Cr-'):
3393 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3394
3395 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003396 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003397 if parent_position[0] == dest_ref:
3398 # Same branch as parent.
3399 number = int(parent_position[1]) + 1
3400 else:
3401 number = 1 # New branch, and extra lineage.
3402 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3403 int(parent_position[1])))
3404
3405 parsed_footers.append(('Cr-Commit-Position',
3406 '%s@{#%d}' % (dest_ref, number)))
3407 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3408
3409 self._description_lines = top_lines
3410 if cp_line:
3411 self._description_lines.append(cp_line)
3412 if self._description_lines[-1] != '':
3413 self._description_lines.append('') # Ensure footer separator.
3414 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3415
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003416
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003417def get_approving_reviewers(props):
3418 """Retrieves the reviewers that approved a CL from the issue properties with
3419 messages.
3420
3421 Note that the list may contain reviewers that are not committer, thus are not
3422 considered by the CQ.
3423 """
3424 return sorted(
3425 set(
3426 message['sender']
3427 for message in props['messages']
3428 if message['approval'] and message['sender'] in props['reviewers']
3429 )
3430 )
3431
3432
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003433def FindCodereviewSettingsFile(filename='codereview.settings'):
3434 """Finds the given file starting in the cwd and going up.
3435
3436 Only looks up to the top of the repository unless an
3437 'inherit-review-settings-ok' file exists in the root of the repository.
3438 """
3439 inherit_ok_file = 'inherit-review-settings-ok'
3440 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003441 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003442 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3443 root = '/'
3444 while True:
3445 if filename in os.listdir(cwd):
3446 if os.path.isfile(os.path.join(cwd, filename)):
3447 return open(os.path.join(cwd, filename))
3448 if cwd == root:
3449 break
3450 cwd = os.path.dirname(cwd)
3451
3452
3453def LoadCodereviewSettingsFromFile(fileobj):
3454 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003455 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003456
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003457 def SetProperty(name, setting, unset_error_ok=False):
3458 fullname = 'rietveld.' + name
3459 if setting in keyvals:
3460 RunGit(['config', fullname, keyvals[setting]])
3461 else:
3462 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3463
tandrii48df5812016-10-17 03:55:37 -07003464 if not keyvals.get('GERRIT_HOST', False):
3465 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003466 # Only server setting is required. Other settings can be absent.
3467 # In that case, we ignore errors raised during option deletion attempt.
3468 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003469 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003470 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3471 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003472 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003473 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3474 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003475 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003476 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3477 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003478
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003479 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003480 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003481
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003482 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003483 RunGit(['config', 'gerrit.squash-uploads',
3484 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003485
tandrii@chromium.org28253532016-04-14 13:46:56 +00003486 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003487 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003488 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3489
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003490 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003491 # should be of the form
3492 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3493 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003494 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3495 keyvals['ORIGIN_URL_CONFIG']])
3496
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003497
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003498def urlretrieve(source, destination):
3499 """urllib is broken for SSL connections via a proxy therefore we
3500 can't use urllib.urlretrieve()."""
3501 with open(destination, 'w') as f:
3502 f.write(urllib2.urlopen(source).read())
3503
3504
ukai@chromium.org712d6102013-11-27 00:52:58 +00003505def hasSheBang(fname):
3506 """Checks fname is a #! script."""
3507 with open(fname) as f:
3508 return f.read(2).startswith('#!')
3509
3510
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003511# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3512def DownloadHooks(*args, **kwargs):
3513 pass
3514
3515
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003516def DownloadGerritHook(force):
3517 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003518
3519 Args:
3520 force: True to update hooks. False to install hooks if not present.
3521 """
3522 if not settings.GetIsGerrit():
3523 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003524 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003525 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3526 if not os.access(dst, os.X_OK):
3527 if os.path.exists(dst):
3528 if not force:
3529 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003530 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003531 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003532 if not hasSheBang(dst):
3533 DieWithError('Not a script: %s\n'
3534 'You need to download from\n%s\n'
3535 'into .git/hooks/commit-msg and '
3536 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003537 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3538 except Exception:
3539 if os.path.exists(dst):
3540 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003541 DieWithError('\nFailed to download hooks.\n'
3542 'You need to download from\n%s\n'
3543 'into .git/hooks/commit-msg and '
3544 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003545
3546
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003547def GetRietveldCodereviewSettingsInteractively():
3548 """Prompt the user for settings."""
3549 server = settings.GetDefaultServerUrl(error_ok=True)
3550 prompt = 'Rietveld server (host[:port])'
3551 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3552 newserver = ask_for_data(prompt + ':')
3553 if not server and not newserver:
3554 newserver = DEFAULT_SERVER
3555 if newserver:
3556 newserver = gclient_utils.UpgradeToHttps(newserver)
3557 if newserver != server:
3558 RunGit(['config', 'rietveld.server', newserver])
3559
3560 def SetProperty(initial, caption, name, is_url):
3561 prompt = caption
3562 if initial:
3563 prompt += ' ("x" to clear) [%s]' % initial
3564 new_val = ask_for_data(prompt + ':')
3565 if new_val == 'x':
3566 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3567 elif new_val:
3568 if is_url:
3569 new_val = gclient_utils.UpgradeToHttps(new_val)
3570 if new_val != initial:
3571 RunGit(['config', 'rietveld.' + name, new_val])
3572
3573 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3574 SetProperty(settings.GetDefaultPrivateFlag(),
3575 'Private flag (rietveld only)', 'private', False)
3576 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3577 'tree-status-url', False)
3578 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3579 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3580 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3581 'run-post-upload-hook', False)
3582
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003583
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003584class _GitCookiesChecker(object):
3585 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003586
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003587 _GOOGLESOURCE = 'googlesource.com'
3588
3589 def __init__(self):
3590 # Cached list of [host, identity, source], where source is either
3591 # .gitcookies or .netrc.
3592 self._all_hosts = None
3593
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003594 def ensure_configured_gitcookies(self):
3595 """Runs checks and suggests fixes to make git use .gitcookies from default
3596 path."""
3597 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3598 configured_path = RunGitSilent(
3599 ['config', '--global', 'http.cookiefile']).strip()
3600 if configured_path:
3601 self._ensure_default_gitcookies_path(configured_path, default)
3602 else:
3603 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003604
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003605 @staticmethod
3606 def _ensure_default_gitcookies_path(configured_path, default_path):
3607 assert configured_path
3608 if configured_path == default_path:
3609 print('git is already configured to use your .gitcookies from %s' %
3610 configured_path)
3611 return
3612
3613 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3614 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3615 (configured_path, default_path))
3616
3617 if not os.path.exists(configured_path):
3618 print('However, your configured .gitcookies file is missing.')
3619 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3620 action='reconfigure')
3621 RunGit(['config', '--global', 'http.cookiefile', default_path])
3622 return
3623
3624 if os.path.exists(default_path):
3625 print('WARNING: default .gitcookies file already exists %s' %
3626 default_path)
3627 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3628 default_path)
3629
3630 confirm_or_exit('Move existing .gitcookies to default location?',
3631 action='move')
3632 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003633 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003634 print('Moved and reconfigured git to use .gitcookies from %s' %
3635 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003636
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003637 @staticmethod
3638 def _configure_gitcookies_path(default_path):
3639 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3640 if os.path.exists(netrc_path):
3641 print('You seem to be using outdated .netrc for git credentials: %s' %
3642 netrc_path)
3643 print('This tool will guide you through setting up recommended '
3644 '.gitcookies store for git credentials.\n'
3645 '\n'
3646 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3647 ' git config --global --unset http.cookiefile\n'
3648 ' mv %s %s.backup\n\n' % (default_path, default_path))
3649 confirm_or_exit(action='setup .gitcookies')
3650 RunGit(['config', '--global', 'http.cookiefile', default_path])
3651 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003652
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003653 def get_hosts_with_creds(self, include_netrc=False):
3654 if self._all_hosts is None:
3655 a = gerrit_util.CookiesAuthenticator()
3656 self._all_hosts = [
3657 (h, u, s)
3658 for h, u, s in itertools.chain(
3659 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3660 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3661 )
3662 if h.endswith(self._GOOGLESOURCE)
3663 ]
3664
3665 if include_netrc:
3666 return self._all_hosts
3667 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3668
3669 def print_current_creds(self, include_netrc=False):
3670 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3671 if not hosts:
3672 print('No Git/Gerrit credentials found')
3673 return
3674 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3675 header = [('Host', 'User', 'Which file'),
3676 ['=' * l for l in lengths]]
3677 for row in (header + hosts):
3678 print('\t'.join((('%%+%ds' % l) % s)
3679 for l, s in zip(lengths, row)))
3680
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003681 @staticmethod
3682 def _parse_identity(identity):
3683 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3684 username, domain = identity.split('.', 1)
3685 if username.startswith('git-'):
3686 username = username[len('git-'):]
3687 return username, domain
3688
3689 def _get_usernames_of_domain(self, domain):
3690 """Returns list of usernames referenced by .gitcookies in a given domain."""
3691 identities_by_domain = {}
3692 for _, identity, _ in self.get_hosts_with_creds():
3693 username, domain = self._parse_identity(identity)
3694 identities_by_domain.setdefault(domain, []).append(username)
3695 return identities_by_domain.get(domain)
3696
3697 def _canonical_git_googlesource_host(self, host):
3698 """Normalizes Gerrit hosts (with '-review') to Git host."""
3699 assert host.endswith(self._GOOGLESOURCE)
3700 # Prefix doesn't include '.' at the end.
3701 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3702 if prefix.endswith('-review'):
3703 prefix = prefix[:-len('-review')]
3704 return prefix + '.' + self._GOOGLESOURCE
3705
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003706 def _canonical_gerrit_googlesource_host(self, host):
3707 git_host = self._canonical_git_googlesource_host(host)
3708 prefix = git_host.split('.', 1)[0]
3709 return prefix + '-review.' + self._GOOGLESOURCE
3710
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003711 def has_generic_host(self):
3712 """Returns whether generic .googlesource.com has been configured.
3713
3714 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3715 """
3716 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3717 if host == '.' + self._GOOGLESOURCE:
3718 return True
3719 return False
3720
3721 def _get_git_gerrit_identity_pairs(self):
3722 """Returns map from canonic host to pair of identities (Git, Gerrit).
3723
3724 One of identities might be None, meaning not configured.
3725 """
3726 host_to_identity_pairs = {}
3727 for host, identity, _ in self.get_hosts_with_creds():
3728 canonical = self._canonical_git_googlesource_host(host)
3729 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3730 idx = 0 if canonical == host else 1
3731 pair[idx] = identity
3732 return host_to_identity_pairs
3733
3734 def get_partially_configured_hosts(self):
3735 return set(
3736 host for host, identities_pair in
3737 self._get_git_gerrit_identity_pairs().iteritems()
3738 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3739
3740 def get_conflicting_hosts(self):
3741 return set(
3742 host for host, (i1, i2) in
3743 self._get_git_gerrit_identity_pairs().iteritems()
3744 if None not in (i1, i2) and i1 != i2)
3745
3746 def get_duplicated_hosts(self):
3747 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3748 return set(host for host, count in counters.iteritems() if count > 1)
3749
3750 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3751 'chromium.googlesource.com': 'chromium.org',
3752 'chrome-internal.googlesource.com': 'google.com',
3753 }
3754
3755 def get_hosts_with_wrong_identities(self):
3756 """Finds hosts which **likely** reference wrong identities.
3757
3758 Note: skips hosts which have conflicting identities for Git and Gerrit.
3759 """
3760 hosts = set()
3761 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3762 pair = self._get_git_gerrit_identity_pairs().get(host)
3763 if pair and pair[0] == pair[1]:
3764 _, domain = self._parse_identity(pair[0])
3765 if domain != expected:
3766 hosts.add(host)
3767 return hosts
3768
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003769 @staticmethod
3770 def print_hosts(hosts, extra_column_func=None):
3771 hosts = sorted(hosts)
3772 assert hosts
3773 if extra_column_func is None:
3774 extras = [''] * len(hosts)
3775 else:
3776 extras = [extra_column_func(host) for host in hosts]
3777 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3778 for he in zip(hosts, extras):
3779 print(tmpl % he)
3780 print()
3781
3782 def find_and_report_problems(self):
3783 """Returns True if there was at least one problem, else False."""
3784 problems = [False]
3785 def add_problem():
3786 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003787 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003788 problems[0] = True
3789
3790 if self.has_generic_host():
3791 add_problem()
3792 print(' .googlesource.com record detected\n'
3793 ' Chrome Infrastructure team recommends to list full host names '
3794 'explicitly.\n')
3795
3796 dups = self.get_duplicated_hosts()
3797 if dups:
3798 add_problem()
3799 print(' The following hosts were defined twice:\n')
3800 self.print_hosts(dups)
3801
3802 partial = self.get_partially_configured_hosts()
3803 if partial:
3804 add_problem()
3805 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3806 'These hosts are missing:')
3807 self.print_hosts(partial)
3808
3809 conflicting = self.get_conflicting_hosts()
3810 if conflicting:
3811 add_problem()
3812 print(' The following Git hosts have differing credentials from their '
3813 'Gerrit counterparts:\n')
3814 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3815 tuple(self._get_git_gerrit_identity_pairs()[host]))
3816
3817 wrong = self.get_hosts_with_wrong_identities()
3818 if wrong:
3819 add_problem()
3820 print(' These hosts likely use wrong identity:\n')
3821 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3822 (self._get_git_gerrit_identity_pairs()[host][0],
3823 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3824 return problems[0]
3825
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003826
3827def CMDcreds_check(parser, args):
3828 """Checks credentials and suggests changes."""
3829 _, _ = parser.parse_args(args)
3830
3831 if gerrit_util.GceAuthenticator.is_gce():
3832 DieWithError('this command is not designed for GCE, are you on a bot?')
3833
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003834 checker = _GitCookiesChecker()
3835 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003836
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003837 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003838 checker.print_current_creds(include_netrc=True)
3839
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003840 if not checker.find_and_report_problems():
3841 print('\nNo problems detected in your .gitcookies')
3842 return 0
3843 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003844
3845
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003846@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003847def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003848 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003849
tandrii5d0a0422016-09-14 06:24:35 -07003850 print('WARNING: git cl config works for Rietveld only')
3851 # TODO(tandrii): remove this once we switch to Gerrit.
3852 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003853 parser.add_option('--activate-update', action='store_true',
3854 help='activate auto-updating [rietveld] section in '
3855 '.git/config')
3856 parser.add_option('--deactivate-update', action='store_true',
3857 help='deactivate auto-updating [rietveld] section in '
3858 '.git/config')
3859 options, args = parser.parse_args(args)
3860
3861 if options.deactivate_update:
3862 RunGit(['config', 'rietveld.autoupdate', 'false'])
3863 return
3864
3865 if options.activate_update:
3866 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3867 return
3868
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003869 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003870 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871 return 0
3872
3873 url = args[0]
3874 if not url.endswith('codereview.settings'):
3875 url = os.path.join(url, 'codereview.settings')
3876
3877 # Load code review settings and download hooks (if available).
3878 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3879 return 0
3880
3881
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003882def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003883 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003884 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3885 branch = ShortBranchName(branchref)
3886 _, args = parser.parse_args(args)
3887 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003888 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003889 return RunGit(['config', 'branch.%s.base-url' % branch],
3890 error_ok=False).strip()
3891 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003892 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003893 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3894 error_ok=False).strip()
3895
3896
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003897def color_for_status(status):
3898 """Maps a Changelist status to color, for CMDstatus and other tools."""
3899 return {
3900 'unsent': Fore.RED,
3901 'waiting': Fore.BLUE,
3902 'reply': Fore.YELLOW,
3903 'lgtm': Fore.GREEN,
3904 'commit': Fore.MAGENTA,
3905 'closed': Fore.CYAN,
3906 'error': Fore.WHITE,
3907 }.get(status, Fore.WHITE)
3908
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003909
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003910def get_cl_statuses(changes, fine_grained, max_processes=None):
3911 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003912
3913 If fine_grained is true, this will fetch CL statuses from the server.
3914 Otherwise, simply indicate if there's a matching url for the given branches.
3915
3916 If max_processes is specified, it is used as the maximum number of processes
3917 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3918 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003919
3920 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003921 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003922 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003923 upload.verbosity = 0
3924
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003925 if not changes:
3926 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003927
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003928 if not fine_grained:
3929 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003930 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003931 for cl in changes:
3932 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003933 return
3934
3935 # First, sort out authentication issues.
3936 logging.debug('ensuring credentials exist')
3937 for cl in changes:
3938 cl.EnsureAuthenticated(force=False, refresh=True)
3939
3940 def fetch(cl):
3941 try:
3942 return (cl, cl.GetStatus())
3943 except:
3944 # See http://crbug.com/629863.
3945 logging.exception('failed to fetch status for %s:', cl)
3946 raise
3947
3948 threads_count = len(changes)
3949 if max_processes:
3950 threads_count = max(1, min(threads_count, max_processes))
3951 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3952
3953 pool = ThreadPool(threads_count)
3954 fetched_cls = set()
3955 try:
3956 it = pool.imap_unordered(fetch, changes).__iter__()
3957 while True:
3958 try:
3959 cl, status = it.next(timeout=5)
3960 except multiprocessing.TimeoutError:
3961 break
3962 fetched_cls.add(cl)
3963 yield cl, status
3964 finally:
3965 pool.close()
3966
3967 # Add any branches that failed to fetch.
3968 for cl in set(changes) - fetched_cls:
3969 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003970
rmistry@google.com2dd99862015-06-22 12:22:18 +00003971
3972def upload_branch_deps(cl, args):
3973 """Uploads CLs of local branches that are dependents of the current branch.
3974
3975 If the local branch dependency tree looks like:
3976 test1 -> test2.1 -> test3.1
3977 -> test3.2
3978 -> test2.2 -> test3.3
3979
3980 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3981 run on the dependent branches in this order:
3982 test2.1, test3.1, test3.2, test2.2, test3.3
3983
3984 Note: This function does not rebase your local dependent branches. Use it when
3985 you make a change to the parent branch that will not conflict with its
3986 dependent branches, and you would like their dependencies updated in
3987 Rietveld.
3988 """
3989 if git_common.is_dirty_git_tree('upload-branch-deps'):
3990 return 1
3991
3992 root_branch = cl.GetBranch()
3993 if root_branch is None:
3994 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3995 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01003996 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00003997 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3998 'patchset dependencies without an uploaded CL.')
3999
4000 branches = RunGit(['for-each-ref',
4001 '--format=%(refname:short) %(upstream:short)',
4002 'refs/heads'])
4003 if not branches:
4004 print('No local branches found.')
4005 return 0
4006
4007 # Create a dictionary of all local branches to the branches that are dependent
4008 # on it.
4009 tracked_to_dependents = collections.defaultdict(list)
4010 for b in branches.splitlines():
4011 tokens = b.split()
4012 if len(tokens) == 2:
4013 branch_name, tracked = tokens
4014 tracked_to_dependents[tracked].append(branch_name)
4015
vapiera7fbd5a2016-06-16 09:17:49 -07004016 print()
4017 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004018 dependents = []
4019 def traverse_dependents_preorder(branch, padding=''):
4020 dependents_to_process = tracked_to_dependents.get(branch, [])
4021 padding += ' '
4022 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004023 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004024 dependents.append(dependent)
4025 traverse_dependents_preorder(dependent, padding)
4026 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004027 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004028
4029 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004030 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004031 return 0
4032
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004033 confirm_or_exit('This command will checkout all dependent branches and run '
4034 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004035
andybons@chromium.org962f9462016-02-03 20:00:42 +00004036 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004037 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004038 args.extend(['-t', 'Updated patchset dependency'])
4039
rmistry@google.com2dd99862015-06-22 12:22:18 +00004040 # Record all dependents that failed to upload.
4041 failures = {}
4042 # Go through all dependents, checkout the branch and upload.
4043 try:
4044 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004045 print()
4046 print('--------------------------------------')
4047 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004048 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004049 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004050 try:
4051 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004052 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004053 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004054 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004055 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004056 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004057 finally:
4058 # Swap back to the original root branch.
4059 RunGit(['checkout', '-q', root_branch])
4060
vapiera7fbd5a2016-06-16 09:17:49 -07004061 print()
4062 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004063 for dependent_branch in dependents:
4064 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004065 print(' %s : %s' % (dependent_branch, upload_status))
4066 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004067
4068 return 0
4069
4070
kmarshall3bff56b2016-06-06 18:31:47 -07004071def CMDarchive(parser, args):
4072 """Archives and deletes branches associated with closed changelists."""
4073 parser.add_option(
4074 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004075 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004076 parser.add_option(
4077 '-f', '--force', action='store_true',
4078 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004079 parser.add_option(
4080 '-d', '--dry-run', action='store_true',
4081 help='Skip the branch tagging and removal steps.')
4082 parser.add_option(
4083 '-t', '--notags', action='store_true',
4084 help='Do not tag archived branches. '
4085 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004086
4087 auth.add_auth_options(parser)
4088 options, args = parser.parse_args(args)
4089 if args:
4090 parser.error('Unsupported args: %s' % ' '.join(args))
4091 auth_config = auth.extract_auth_config_from_options(options)
4092
4093 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4094 if not branches:
4095 return 0
4096
vapiera7fbd5a2016-06-16 09:17:49 -07004097 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004098 changes = [Changelist(branchref=b, auth_config=auth_config)
4099 for b in branches.splitlines()]
4100 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4101 statuses = get_cl_statuses(changes,
4102 fine_grained=True,
4103 max_processes=options.maxjobs)
4104 proposal = [(cl.GetBranch(),
4105 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4106 for cl, status in statuses
4107 if status == 'closed']
4108 proposal.sort()
4109
4110 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004111 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004112 return 0
4113
4114 current_branch = GetCurrentBranch()
4115
vapiera7fbd5a2016-06-16 09:17:49 -07004116 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004117 if options.notags:
4118 for next_item in proposal:
4119 print(' ' + next_item[0])
4120 else:
4121 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4122 for next_item in proposal:
4123 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004124
kmarshall9249e012016-08-23 12:02:16 -07004125 # Quit now on precondition failure or if instructed by the user, either
4126 # via an interactive prompt or by command line flags.
4127 if options.dry_run:
4128 print('\nNo changes were made (dry run).\n')
4129 return 0
4130 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004131 print('You are currently on a branch \'%s\' which is associated with a '
4132 'closed codereview issue, so archive cannot proceed. Please '
4133 'checkout another branch and run this command again.' %
4134 current_branch)
4135 return 1
kmarshall9249e012016-08-23 12:02:16 -07004136 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004137 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4138 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004139 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004140 return 1
4141
4142 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004143 if not options.notags:
4144 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004145 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004146
vapiera7fbd5a2016-06-16 09:17:49 -07004147 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004148
4149 return 0
4150
4151
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004152def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004153 """Show status of changelists.
4154
4155 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004156 - Red not sent for review or broken
4157 - Blue waiting for review
4158 - Yellow waiting for you to reply to review
4159 - Green LGTM'ed
4160 - Magenta in the commit queue
4161 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004162
4163 Also see 'git cl comments'.
4164 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004165 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004166 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004167 parser.add_option('-f', '--fast', action='store_true',
4168 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004169 parser.add_option(
4170 '-j', '--maxjobs', action='store', type=int,
4171 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004172
4173 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004174 _add_codereview_issue_select_options(
4175 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004176 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004177 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004178 if args:
4179 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004180 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004181
iannuccie53c9352016-08-17 14:40:40 -07004182 if options.issue is not None and not options.field:
4183 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004184
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004185 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004186 cl = Changelist(auth_config=auth_config, issue=options.issue,
4187 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004189 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004190 elif options.field == 'id':
4191 issueid = cl.GetIssue()
4192 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004193 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004194 elif options.field == 'patch':
4195 patchset = cl.GetPatchset()
4196 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004197 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004198 elif options.field == 'status':
4199 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004200 elif options.field == 'url':
4201 url = cl.GetIssueURL()
4202 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004203 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004204 return 0
4205
4206 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4207 if not branches:
4208 print('No local branch found.')
4209 return 0
4210
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004211 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004212 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004213 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004214 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004215 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004216 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004217 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004218
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004219 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004220 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4221 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4222 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004223 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004224 c, status = output.next()
4225 branch_statuses[c.GetBranch()] = status
4226 status = branch_statuses.pop(branch)
4227 url = cl.GetIssueURL()
4228 if url and (not status or status == 'error'):
4229 # The issue probably doesn't exist anymore.
4230 url += ' (broken)'
4231
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004232 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004233 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004234 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004235 color = ''
4236 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004237 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004238 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004239 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004240 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004241
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004242
4243 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004244 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004245 print('Current branch: %s' % branch)
4246 for cl in changes:
4247 if cl.GetBranch() == branch:
4248 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004249 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004250 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004251 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004252 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004253 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004254 print('Issue description:')
4255 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004256 return 0
4257
4258
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004259def colorize_CMDstatus_doc():
4260 """To be called once in main() to add colors to git cl status help."""
4261 colors = [i for i in dir(Fore) if i[0].isupper()]
4262
4263 def colorize_line(line):
4264 for color in colors:
4265 if color in line.upper():
4266 # Extract whitespaces first and the leading '-'.
4267 indent = len(line) - len(line.lstrip(' ')) + 1
4268 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4269 return line
4270
4271 lines = CMDstatus.__doc__.splitlines()
4272 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4273
4274
phajdan.jre328cf92016-08-22 04:12:17 -07004275def write_json(path, contents):
4276 with open(path, 'w') as f:
4277 json.dump(contents, f)
4278
4279
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004280@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004281def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004282 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004283
4284 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004285 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004286 parser.add_option('-r', '--reverse', action='store_true',
4287 help='Lookup the branch(es) for the specified issues. If '
4288 'no issues are specified, all branches with mapped '
4289 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004290 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004291 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004292 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004293 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004294
dnj@chromium.org406c4402015-03-03 17:22:28 +00004295 if options.reverse:
4296 branches = RunGit(['for-each-ref', 'refs/heads',
4297 '--format=%(refname:short)']).splitlines()
4298
4299 # Reverse issue lookup.
4300 issue_branch_map = {}
4301 for branch in branches:
4302 cl = Changelist(branchref=branch)
4303 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4304 if not args:
4305 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004306 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004307 for issue in args:
4308 if not issue:
4309 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004310 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004311 print('Branch for issue number %s: %s' % (
4312 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004313 if options.json:
4314 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004315 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004316 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004317 if len(args) > 0:
4318 try:
4319 issue = int(args[0])
4320 except ValueError:
4321 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004322 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004323 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004324 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004325 if options.json:
4326 write_json(options.json, {
4327 'issue': cl.GetIssue(),
4328 'issue_url': cl.GetIssueURL(),
4329 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004330 return 0
4331
4332
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004333def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004334 """Shows or posts review comments for any changelist."""
4335 parser.add_option('-a', '--add-comment', dest='comment',
4336 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004337 parser.add_option('-i', '--issue', dest='issue',
4338 help='review issue id (defaults to current issue). '
4339 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004340 parser.add_option('-j', '--json-file',
4341 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004342 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004343 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004344 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004345 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004346 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004347
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004348 issue = None
4349 if options.issue:
4350 try:
4351 issue = int(options.issue)
4352 except ValueError:
4353 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004354 if not options.forced_codereview:
4355 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004356
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004357 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004358 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004359 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004360
4361 if options.comment:
4362 cl.AddComment(options.comment)
4363 return 0
4364
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004365 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4366 for comment in summary:
4367 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004368 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004369 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004370 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004371 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004372 color = Fore.MAGENTA
4373 else:
4374 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004375 print('\n%s%s %s%s\n%s' % (
4376 color,
4377 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4378 comment.sender,
4379 Fore.RESET,
4380 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4381
smut@google.comc85ac942015-09-15 16:34:43 +00004382 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004383 def pre_serialize(c):
4384 dct = c.__dict__.copy()
4385 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4386 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004387 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004388 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004389 return 0
4390
4391
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004392@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004393def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004394 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004395 parser.add_option('-d', '--display', action='store_true',
4396 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004397 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004398 help='New description to set for this issue (- for stdin, '
4399 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004400 parser.add_option('-f', '--force', action='store_true',
4401 help='Delete any unpublished Gerrit edits for this issue '
4402 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004403
4404 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004405 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004406 options, args = parser.parse_args(args)
4407 _process_codereview_select_options(parser, options)
4408
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004409 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004410 if len(args) > 0:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004411 target_issue_arg = ParseIssueNumberArgument(args[0])
4412 if not target_issue_arg.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004413 parser.print_help()
4414 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004415
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004416 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004417
martiniss6eda05f2016-06-30 10:18:35 -07004418 kwargs = {
4419 'auth_config': auth_config,
4420 'codereview': options.forced_codereview,
4421 }
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004422 if target_issue_arg:
4423 kwargs['issue'] = target_issue_arg.issue
4424 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004425
4426 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004427
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004428 if not cl.GetIssue():
4429 DieWithError('This branch has no associated changelist.')
4430 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004431
smut@google.com34fb6b12015-07-13 20:03:26 +00004432 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004433 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004434 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004435
4436 if options.new_description:
4437 text = options.new_description
4438 if text == '-':
4439 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004440 elif text == '+':
4441 base_branch = cl.GetCommonAncestorWithUpstream()
4442 change = cl.GetChange(base_branch, None, local_description=True)
4443 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004444
4445 description.set_description(text)
4446 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004447 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004448
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004449 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004450 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004451 return 0
4452
4453
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004454def CreateDescriptionFromLog(args):
4455 """Pulls out the commit log to use as a base for the CL description."""
4456 log_args = []
4457 if len(args) == 1 and not args[0].endswith('.'):
4458 log_args = [args[0] + '..']
4459 elif len(args) == 1 and args[0].endswith('...'):
4460 log_args = [args[0][:-1]]
4461 elif len(args) == 2:
4462 log_args = [args[0] + '..' + args[1]]
4463 else:
4464 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004465 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004466
4467
thestig@chromium.org44202a22014-03-11 19:22:18 +00004468def CMDlint(parser, args):
4469 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004470 parser.add_option('--filter', action='append', metavar='-x,+y',
4471 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004472 auth.add_auth_options(parser)
4473 options, args = parser.parse_args(args)
4474 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004475
4476 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004477 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004478 try:
4479 import cpplint
4480 import cpplint_chromium
4481 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004482 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004483 return 1
4484
4485 # Change the current working directory before calling lint so that it
4486 # shows the correct base.
4487 previous_cwd = os.getcwd()
4488 os.chdir(settings.GetRoot())
4489 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004490 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004491 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4492 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004493 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004494 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004495 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004496
4497 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004498 command = args + files
4499 if options.filter:
4500 command = ['--filter=' + ','.join(options.filter)] + command
4501 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004502
4503 white_regex = re.compile(settings.GetLintRegex())
4504 black_regex = re.compile(settings.GetLintIgnoreRegex())
4505 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4506 for filename in filenames:
4507 if white_regex.match(filename):
4508 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004509 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004510 else:
4511 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4512 extra_check_functions)
4513 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004514 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004515 finally:
4516 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004517 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004518 if cpplint._cpplint_state.error_count != 0:
4519 return 1
4520 return 0
4521
4522
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004524 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004525 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004526 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004527 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004528 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004529 auth.add_auth_options(parser)
4530 options, args = parser.parse_args(args)
4531 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004532
sbc@chromium.org71437c02015-04-09 19:29:40 +00004533 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004534 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004535 return 1
4536
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004537 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004538 if args:
4539 base_branch = args[0]
4540 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004541 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004542 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004543
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004544 cl.RunHook(
4545 committing=not options.upload,
4546 may_prompt=False,
4547 verbose=options.verbose,
4548 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004549 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004550
4551
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004552def GenerateGerritChangeId(message):
4553 """Returns Ixxxxxx...xxx change id.
4554
4555 Works the same way as
4556 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4557 but can be called on demand on all platforms.
4558
4559 The basic idea is to generate git hash of a state of the tree, original commit
4560 message, author/committer info and timestamps.
4561 """
4562 lines = []
4563 tree_hash = RunGitSilent(['write-tree'])
4564 lines.append('tree %s' % tree_hash.strip())
4565 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4566 if code == 0:
4567 lines.append('parent %s' % parent.strip())
4568 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4569 lines.append('author %s' % author.strip())
4570 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4571 lines.append('committer %s' % committer.strip())
4572 lines.append('')
4573 # Note: Gerrit's commit-hook actually cleans message of some lines and
4574 # whitespace. This code is not doing this, but it clearly won't decrease
4575 # entropy.
4576 lines.append(message)
4577 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4578 stdin='\n'.join(lines))
4579 return 'I%s' % change_hash.strip()
4580
4581
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004582def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004583 """Computes the remote branch ref to use for the CL.
4584
4585 Args:
4586 remote (str): The git remote for the CL.
4587 remote_branch (str): The git remote branch for the CL.
4588 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004589 """
4590 if not (remote and remote_branch):
4591 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004592
wittman@chromium.org455dc922015-01-26 20:15:50 +00004593 if target_branch:
4594 # Cannonicalize branch references to the equivalent local full symbolic
4595 # refs, which are then translated into the remote full symbolic refs
4596 # below.
4597 if '/' not in target_branch:
4598 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4599 else:
4600 prefix_replacements = (
4601 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4602 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4603 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4604 )
4605 match = None
4606 for regex, replacement in prefix_replacements:
4607 match = re.search(regex, target_branch)
4608 if match:
4609 remote_branch = target_branch.replace(match.group(0), replacement)
4610 break
4611 if not match:
4612 # This is a branch path but not one we recognize; use as-is.
4613 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004614 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4615 # Handle the refs that need to land in different refs.
4616 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004617
wittman@chromium.org455dc922015-01-26 20:15:50 +00004618 # Create the true path to the remote branch.
4619 # Does the following translation:
4620 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4621 # * refs/remotes/origin/master -> refs/heads/master
4622 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4623 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4624 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4625 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4626 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4627 'refs/heads/')
4628 elif remote_branch.startswith('refs/remotes/branch-heads'):
4629 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004630
wittman@chromium.org455dc922015-01-26 20:15:50 +00004631 return remote_branch
4632
4633
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004634def cleanup_list(l):
4635 """Fixes a list so that comma separated items are put as individual items.
4636
4637 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4638 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4639 """
4640 items = sum((i.split(',') for i in l), [])
4641 stripped_items = (i.strip() for i in items)
4642 return sorted(filter(None, stripped_items))
4643
4644
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004645@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004646def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004647 """Uploads the current changelist to codereview.
4648
4649 Can skip dependency patchset uploads for a branch by running:
4650 git config branch.branch_name.skip-deps-uploads True
4651 To unset run:
4652 git config --unset branch.branch_name.skip-deps-uploads
4653 Can also set the above globally by using the --global flag.
4654 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004655 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4656 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004657 parser.add_option('--bypass-watchlists', action='store_true',
4658 dest='bypass_watchlists',
4659 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004660 parser.add_option('-f', action='store_true', dest='force',
4661 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004662 parser.add_option('--message', '-m', dest='message',
4663 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004664 parser.add_option('-b', '--bug',
4665 help='pre-populate the bug number(s) for this issue. '
4666 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004667 parser.add_option('--message-file', dest='message_file',
4668 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004669 parser.add_option('--title', '-t', dest='title',
4670 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004671 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004672 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004673 help='reviewer email addresses')
4674 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004675 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004676 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004677 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004678 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004679 parser.add_option('--emulate_svn_auto_props',
4680 '--emulate-svn-auto-props',
4681 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004682 dest="emulate_svn_auto_props",
4683 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004684 parser.add_option('-c', '--use-commit-queue', action='store_true',
4685 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004686 parser.add_option('--private', action='store_true',
4687 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004688 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004689 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004690 metavar='TARGET',
4691 help='Apply CL to remote ref TARGET. ' +
4692 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004693 parser.add_option('--squash', action='store_true',
4694 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004695 parser.add_option('--no-squash', action='store_true',
4696 help='Don\'t squash multiple commits into one ' +
4697 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004698 parser.add_option('--topic', default=None,
4699 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004700 parser.add_option('--email', default=None,
4701 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004702 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4703 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004704 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4705 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004706 help='Send the patchset to do a CQ dry run right after '
4707 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004708 parser.add_option('--dependencies', action='store_true',
4709 help='Uploads CLs of all the local branches that depend on '
4710 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004711
rmistry@google.com2dd99862015-06-22 12:22:18 +00004712 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004713 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004714 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004715 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004716 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004717 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004718 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004719
sbc@chromium.org71437c02015-04-09 19:29:40 +00004720 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004721 return 1
4722
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004723 options.reviewers = cleanup_list(options.reviewers)
4724 options.cc = cleanup_list(options.cc)
4725
tandriib80458a2016-06-23 12:20:07 -07004726 if options.message_file:
4727 if options.message:
4728 parser.error('only one of --message and --message-file allowed.')
4729 options.message = gclient_utils.FileRead(options.message_file)
4730 options.message_file = None
4731
tandrii4d0545a2016-07-06 03:56:49 -07004732 if options.cq_dry_run and options.use_commit_queue:
4733 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4734
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004735 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4736 settings.GetIsGerrit()
4737
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004738 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004739 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004740
4741
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004742@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004743def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004744 """DEPRECATED: Used to commit the current changelist via git-svn."""
4745 message = ('git-cl no longer supports committing to SVN repositories via '
4746 'git-svn. You probably want to use `git cl land` instead.')
4747 print(message)
4748 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004749
4750
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004751# Two special branches used by git cl land.
4752MERGE_BRANCH = 'git-cl-commit'
4753CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4754
4755
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004756@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004757def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004758 """Commits the current changelist via git.
4759
4760 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4761 upstream and closes the issue automatically and atomically.
4762
4763 Otherwise (in case of Rietveld):
4764 Squashes branch into a single commit.
4765 Updates commit message with metadata (e.g. pointer to review).
4766 Pushes the code upstream.
4767 Updates review and closes.
4768 """
4769 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4770 help='bypass upload presubmit hook')
4771 parser.add_option('-m', dest='message',
4772 help="override review description")
4773 parser.add_option('-f', action='store_true', dest='force',
4774 help="force yes to questions (don't prompt)")
4775 parser.add_option('-c', dest='contributor',
4776 help="external contributor for patch (appended to " +
4777 "description and used as author for git). Should be " +
4778 "formatted as 'First Last <email@example.com>'")
4779 add_git_similarity(parser)
4780 auth.add_auth_options(parser)
4781 (options, args) = parser.parse_args(args)
4782 auth_config = auth.extract_auth_config_from_options(options)
4783
4784 cl = Changelist(auth_config=auth_config)
4785
4786 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4787 if cl.IsGerrit():
4788 if options.message:
4789 # This could be implemented, but it requires sending a new patch to
4790 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4791 # Besides, Gerrit has the ability to change the commit message on submit
4792 # automatically, thus there is no need to support this option (so far?).
4793 parser.error('-m MESSAGE option is not supported for Gerrit.')
4794 if options.contributor:
4795 parser.error(
4796 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4797 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4798 'the contributor\'s "name <email>". If you can\'t upload such a '
4799 'commit for review, contact your repository admin and request'
4800 '"Forge-Author" permission.')
4801 if not cl.GetIssue():
4802 DieWithError('You must upload the change first to Gerrit.\n'
4803 ' If you would rather have `git cl land` upload '
4804 'automatically for you, see http://crbug.com/642759')
4805 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4806 options.verbose)
4807
4808 current = cl.GetBranch()
4809 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4810 if remote == '.':
4811 print()
4812 print('Attempting to push branch %r into another local branch!' % current)
4813 print()
4814 print('Either reparent this branch on top of origin/master:')
4815 print(' git reparent-branch --root')
4816 print()
4817 print('OR run `git rebase-update` if you think the parent branch is ')
4818 print('already committed.')
4819 print()
4820 print(' Current parent: %r' % upstream_branch)
4821 return 1
4822
4823 if not args:
4824 # Default to merging against our best guess of the upstream branch.
4825 args = [cl.GetUpstreamBranch()]
4826
4827 if options.contributor:
4828 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4829 print("Please provide contibutor as 'First Last <email@example.com>'")
4830 return 1
4831
4832 base_branch = args[0]
4833
4834 if git_common.is_dirty_git_tree('land'):
4835 return 1
4836
4837 # This rev-list syntax means "show all commits not in my branch that
4838 # are in base_branch".
4839 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4840 base_branch]).splitlines()
4841 if upstream_commits:
4842 print('Base branch "%s" has %d commits '
4843 'not in this branch.' % (base_branch, len(upstream_commits)))
4844 print('Run "git merge %s" before attempting to land.' % base_branch)
4845 return 1
4846
4847 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4848 if not options.bypass_hooks:
4849 author = None
4850 if options.contributor:
4851 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4852 hook_results = cl.RunHook(
4853 committing=True,
4854 may_prompt=not options.force,
4855 verbose=options.verbose,
4856 change=cl.GetChange(merge_base, author))
4857 if not hook_results.should_continue():
4858 return 1
4859
4860 # Check the tree status if the tree status URL is set.
4861 status = GetTreeStatus()
4862 if 'closed' == status:
4863 print('The tree is closed. Please wait for it to reopen. Use '
4864 '"git cl land --bypass-hooks" to commit on a closed tree.')
4865 return 1
4866 elif 'unknown' == status:
4867 print('Unable to determine tree status. Please verify manually and '
4868 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4869 return 1
4870
4871 change_desc = ChangeDescription(options.message)
4872 if not change_desc.description and cl.GetIssue():
4873 change_desc = ChangeDescription(cl.GetDescription())
4874
4875 if not change_desc.description:
4876 if not cl.GetIssue() and options.bypass_hooks:
4877 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4878 else:
4879 print('No description set.')
4880 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4881 return 1
4882
4883 # Keep a separate copy for the commit message, because the commit message
4884 # contains the link to the Rietveld issue, while the Rietveld message contains
4885 # the commit viewvc url.
4886 if cl.GetIssue():
4887 change_desc.update_reviewers(cl.GetApprovingReviewers())
4888
4889 commit_desc = ChangeDescription(change_desc.description)
4890 if cl.GetIssue():
4891 # Xcode won't linkify this URL unless there is a non-whitespace character
4892 # after it. Add a period on a new line to circumvent this. Also add a space
4893 # before the period to make sure that Gitiles continues to correctly resolve
4894 # the URL.
4895 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4896 if options.contributor:
4897 commit_desc.append_footer('Patch from %s.' % options.contributor)
4898
4899 print('Description:')
4900 print(commit_desc.description)
4901
4902 branches = [merge_base, cl.GetBranchRef()]
4903 if not options.force:
4904 print_stats(options.similarity, options.find_copies, branches)
4905
4906 # We want to squash all this branch's commits into one commit with the proper
4907 # description. We do this by doing a "reset --soft" to the base branch (which
4908 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004909 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004910 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4911 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4912 result = RunGitWithCode(showref_cmd)
4913 if result[0] == 0:
4914 RunGit(['branch', '-D', branch])
4915
4916 # We might be in a directory that's present in this branch but not in the
4917 # trunk. Move up to the top of the tree so that git commands that expect a
4918 # valid CWD won't fail after we check out the merge branch.
4919 rel_base_path = settings.GetRelativeRoot()
4920 if rel_base_path:
4921 os.chdir(rel_base_path)
4922
4923 # Stuff our change into the merge branch.
4924 # We wrap in a try...finally block so if anything goes wrong,
4925 # we clean up the branches.
4926 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004927 revision = None
4928 try:
4929 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4930 RunGit(['reset', '--soft', merge_base])
4931 if options.contributor:
4932 RunGit(
4933 [
4934 'commit', '--author', options.contributor,
4935 '-m', commit_desc.description,
4936 ])
4937 else:
4938 RunGit(['commit', '-m', commit_desc.description])
4939
4940 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4941 mirror = settings.GetGitMirror(remote)
4942 if mirror:
4943 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004944 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004945 else:
4946 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004947 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004948 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4949
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004950 retcode = PushToGitWithAutoRebase(
4951 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004952 if retcode == 0:
4953 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004954 if git_numberer_enabled:
4955 change_desc = ChangeDescription(
4956 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004957 except: # pylint: disable=bare-except
4958 if _IS_BEING_TESTED:
4959 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4960 + '-' * 30 + '8<' + '-' * 30)
4961 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4962 raise
4963 finally:
4964 # And then swap back to the original branch and clean up.
4965 RunGit(['checkout', '-q', cl.GetBranch()])
4966 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004967 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004968
4969 if not revision:
4970 print('Failed to push. If this persists, please file a bug.')
4971 return 1
4972
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004973 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004974 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004975 if viewvc_url and revision:
4976 change_desc.append_footer(
4977 'Committed: %s%s' % (viewvc_url, revision))
4978 elif revision:
4979 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004980 print('Closing issue '
4981 '(you may be prompted for your codereview password)...')
4982 cl.UpdateDescription(change_desc.description)
4983 cl.CloseIssue()
4984 props = cl.GetIssueProperties()
4985 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004986 comment = "Committed patchset #%d (id:%d) manually as %s" % (
4987 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004988 if options.bypass_hooks:
4989 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4990 else:
4991 comment += ' (presubmit successful).'
4992 cl.RpcServer().add_comment(cl.GetIssue(), comment)
4993
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004994 if os.path.isfile(POSTUPSTREAM_HOOK):
4995 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
4996
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004997 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004998
4999
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005000def PushToGitWithAutoRebase(remote, branch, original_description,
5001 git_numberer_enabled, max_attempts=3):
5002 """Pushes current HEAD commit on top of remote's branch.
5003
5004 Attempts to fetch and autorebase on push failures.
5005 Adds git number footers on the fly.
5006
5007 Returns integer code from last command.
5008 """
5009 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5010 code = 0
5011 attempts_left = max_attempts
5012 while attempts_left:
5013 attempts_left -= 1
5014 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5015
5016 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5017 # If fetch fails, retry.
5018 print('Fetching %s/%s...' % (remote, branch))
5019 code, out = RunGitWithCode(
5020 ['retry', 'fetch', remote,
5021 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5022 if code:
5023 print('Fetch failed with exit code %d.' % code)
5024 print(out.strip())
5025 continue
5026
5027 print('Cherry-picking commit on top of latest %s' % branch)
5028 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5029 suppress_stderr=True)
5030 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5031 code, out = RunGitWithCode(['cherry-pick', cherry])
5032 if code:
5033 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5034 'the following files have merge conflicts:' %
5035 (branch, parent_hash))
5036 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5037 print('Please rebase your patch and try again.')
5038 RunGitWithCode(['cherry-pick', '--abort'])
5039 break
5040
5041 commit_desc = ChangeDescription(original_description)
5042 if git_numberer_enabled:
5043 logging.debug('Adding git number footers')
5044 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5045 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5046 branch)
5047 # Ensure timestamps are monotonically increasing.
5048 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5049 _get_committer_timestamp('HEAD'))
5050 _git_amend_head(commit_desc.description, timestamp)
5051
5052 code, out = RunGitWithCode(
5053 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5054 print(out)
5055 if code == 0:
5056 break
5057 if IsFatalPushFailure(out):
5058 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005059 'user.email are correct and you have push access to the repo.\n'
5060 'Hint: run command below to diangose common Git/Gerrit credential '
5061 'problems:\n'
5062 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005063 break
5064 return code
5065
5066
5067def IsFatalPushFailure(push_stdout):
5068 """True if retrying push won't help."""
5069 return '(prohibited by Gerrit)' in push_stdout
5070
5071
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005072@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005073def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005074 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005075 parser.add_option('-b', dest='newbranch',
5076 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005077 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005078 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005079 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5080 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005081 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005082 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005083 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005084 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005085 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005086 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005087
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005088
5089 group = optparse.OptionGroup(
5090 parser,
5091 'Options for continuing work on the current issue uploaded from a '
5092 'different clone (e.g. different machine). Must be used independently '
5093 'from the other options. No issue number should be specified, and the '
5094 'branch must have an issue number associated with it')
5095 group.add_option('--reapply', action='store_true', dest='reapply',
5096 help='Reset the branch and reapply the issue.\n'
5097 'CAUTION: This will undo any local changes in this '
5098 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005099
5100 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005101 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005102 parser.add_option_group(group)
5103
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005104 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005105 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005106 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005107 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005108 auth_config = auth.extract_auth_config_from_options(options)
5109
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005110
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005111 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005112 if options.newbranch:
5113 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005114 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005115 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005116
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005117 cl = Changelist(auth_config=auth_config,
5118 codereview=options.forced_codereview)
5119 if not cl.GetIssue():
5120 parser.error('current branch must have an associated issue')
5121
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005122 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005123 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005124 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005125
5126 RunGit(['reset', '--hard', upstream])
5127 if options.pull:
5128 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005129
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005130 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5131 options.directory)
5132
5133 if len(args) != 1 or not args[0]:
5134 parser.error('Must specify issue number or url')
5135
5136 # We don't want uncommitted changes mixed up with the patch.
5137 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005138 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005139
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005140 if options.newbranch:
5141 if options.force:
5142 RunGit(['branch', '-D', options.newbranch],
5143 stderr=subprocess2.PIPE, error_ok=True)
5144 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005145 elif not GetCurrentBranch():
5146 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005147
5148 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
5149
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005150 if cl.IsGerrit():
5151 if options.reject:
5152 parser.error('--reject is not supported with Gerrit codereview.')
5153 if options.nocommit:
5154 parser.error('--nocommit is not supported with Gerrit codereview.')
5155 if options.directory:
5156 parser.error('--directory is not supported with Gerrit codereview.')
5157
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005158 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005159 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005160
5161
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005162def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005163 """Fetches the tree status and returns either 'open', 'closed',
5164 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005165 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005166 if url:
5167 status = urllib2.urlopen(url).read().lower()
5168 if status.find('closed') != -1 or status == '0':
5169 return 'closed'
5170 elif status.find('open') != -1 or status == '1':
5171 return 'open'
5172 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005173 return 'unset'
5174
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005175
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005176def GetTreeStatusReason():
5177 """Fetches the tree status from a json url and returns the message
5178 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005179 url = settings.GetTreeStatusUrl()
5180 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005181 connection = urllib2.urlopen(json_url)
5182 status = json.loads(connection.read())
5183 connection.close()
5184 return status['message']
5185
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005186
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005187def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005188 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005189 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005190 status = GetTreeStatus()
5191 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005192 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005193 return 2
5194
vapiera7fbd5a2016-06-16 09:17:49 -07005195 print('The tree is %s' % status)
5196 print()
5197 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198 if status != 'open':
5199 return 1
5200 return 0
5201
5202
maruel@chromium.org15192402012-09-06 12:38:29 +00005203def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005204 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005205 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005206 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005207 '-b', '--bot', action='append',
5208 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5209 'times to specify multiple builders. ex: '
5210 '"-b win_rel -b win_layout". See '
5211 'the try server waterfall for the builders name and the tests '
5212 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005213 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005214 '-B', '--bucket', default='',
5215 help=('Buildbucket bucket to send the try requests.'))
5216 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005217 '-m', '--master', default='',
5218 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005219 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005220 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005221 help='Revision to use for the try job; default: the revision will '
5222 'be determined by the try recipe that builder runs, which usually '
5223 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005224 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005225 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005226 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005227 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005228 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005229 '--project',
5230 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005231 'in recipe to determine to which repository or directory to '
5232 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005233 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005234 '-p', '--property', dest='properties', action='append', default=[],
5235 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005236 'key2=value2 etc. The value will be treated as '
5237 'json if decodable, or as string otherwise. '
5238 'NOTE: using this may make your try job not usable for CQ, '
5239 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005240 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005241 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5242 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005243 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005244 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005245 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005246 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005247
machenbach@chromium.org45453142015-09-15 08:45:22 +00005248 # Make sure that all properties are prop=value pairs.
5249 bad_params = [x for x in options.properties if '=' not in x]
5250 if bad_params:
5251 parser.error('Got properties with missing "=": %s' % bad_params)
5252
maruel@chromium.org15192402012-09-06 12:38:29 +00005253 if args:
5254 parser.error('Unknown arguments: %s' % args)
5255
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005256 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005257 if not cl.GetIssue():
5258 parser.error('Need to upload first')
5259
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005260 if cl.IsGerrit():
5261 # HACK: warm up Gerrit change detail cache to save on RPCs.
5262 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5263
tandriie113dfd2016-10-11 10:20:12 -07005264 error_message = cl.CannotTriggerTryJobReason()
5265 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005266 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005267
borenet6c0efe62016-10-19 08:13:29 -07005268 if options.bucket and options.master:
5269 parser.error('Only one of --bucket and --master may be used.')
5270
qyearsley1fdfcb62016-10-24 13:22:03 -07005271 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005272
qyearsleydd49f942016-10-28 11:57:22 -07005273 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5274 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005275 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005276 if options.verbose:
5277 print('git cl try with no bots now defaults to CQ Dry Run.')
5278 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005279
borenet6c0efe62016-10-19 08:13:29 -07005280 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005281 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005282 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005283 'of bot requires an initial job from a parent (usually a builder). '
5284 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005285 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005286 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005287
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005288 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005289 # TODO(tandrii): Checking local patchset against remote patchset is only
5290 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5291 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005292 print('Warning: Codereview server has newer patchsets (%s) than most '
5293 'recent upload from local checkout (%s). Did a previous upload '
5294 'fail?\n'
5295 'By default, git cl try uses the latest patchset from '
5296 'codereview, continuing to use patchset %s.\n' %
5297 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005298
tandrii568043b2016-10-11 07:49:18 -07005299 try:
borenet6c0efe62016-10-19 08:13:29 -07005300 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5301 patchset)
tandrii568043b2016-10-11 07:49:18 -07005302 except BuildbucketResponseException as ex:
5303 print('ERROR: %s' % ex)
5304 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005305 return 0
5306
5307
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005308def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005309 """Prints info about try jobs associated with current CL."""
5310 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005311 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005312 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005313 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005314 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005315 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005316 '--color', action='store_true', default=setup_color.IS_TTY,
5317 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005318 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005319 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5320 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005321 group.add_option(
5322 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005323 parser.add_option_group(group)
5324 auth.add_auth_options(parser)
5325 options, args = parser.parse_args(args)
5326 if args:
5327 parser.error('Unrecognized args: %s' % ' '.join(args))
5328
5329 auth_config = auth.extract_auth_config_from_options(options)
5330 cl = Changelist(auth_config=auth_config)
5331 if not cl.GetIssue():
5332 parser.error('Need to upload first')
5333
tandrii221ab252016-10-06 08:12:04 -07005334 patchset = options.patchset
5335 if not patchset:
5336 patchset = cl.GetMostRecentPatchset()
5337 if not patchset:
5338 parser.error('Codereview doesn\'t know about issue %s. '
5339 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005340 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005341 cl.GetIssue())
5342
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005343 # TODO(tandrii): Checking local patchset against remote patchset is only
5344 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5345 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005346 print('Warning: Codereview server has newer patchsets (%s) than most '
5347 'recent upload from local checkout (%s). Did a previous upload '
5348 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005349 'By default, git cl try-results uses the latest patchset from '
5350 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005351 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005352 try:
tandrii221ab252016-10-06 08:12:04 -07005353 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005354 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005355 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005356 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005357 if options.json:
5358 write_try_results_json(options.json, jobs)
5359 else:
5360 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005361 return 0
5362
5363
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005364@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005365def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005366 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005367 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005368 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005369 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005370
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005371 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005372 if args:
5373 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005374 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005375 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005376 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005377 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005378
5379 # Clear configured merge-base, if there is one.
5380 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005381 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005382 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005383 return 0
5384
5385
thestig@chromium.org00858c82013-12-02 23:08:03 +00005386def CMDweb(parser, args):
5387 """Opens the current CL in the web browser."""
5388 _, args = parser.parse_args(args)
5389 if args:
5390 parser.error('Unrecognized args: %s' % ' '.join(args))
5391
5392 issue_url = Changelist().GetIssueURL()
5393 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005394 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005395 return 1
5396
5397 webbrowser.open(issue_url)
5398 return 0
5399
5400
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005401def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005402 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005403 parser.add_option('-d', '--dry-run', action='store_true',
5404 help='trigger in dry run mode')
5405 parser.add_option('-c', '--clear', action='store_true',
5406 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005407 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005408 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005409 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005410 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005411 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005412 if args:
5413 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005414 if options.dry_run and options.clear:
5415 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5416
iannuccie53c9352016-08-17 14:40:40 -07005417 cl = Changelist(auth_config=auth_config, issue=options.issue,
5418 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005419 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005420 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005421 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005422 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005423 state = _CQState.DRY_RUN
5424 else:
5425 state = _CQState.COMMIT
5426 if not cl.GetIssue():
5427 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005428 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005429 return 0
5430
5431
groby@chromium.org411034a2013-02-26 15:12:01 +00005432def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005433 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005434 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005435 auth.add_auth_options(parser)
5436 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005437 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005438 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005439 if args:
5440 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005441 cl = Changelist(auth_config=auth_config, issue=options.issue,
5442 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005443 # Ensure there actually is an issue to close.
5444 cl.GetDescription()
5445 cl.CloseIssue()
5446 return 0
5447
5448
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005449def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005450 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005451 parser.add_option(
5452 '--stat',
5453 action='store_true',
5454 dest='stat',
5455 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005456 auth.add_auth_options(parser)
5457 options, args = parser.parse_args(args)
5458 auth_config = auth.extract_auth_config_from_options(options)
5459 if args:
5460 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005461
5462 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005463 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005464 # Staged changes would be committed along with the patch from last
5465 # upload, hence counted toward the "last upload" side in the final
5466 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005467 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005468 return 1
5469
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005470 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005471 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005472 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005473 if not issue:
5474 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005475 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005476 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005477
5478 # Create a new branch based on the merge-base
5479 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005480 # Clear cached branch in cl object, to avoid overwriting original CL branch
5481 # properties.
5482 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005483 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005484 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005485 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005486 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005487 return rtn
5488
wychen@chromium.org06928532015-02-03 02:11:29 +00005489 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005490 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005491 cmd = ['git', 'diff']
5492 if options.stat:
5493 cmd.append('--stat')
5494 cmd.extend([TMP_BRANCH, branch, '--'])
5495 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005496 finally:
5497 RunGit(['checkout', '-q', branch])
5498 RunGit(['branch', '-D', TMP_BRANCH])
5499
5500 return 0
5501
5502
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005503def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005504 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005505 parser.add_option(
5506 '--no-color',
5507 action='store_true',
5508 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005509 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005510 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005511 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005512
5513 author = RunGit(['config', 'user.email']).strip() or None
5514
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005515 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005516
5517 if args:
5518 if len(args) > 1:
5519 parser.error('Unknown args')
5520 base_branch = args[0]
5521 else:
5522 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005523 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005524
5525 change = cl.GetChange(base_branch, None)
5526 return owners_finder.OwnersFinder(
5527 [f.LocalPath() for f in
5528 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005529 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005530 author, fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005531 disable_color=options.no_color).run()
5532
5533
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005534def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005535 """Generates a diff command."""
5536 # Generate diff for the current branch's changes.
5537 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005538 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005539
5540 if args:
5541 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005542 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005543 diff_cmd.append(arg)
5544 else:
5545 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005546
5547 return diff_cmd
5548
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005549
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005550def MatchingFileType(file_name, extensions):
5551 """Returns true if the file name ends with one of the given extensions."""
5552 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005553
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005554
enne@chromium.org555cfe42014-01-29 18:21:39 +00005555@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005556def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005557 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005558 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005559 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005560 parser.add_option('--full', action='store_true',
5561 help='Reformat the full content of all touched files')
5562 parser.add_option('--dry-run', action='store_true',
5563 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005564 parser.add_option('--python', action='store_true',
5565 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005566 parser.add_option('--js', action='store_true',
5567 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005568 parser.add_option('--diff', action='store_true',
5569 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005570 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005571
Daniel Chengc55eecf2016-12-30 03:11:02 -08005572 # Normalize any remaining args against the current path, so paths relative to
5573 # the current directory are still resolved as expected.
5574 args = [os.path.join(os.getcwd(), arg) for arg in args]
5575
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005576 # git diff generates paths against the root of the repository. Change
5577 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005578 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005579 if rel_base_path:
5580 os.chdir(rel_base_path)
5581
digit@chromium.org29e47272013-05-17 17:01:46 +00005582 # Grab the merge-base commit, i.e. the upstream commit of the current
5583 # branch when it was created or the last time it was rebased. This is
5584 # to cover the case where the user may have called "git fetch origin",
5585 # moving the origin branch to a newer commit, but hasn't rebased yet.
5586 upstream_commit = None
5587 cl = Changelist()
5588 upstream_branch = cl.GetUpstreamBranch()
5589 if upstream_branch:
5590 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5591 upstream_commit = upstream_commit.strip()
5592
5593 if not upstream_commit:
5594 DieWithError('Could not find base commit for this branch. '
5595 'Are you in detached state?')
5596
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005597 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5598 diff_output = RunGit(changed_files_cmd)
5599 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005600 # Filter out files deleted by this CL
5601 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005602
Christopher Lamc5ba6922017-01-24 11:19:14 +11005603 if opts.js:
5604 CLANG_EXTS.append('.js')
5605
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005606 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5607 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5608 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005609 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005610
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005611 top_dir = os.path.normpath(
5612 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5613
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005614 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5615 # formatted. This is used to block during the presubmit.
5616 return_value = 0
5617
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005618 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005619 # Locate the clang-format binary in the checkout
5620 try:
5621 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005622 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005623 DieWithError(e)
5624
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005625 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005626 cmd = [clang_format_tool]
5627 if not opts.dry_run and not opts.diff:
5628 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005629 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005630 if opts.diff:
5631 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005632 else:
5633 env = os.environ.copy()
5634 env['PATH'] = str(os.path.dirname(clang_format_tool))
5635 try:
5636 script = clang_format.FindClangFormatScriptInChromiumTree(
5637 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005638 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005639 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005640
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005641 cmd = [sys.executable, script, '-p0']
5642 if not opts.dry_run and not opts.diff:
5643 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005644
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005645 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5646 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005647
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005648 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5649 if opts.diff:
5650 sys.stdout.write(stdout)
5651 if opts.dry_run and len(stdout) > 0:
5652 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005653
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005654 # Similar code to above, but using yapf on .py files rather than clang-format
5655 # on C/C++ files
5656 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005657 yapf_tool = gclient_utils.FindExecutable('yapf')
5658 if yapf_tool is None:
5659 DieWithError('yapf not found in PATH')
5660
5661 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005662 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005663 cmd = [yapf_tool]
5664 if not opts.dry_run and not opts.diff:
5665 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005666 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005667 if opts.diff:
5668 sys.stdout.write(stdout)
5669 else:
5670 # TODO(sbc): yapf --lines mode still has some issues.
5671 # https://github.com/google/yapf/issues/154
5672 DieWithError('--python currently only works with --full')
5673
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005674 # Dart's formatter does not have the nice property of only operating on
5675 # modified chunks, so hard code full.
5676 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005677 try:
5678 command = [dart_format.FindDartFmtToolInChromiumTree()]
5679 if not opts.dry_run and not opts.diff:
5680 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005681 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005682
ppi@chromium.org6593d932016-03-03 15:41:15 +00005683 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005684 if opts.dry_run and stdout:
5685 return_value = 2
5686 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005687 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5688 'found in this checkout. Files in other languages are still '
5689 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005690
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005691 # Format GN build files. Always run on full build files for canonical form.
5692 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005693 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005694 if opts.dry_run or opts.diff:
5695 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005696 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005697 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5698 shell=sys.platform == 'win32',
5699 cwd=top_dir)
5700 if opts.dry_run and gn_ret == 2:
5701 return_value = 2 # Not formatted.
5702 elif opts.diff and gn_ret == 2:
5703 # TODO this should compute and print the actual diff.
5704 print("This change has GN build file diff for " + gn_diff_file)
5705 elif gn_ret != 0:
5706 # For non-dry run cases (and non-2 return values for dry-run), a
5707 # nonzero error code indicates a failure, probably because the file
5708 # doesn't parse.
5709 DieWithError("gn format failed on " + gn_diff_file +
5710 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005711
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005712 metrics_xml_files = [
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005713 os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
5714 os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
5715 os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005716 for xml_file in metrics_xml_files:
5717 if xml_file in diff_files:
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005718 tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
5719 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005720 if opts.dry_run or opts.diff:
5721 cmd.append('--diff')
5722 stdout = RunCommand(cmd, cwd=top_dir)
5723 if opts.diff:
5724 sys.stdout.write(stdout)
5725 if opts.dry_run and stdout:
5726 return_value = 2 # Not formatted.
5727
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005728 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005729
5730
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005731@subcommand.usage('<codereview url or issue id>')
5732def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005733 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005734 _, args = parser.parse_args(args)
5735
5736 if len(args) != 1:
5737 parser.print_help()
5738 return 1
5739
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005740 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005741 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005742 parser.print_help()
5743 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005744 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005745
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005746 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005747 output = RunGit(['config', '--local', '--get-regexp',
5748 r'branch\..*\.%s' % issueprefix],
5749 error_ok=True)
5750 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005751 if issue == target_issue:
5752 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005753
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005754 branches = []
5755 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005756 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005757 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005758 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005759 return 1
5760 if len(branches) == 1:
5761 RunGit(['checkout', branches[0]])
5762 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005763 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005764 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005765 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005766 which = raw_input('Choose by index: ')
5767 try:
5768 RunGit(['checkout', branches[int(which)]])
5769 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005770 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005771 return 1
5772
5773 return 0
5774
5775
maruel@chromium.org29404b52014-09-08 22:58:00 +00005776def CMDlol(parser, args):
5777 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005778 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005779 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5780 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5781 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005782 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005783 return 0
5784
5785
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005786class OptionParser(optparse.OptionParser):
5787 """Creates the option parse and add --verbose support."""
5788 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005789 optparse.OptionParser.__init__(
5790 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005791 self.add_option(
5792 '-v', '--verbose', action='count', default=0,
5793 help='Use 2 times for more debugging info')
5794
5795 def parse_args(self, args=None, values=None):
5796 options, args = optparse.OptionParser.parse_args(self, args, values)
5797 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005798 logging.basicConfig(
5799 level=levels[min(options.verbose, len(levels) - 1)],
5800 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5801 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005802 return options, args
5803
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005804
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005805def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005806 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005807 print('\nYour python version %s is unsupported, please upgrade.\n' %
5808 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005809 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005810
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005811 # Reload settings.
5812 global settings
5813 settings = Settings()
5814
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005815 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005816 dispatcher = subcommand.CommandDispatcher(__name__)
5817 try:
5818 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005819 except auth.AuthenticationError as e:
5820 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005821 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005822 if e.code != 500:
5823 raise
5824 DieWithError(
5825 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5826 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005827 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005828
5829
5830if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005831 # These affect sys.stdout so do it outside of main() to simplify mocks in
5832 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005833 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005834 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005835 try:
5836 sys.exit(main(sys.argv[1:]))
5837 except KeyboardInterrupt:
5838 sys.stderr.write('interrupted\n')
5839 sys.exit(1)