blob: 0a94470c3fd5e14b852e52c5a70147b93b013185 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
38try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080039 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000040except ImportError:
41 pass
42
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000043from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000044from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000045from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000046import auth
skobes6468b902016-10-24 08:45:10 -070047import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000048import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000049import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000050import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000051import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000052import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000053import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000054import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000056import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000057import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000058import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000060import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000062import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000063import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064import watchlists
65
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
tandrii9d2c7a32016-06-22 03:42:45 -070068COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070069DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080070POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000071DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000072REFS_THAT_ALIAS_TO_OTHER_REFS = {
73 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
74 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
75}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000076
thestig@chromium.org44202a22014-03-11 19:22:18 +000077# Valid extensions for files we want to lint.
78DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
79DEFAULT_LINT_IGNORE_REGEX = r"$^"
80
borenet6c0efe62016-10-19 08:13:29 -070081# Buildbucket master name prefix.
82MASTER_PREFIX = 'master.'
83
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000084# Shortcut since it quickly becomes redundant.
85Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000086
maruel@chromium.orgddd59412011-11-30 14:20:38 +000087# Initialized in main()
88settings = None
89
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010090# Used by tests/git_cl_test.py to add extra logging.
91# Inside the weirdly failing test, add this:
92# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
93# And scroll up to see the strack trace printed.
94_IS_BEING_TESTED = False
95
maruel@chromium.orgddd59412011-11-30 14:20:38 +000096
Christopher Lamf732cd52017-01-24 12:40:11 +110097def DieWithError(message, change_desc=None):
98 if change_desc:
99 SaveDescriptionBackup(change_desc)
100
vapiera7fbd5a2016-06-16 09:17:49 -0700101 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102 sys.exit(1)
103
104
Christopher Lamf732cd52017-01-24 12:40:11 +1100105def SaveDescriptionBackup(change_desc):
106 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
107 print('\nError after CL description prompt -- saving description to %s\n' %
108 backup_path)
109 backup_file = open(backup_path, 'w')
110 backup_file.write(change_desc.description)
111 backup_file.close()
112
113
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000114def GetNoGitPagerEnv():
115 env = os.environ.copy()
116 # 'cat' is a magical git string that disables pagers on all platforms.
117 env['GIT_PAGER'] = 'cat'
118 return env
119
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000120
bsep@chromium.org627d9002016-04-29 00:00:52 +0000121def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000122 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000123 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000124 except subprocess2.CalledProcessError as e:
125 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000126 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000127 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000128 'Command "%s" failed.\n%s' % (
129 ' '.join(args), error_message or e.stdout or ''))
130 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131
132
133def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000134 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000135 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136
137
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000138def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000139 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700140 if suppress_stderr:
141 stderr = subprocess2.VOID
142 else:
143 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000144 try:
tandrii5d48c322016-08-18 16:19:37 -0700145 (out, _), code = subprocess2.communicate(['git'] + args,
146 env=GetNoGitPagerEnv(),
147 stdout=subprocess2.PIPE,
148 stderr=stderr)
149 return code, out
150 except subprocess2.CalledProcessError as e:
151 logging.debug('Failed running %s', args)
152 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000153
154
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000155def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000156 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000157 return RunGitWithCode(args, suppress_stderr=True)[1]
158
159
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000160def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000161 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000162 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000163 return (version.startswith(prefix) and
164 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000165
166
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000167def BranchExists(branch):
168 """Return True if specified branch exists."""
169 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
170 suppress_stderr=True)
171 return not code
172
173
tandrii2a16b952016-10-19 07:09:44 -0700174def time_sleep(seconds):
175 # Use this so that it can be mocked in tests without interfering with python
176 # system machinery.
177 import time # Local import to discourage others from importing time globally.
178 return time.sleep(seconds)
179
180
maruel@chromium.org90541732011-04-01 17:54:18 +0000181def ask_for_data(prompt):
182 try:
183 return raw_input(prompt)
184 except KeyboardInterrupt:
185 # Hide the exception.
186 sys.exit(1)
187
188
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100189def confirm_or_exit(prefix='', action='confirm'):
190 """Asks user to press enter to continue or press Ctrl+C to abort."""
191 if not prefix or prefix.endswith('\n'):
192 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100193 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100194 mid = ' Press'
195 elif prefix.endswith(' '):
196 mid = 'press'
197 else:
198 mid = ' press'
199 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
200
201
202def ask_for_explicit_yes(prompt):
203 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
204 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
205 while True:
206 if 'yes'.startswith(result):
207 return True
208 if 'no'.startswith(result):
209 return False
210 result = ask_for_data('Please, type yes or no: ').lower()
211
212
tandrii5d48c322016-08-18 16:19:37 -0700213def _git_branch_config_key(branch, key):
214 """Helper method to return Git config key for a branch."""
215 assert branch, 'branch name is required to set git config for it'
216 return 'branch.%s.%s' % (branch, key)
217
218
219def _git_get_branch_config_value(key, default=None, value_type=str,
220 branch=False):
221 """Returns git config value of given or current branch if any.
222
223 Returns default in all other cases.
224 """
225 assert value_type in (int, str, bool)
226 if branch is False: # Distinguishing default arg value from None.
227 branch = GetCurrentBranch()
228
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000229 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700230 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000231
tandrii5d48c322016-08-18 16:19:37 -0700232 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700233 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700234 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700235 # git config also has --int, but apparently git config suffers from integer
236 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700237 args.append(_git_branch_config_key(branch, key))
238 code, out = RunGitWithCode(args)
239 if code == 0:
240 value = out.strip()
241 if value_type == int:
242 return int(value)
243 if value_type == bool:
244 return bool(value.lower() == 'true')
245 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000246 return default
247
248
tandrii5d48c322016-08-18 16:19:37 -0700249def _git_set_branch_config_value(key, value, branch=None, **kwargs):
250 """Sets the value or unsets if it's None of a git branch config.
251
252 Valid, though not necessarily existing, branch must be provided,
253 otherwise currently checked out branch is used.
254 """
255 if not branch:
256 branch = GetCurrentBranch()
257 assert branch, 'a branch name OR currently checked out branch is required'
258 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700259 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700260 if value is None:
261 args.append('--unset')
262 elif isinstance(value, bool):
263 args.append('--bool')
264 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700265 else:
tandrii33a46ff2016-08-23 05:53:40 -0700266 # git config also has --int, but apparently git config suffers from integer
267 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700268 value = str(value)
269 args.append(_git_branch_config_key(branch, key))
270 if value is not None:
271 args.append(value)
272 RunGit(args, **kwargs)
273
274
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100275def _get_committer_timestamp(commit):
276 """Returns unix timestamp as integer of a committer in a commit.
277
278 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
279 """
280 # Git also stores timezone offset, but it only affects visual display,
281 # actual point in time is defined by this timestamp only.
282 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
283
284
285def _git_amend_head(message, committer_timestamp):
286 """Amends commit with new message and desired committer_timestamp.
287
288 Sets committer timezone to UTC.
289 """
290 env = os.environ.copy()
291 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
292 return RunGit(['commit', '--amend', '-m', message], env=env)
293
294
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000295def add_git_similarity(parser):
296 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700297 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000298 help='Sets the percentage that a pair of files need to match in order to'
299 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000300 parser.add_option(
301 '--find-copies', action='store_true',
302 help='Allows git to look for copies.')
303 parser.add_option(
304 '--no-find-copies', action='store_false', dest='find_copies',
305 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000306
307 old_parser_args = parser.parse_args
308 def Parse(args):
309 options, args = old_parser_args(args)
310
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000311 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700312 options.similarity = _git_get_branch_config_value(
313 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000315 print('Note: Saving similarity of %d%% in git config.'
316 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700317 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000318
iannucci@chromium.org79540052012-10-19 23:15:26 +0000319 options.similarity = max(0, min(options.similarity, 100))
320
321 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700322 options.find_copies = _git_get_branch_config_value(
323 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000324 else:
tandrii5d48c322016-08-18 16:19:37 -0700325 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000326
327 print('Using %d%% similarity for rename/copy detection. '
328 'Override with --similarity.' % options.similarity)
329
330 return options, args
331 parser.parse_args = Parse
332
333
machenbach@chromium.org45453142015-09-15 08:45:22 +0000334def _get_properties_from_options(options):
335 properties = dict(x.split('=', 1) for x in options.properties)
336 for key, val in properties.iteritems():
337 try:
338 properties[key] = json.loads(val)
339 except ValueError:
340 pass # If a value couldn't be evaluated, treat it as a string.
341 return properties
342
343
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000344def _prefix_master(master):
345 """Convert user-specified master name to full master name.
346
347 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
348 name, while the developers always use shortened master name
349 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
350 function does the conversion for buildbucket migration.
351 """
borenet6c0efe62016-10-19 08:13:29 -0700352 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000353 return master
borenet6c0efe62016-10-19 08:13:29 -0700354 return '%s%s' % (MASTER_PREFIX, master)
355
356
357def _unprefix_master(bucket):
358 """Convert bucket name to shortened master name.
359
360 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
361 name, while the developers always use shortened master name
362 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
363 function does the conversion for buildbucket migration.
364 """
365 if bucket.startswith(MASTER_PREFIX):
366 return bucket[len(MASTER_PREFIX):]
367 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000368
369
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370def _buildbucket_retry(operation_name, http, *args, **kwargs):
371 """Retries requests to buildbucket service and returns parsed json content."""
372 try_count = 0
373 while True:
374 response, content = http.request(*args, **kwargs)
375 try:
376 content_json = json.loads(content)
377 except ValueError:
378 content_json = None
379
380 # Buildbucket could return an error even if status==200.
381 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000382 error = content_json.get('error')
383 if error.get('code') == 403:
384 raise BuildbucketResponseException(
385 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000386 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000387 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000388 raise BuildbucketResponseException(msg)
389
390 if response.status == 200:
391 if not content_json:
392 raise BuildbucketResponseException(
393 'Buildbucket returns invalid json content: %s.\n'
394 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
395 content)
396 return content_json
397 if response.status < 500 or try_count >= 2:
398 raise httplib2.HttpLib2Error(content)
399
400 # status >= 500 means transient failures.
401 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700402 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 try_count += 1
404 assert False, 'unreachable'
405
406
qyearsley1fdfcb62016-10-24 13:22:03 -0700407def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700408 """Returns a dict mapping bucket names to builders and tests,
409 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 """
qyearsleydd49f942016-10-28 11:57:22 -0700411 # If no bots are listed, we try to get a set of builders and tests based
412 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 if not options.bot:
414 change = changelist.GetChange(
415 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700416 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700417 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 change=change,
419 changed_files=change.LocalPaths(),
420 repository_root=settings.GetRoot(),
421 default_presubmit=None,
422 project=None,
423 verbose=options.verbose,
424 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700425 if masters is None:
426 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100427 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700428
qyearsley1fdfcb62016-10-24 13:22:03 -0700429 if options.bucket:
430 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700431 if options.master:
432 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700433
qyearsleydd49f942016-10-28 11:57:22 -0700434 # If bots are listed but no master or bucket, then we need to find out
435 # the corresponding master for each bot.
436 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
437 if error_message:
438 option_parser.error(
439 'Tryserver master cannot be found because: %s\n'
440 'Please manually specify the tryserver master, e.g. '
441 '"-m tryserver.chromium.linux".' % error_message)
442 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700443
444
qyearsley123a4682016-10-26 09:12:17 -0700445def _get_bucket_map_for_builders(builders):
446 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700447 map_url = 'https://builders-map.appspot.com/'
448 try:
qyearsley123a4682016-10-26 09:12:17 -0700449 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700450 except urllib2.URLError as e:
451 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
452 (map_url, e))
453 except ValueError as e:
454 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700455 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 return None, 'Failed to build master map.'
457
qyearsley123a4682016-10-26 09:12:17 -0700458 bucket_map = {}
459 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700460 masters = builders_map.get(builder, [])
461 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700463 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700464 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700465 (builder, masters))
466 bucket = _prefix_master(masters[0])
467 bucket_map.setdefault(bucket, {})[builder] = []
468
469 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700470
471
borenet6c0efe62016-10-19 08:13:29 -0700472def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700473 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700474 """Sends a request to Buildbucket to trigger try jobs for a changelist.
475
476 Args:
477 auth_config: AuthConfig for Rietveld.
478 changelist: Changelist that the try jobs are associated with.
479 buckets: A nested dict mapping bucket names to builders to tests.
480 options: Command-line options.
481 """
tandriide281ae2016-10-12 06:02:30 -0700482 assert changelist.GetIssue(), 'CL must be uploaded first'
483 codereview_url = changelist.GetCodereviewServer()
484 assert codereview_url, 'CL must be uploaded first'
485 patchset = patchset or changelist.GetMostRecentPatchset()
486 assert patchset, 'CL must be uploaded first'
487
488 codereview_host = urlparse.urlparse(codereview_url).hostname
489 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000490 http = authenticator.authorize(httplib2.Http())
491 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700492
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493 buildbucket_put_url = (
494 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000495 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700496 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
497 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
498 hostname=codereview_host,
499 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700501
502 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
503 shared_parameters_properties['category'] = category
504 if options.clobber:
505 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700506 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700507 if extra_properties:
508 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000509
510 batch_req_body = {'builds': []}
511 print_text = []
512 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700513 for bucket, builders_and_tests in sorted(buckets.iteritems()):
514 print_text.append('Bucket: %s' % bucket)
515 master = None
516 if bucket.startswith(MASTER_PREFIX):
517 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000518 for builder, tests in sorted(builders_and_tests.iteritems()):
519 print_text.append(' %s: %s' % (builder, tests))
520 parameters = {
521 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000522 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100523 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000524 'revision': options.revision,
525 }],
tandrii8c5a3532016-11-04 07:52:02 -0700526 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000527 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000528 if 'presubmit' in builder.lower():
529 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000530 if tests:
531 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700532
533 tags = [
534 'builder:%s' % builder,
535 'buildset:%s' % buildset,
536 'user_agent:git_cl_try',
537 ]
538 if master:
539 parameters['properties']['master'] = master
540 tags.append('master:%s' % master)
541
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000542 batch_req_body['builds'].append(
543 {
544 'bucket': bucket,
545 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700547 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000548 }
549 )
550
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700552 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 http,
554 buildbucket_put_url,
555 'PUT',
556 body=json.dumps(batch_req_body),
557 headers={'Content-Type': 'application/json'}
558 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000559 print_text.append('To see results here, run: git cl try-results')
560 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700561 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000562
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000563
tandrii221ab252016-10-06 08:12:04 -0700564def fetch_try_jobs(auth_config, changelist, buildbucket_host,
565 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700566 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
qyearsley53f48a12016-09-01 10:45:13 -0700568 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 """
tandrii221ab252016-10-06 08:12:04 -0700570 assert buildbucket_host
571 assert changelist.GetIssue(), 'CL must be uploaded first'
572 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
573 patchset = patchset or changelist.GetMostRecentPatchset()
574 assert patchset, 'CL must be uploaded first'
575
576 codereview_url = changelist.GetCodereviewServer()
577 codereview_host = urlparse.urlparse(codereview_url).hostname
578 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 if authenticator.has_cached_credentials():
580 http = authenticator.authorize(httplib2.Http())
581 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700582 print('Warning: Some results might be missing because %s' %
583 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700584 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 http = httplib2.Http()
586
587 http.force_exception_to_status_code = True
588
tandrii221ab252016-10-06 08:12:04 -0700589 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
590 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
591 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700593 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 params = {'tag': 'buildset:%s' % buildset}
595
596 builds = {}
597 while True:
598 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700599 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700601 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000602 for build in content.get('builds', []):
603 builds[build['id']] = build
604 if 'next_cursor' in content:
605 params['start_cursor'] = content['next_cursor']
606 else:
607 break
608 return builds
609
610
qyearsleyeab3c042016-08-24 09:18:28 -0700611def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 """Prints nicely result of fetch_try_jobs."""
613 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700614 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 return
616
617 # Make a copy, because we'll be modifying builds dictionary.
618 builds = builds.copy()
619 builder_names_cache = {}
620
621 def get_builder(b):
622 try:
623 return builder_names_cache[b['id']]
624 except KeyError:
625 try:
626 parameters = json.loads(b['parameters_json'])
627 name = parameters['builder_name']
628 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700629 print('WARNING: failed to get builder name for build %s: %s' % (
630 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 name = None
632 builder_names_cache[b['id']] = name
633 return name
634
635 def get_bucket(b):
636 bucket = b['bucket']
637 if bucket.startswith('master.'):
638 return bucket[len('master.'):]
639 return bucket
640
641 if options.print_master:
642 name_fmt = '%%-%ds %%-%ds' % (
643 max(len(str(get_bucket(b))) for b in builds.itervalues()),
644 max(len(str(get_builder(b))) for b in builds.itervalues()))
645 def get_name(b):
646 return name_fmt % (get_bucket(b), get_builder(b))
647 else:
648 name_fmt = '%%-%ds' % (
649 max(len(str(get_builder(b))) for b in builds.itervalues()))
650 def get_name(b):
651 return name_fmt % get_builder(b)
652
653 def sort_key(b):
654 return b['status'], b.get('result'), get_name(b), b.get('url')
655
656 def pop(title, f, color=None, **kwargs):
657 """Pop matching builds from `builds` dict and print them."""
658
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000659 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 colorize = str
661 else:
662 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
663
664 result = []
665 for b in builds.values():
666 if all(b.get(k) == v for k, v in kwargs.iteritems()):
667 builds.pop(b['id'])
668 result.append(b)
669 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700670 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700672 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674 total = len(builds)
675 pop(status='COMPLETED', result='SUCCESS',
676 title='Successes:', color=Fore.GREEN,
677 f=lambda b: (get_name(b), b.get('url')))
678 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
679 title='Infra Failures:', color=Fore.MAGENTA,
680 f=lambda b: (get_name(b), b.get('url')))
681 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
682 title='Failures:', color=Fore.RED,
683 f=lambda b: (get_name(b), b.get('url')))
684 pop(status='COMPLETED', result='CANCELED',
685 title='Canceled:', color=Fore.MAGENTA,
686 f=lambda b: (get_name(b),))
687 pop(status='COMPLETED', result='FAILURE',
688 failure_reason='INVALID_BUILD_DEFINITION',
689 title='Wrong master/builder name:', color=Fore.MAGENTA,
690 f=lambda b: (get_name(b),))
691 pop(status='COMPLETED', result='FAILURE',
692 title='Other failures:',
693 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
694 pop(status='COMPLETED',
695 title='Other finished:',
696 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
697 pop(status='STARTED',
698 title='Started:', color=Fore.YELLOW,
699 f=lambda b: (get_name(b), b.get('url')))
700 pop(status='SCHEDULED',
701 title='Scheduled:',
702 f=lambda b: (get_name(b), 'id=%s' % b['id']))
703 # The last section is just in case buildbucket API changes OR there is a bug.
704 pop(title='Other:',
705 f=lambda b: (get_name(b), 'id=%s' % b['id']))
706 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700707 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000708
709
qyearsley53f48a12016-09-01 10:45:13 -0700710def write_try_results_json(output_file, builds):
711 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
712
713 The input |builds| dict is assumed to be generated by Buildbucket.
714 Buildbucket documentation: http://goo.gl/G0s101
715 """
716
717 def convert_build_dict(build):
718 return {
719 'buildbucket_id': build.get('id'),
720 'status': build.get('status'),
721 'result': build.get('result'),
722 'bucket': build.get('bucket'),
723 'builder_name': json.loads(
724 build.get('parameters_json', '{}')).get('builder_name'),
725 'failure_reason': build.get('failure_reason'),
726 'url': build.get('url'),
727 }
728
729 converted = []
730 for _, build in sorted(builds.items()):
731 converted.append(convert_build_dict(build))
732 write_json(output_file, converted)
733
734
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 """Prints statistics about the change to the user."""
737 # --no-ext-diff is broken in some versions of Git, so try to work around
738 # this by overriding the environment (but there is still a problem if the
739 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 if 'GIT_EXTERNAL_DIFF' in env:
742 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
744 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800745 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746 else:
747 similarity_options = ['-M%s' % similarity]
748
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000749 try:
750 stdout = sys.stdout.fileno()
751 except AttributeError:
752 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000755 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000756 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
765 self.default_server = None
766 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000767 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.tree_status_url = None
769 self.viewvc_url = None
770 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000771 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000773 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000775 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000776 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
778 def LazyUpdateIfNeeded(self):
779 """Updates the settings from a codereview.settings file, if available."""
780 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000783 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000784 error_ok=True
785 ).strip().lower()
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 self.updated = True
791
792 def GetDefaultServerUrl(self, error_ok=False):
793 if not self.default_server:
794 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000795 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 if error_ok:
798 return self.default_server
799 if not self.default_server:
800 error_message = ('Could not find settings file. You must configure '
801 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000802 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000803 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804 return self.default_server
805
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 @staticmethod
807 def GetRelativeRoot():
808 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 if self.root is None:
812 self.root = os.path.abspath(self.GetRelativeRoot())
813 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000815 def GetGitMirror(self, remote='origin'):
816 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000817 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000818 if not os.path.isdir(local_url):
819 return None
820 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
821 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100822 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100823 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000824 if mirror.exists():
825 return mirror
826 return None
827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 def GetTreeStatusUrl(self, error_ok=False):
829 if not self.tree_status_url:
830 error_message = ('You must configure your tree status URL by running '
831 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000832 self.tree_status_url = self._GetRietveldConfig(
833 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.tree_status_url
835
836 def GetViewVCUrl(self):
837 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000838 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.viewvc_url
840
rmistry@google.com90752582014-01-14 21:04:50 +0000841 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000842 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000843
rmistry@google.com78948ed2015-07-08 23:09:57 +0000844 def GetIsSkipDependencyUpload(self, branch_name):
845 """Returns true if specified branch should skip dep uploads."""
846 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
847 error_ok=True)
848
rmistry@google.com5626a922015-02-26 14:03:30 +0000849 def GetRunPostUploadHook(self):
850 run_post_upload_hook = self._GetRietveldConfig(
851 'run-post-upload-hook', error_ok=True)
852 return run_post_upload_hook == "True"
853
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000854 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000856
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000858 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000859
ukai@chromium.orge8077812012-02-03 03:41:46 +0000860 def GetIsGerrit(self):
861 """Return true if this repo is assosiated with gerrit code review system."""
862 if self.is_gerrit is None:
863 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
864 return self.is_gerrit
865
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000866 def GetSquashGerritUploads(self):
867 """Return true if uploads to Gerrit should be squashed by default."""
868 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700869 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
870 if self.squash_gerrit_uploads is None:
871 # Default is squash now (http://crbug.com/611892#c23).
872 self.squash_gerrit_uploads = not (
873 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
874 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000875 return self.squash_gerrit_uploads
876
tandriia60502f2016-06-20 02:01:53 -0700877 def GetSquashGerritUploadsOverride(self):
878 """Return True or False if codereview.settings should be overridden.
879
880 Returns None if no override has been defined.
881 """
882 # See also http://crbug.com/611892#c23
883 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
884 error_ok=True).strip()
885 if result == 'true':
886 return True
887 if result == 'false':
888 return False
889 return None
890
tandrii@chromium.org28253532016-04-14 13:46:56 +0000891 def GetGerritSkipEnsureAuthenticated(self):
892 """Return True if EnsureAuthenticated should not be done for Gerrit
893 uploads."""
894 if self.gerrit_skip_ensure_authenticated is None:
895 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000896 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000897 error_ok=True).strip() == 'true')
898 return self.gerrit_skip_ensure_authenticated
899
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000900 def GetGitEditor(self):
901 """Return the editor specified in the git config, or None if none is."""
902 if self.git_editor is None:
903 self.git_editor = self._GetConfig('core.editor', error_ok=True)
904 return self.git_editor or None
905
thestig@chromium.org44202a22014-03-11 19:22:18 +0000906 def GetLintRegex(self):
907 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
908 DEFAULT_LINT_REGEX)
909
910 def GetLintIgnoreRegex(self):
911 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
912 DEFAULT_LINT_IGNORE_REGEX)
913
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000914 def GetProject(self):
915 if not self.project:
916 self.project = self._GetRietveldConfig('project', error_ok=True)
917 return self.project
918
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000919 def _GetRietveldConfig(self, param, **kwargs):
920 return self._GetConfig('rietveld.' + param, **kwargs)
921
rmistry@google.com78948ed2015-07-08 23:09:57 +0000922 def _GetBranchConfig(self, branch_name, param, **kwargs):
923 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
924
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000925 def _GetConfig(self, param, **kwargs):
926 self.LazyUpdateIfNeeded()
927 return RunGit(['config', param], **kwargs).strip()
928
929
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100930@contextlib.contextmanager
931def _get_gerrit_project_config_file(remote_url):
932 """Context manager to fetch and store Gerrit's project.config from
933 refs/meta/config branch and store it in temp file.
934
935 Provides a temporary filename or None if there was error.
936 """
937 error, _ = RunGitWithCode([
938 'fetch', remote_url,
939 '+refs/meta/config:refs/git_cl/meta/config'])
940 if error:
941 # Ref doesn't exist or isn't accessible to current user.
942 print('WARNING: failed to fetch project config for %s: %s' %
943 (remote_url, error))
944 yield None
945 return
946
947 error, project_config_data = RunGitWithCode(
948 ['show', 'refs/git_cl/meta/config:project.config'])
949 if error:
950 print('WARNING: project.config file not found')
951 yield None
952 return
953
954 with gclient_utils.temporary_directory() as tempdir:
955 project_config_file = os.path.join(tempdir, 'project.config')
956 gclient_utils.FileWrite(project_config_file, project_config_data)
957 yield project_config_file
958
959
960def _is_git_numberer_enabled(remote_url, remote_ref):
961 """Returns True if Git Numberer is enabled on this ref."""
962 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100963 KNOWN_PROJECTS_WHITELIST = [
964 'chromium/src',
965 'external/webrtc',
966 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100967 'infra/experimental',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100968 ]
969
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100970 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
971 url_parts = urlparse.urlparse(remote_url)
972 project_name = url_parts.path.lstrip('/').rstrip('git./')
973 for known in KNOWN_PROJECTS_WHITELIST:
974 if project_name.endswith(known):
975 break
976 else:
977 # Early exit to avoid extra fetches for repos that aren't using Git
978 # Numberer.
979 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100980
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100981 with _get_gerrit_project_config_file(remote_url) as project_config_file:
982 if project_config_file is None:
983 # Failed to fetch project.config, which shouldn't happen on open source
984 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100985 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100986 def get_opts(x):
987 code, out = RunGitWithCode(
988 ['config', '-f', project_config_file, '--get-all',
989 'plugin.git-numberer.validate-%s-refglob' % x])
990 if code == 0:
991 return out.strip().splitlines()
992 return []
993 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100994
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100995 logging.info('validator config enabled %s disabled %s refglobs for '
996 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000997
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100998 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100999 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001000 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001001 return True
1002 return False
1003
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001004 if match_refglobs(disabled):
1005 return False
1006 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001007
1008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009def ShortBranchName(branch):
1010 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 return branch.replace('refs/heads/', '', 1)
1012
1013
1014def GetCurrentBranchRef():
1015 """Returns branch ref (e.g., refs/heads/master) or None."""
1016 return RunGit(['symbolic-ref', 'HEAD'],
1017 stderr=subprocess2.VOID, error_ok=True).strip() or None
1018
1019
1020def GetCurrentBranch():
1021 """Returns current branch or None.
1022
1023 For refs/heads/* branches, returns just last part. For others, full ref.
1024 """
1025 branchref = GetCurrentBranchRef()
1026 if branchref:
1027 return ShortBranchName(branchref)
1028 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029
1030
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001031class _CQState(object):
1032 """Enum for states of CL with respect to Commit Queue."""
1033 NONE = 'none'
1034 DRY_RUN = 'dry_run'
1035 COMMIT = 'commit'
1036
1037 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1038
1039
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001041 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001042 self.issue = issue
1043 self.patchset = patchset
1044 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001045 assert codereview in (None, 'rietveld', 'gerrit')
1046 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001047
1048 @property
1049 def valid(self):
1050 return self.issue is not None
1051
1052
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001053def ParseIssueNumberArgument(arg):
1054 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1055 fail_result = _ParsedIssueNumberArgument()
1056
1057 if arg.isdigit():
1058 return _ParsedIssueNumberArgument(issue=int(arg))
1059 if not arg.startswith('http'):
1060 return fail_result
1061 url = gclient_utils.UpgradeToHttps(arg)
1062 try:
1063 parsed_url = urlparse.urlparse(url)
1064 except ValueError:
1065 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001066
1067 results = {}
1068 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1069 parsed = cls.ParseIssueURL(parsed_url)
1070 if parsed is not None:
1071 results[name] = parsed
1072
1073 if not results:
1074 return fail_result
1075 if len(results) == 1:
1076 return results.values()[0]
1077 # Choose Rietveld if there are two.
1078 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001079
1080
Aaron Gablea45ee112016-11-22 15:14:38 -08001081class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001082 def __init__(self, issue, url):
1083 self.issue = issue
1084 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001085 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001086
1087 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001088 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001089 self.issue, self.url)
1090
1091
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001092_CommentSummary = collections.namedtuple(
1093 '_CommentSummary', ['date', 'message', 'sender',
1094 # TODO(tandrii): these two aren't known in Gerrit.
1095 'approval', 'disapproval'])
1096
1097
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001099 """Changelist works with one changelist in local branch.
1100
1101 Supports two codereview backends: Rietveld or Gerrit, selected at object
1102 creation.
1103
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001104 Notes:
1105 * Not safe for concurrent multi-{thread,process} use.
1106 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001107 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001108 """
1109
1110 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1111 """Create a new ChangeList instance.
1112
1113 If issue is given, the codereview must be given too.
1114
1115 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1116 Otherwise, it's decided based on current configuration of the local branch,
1117 with default being 'rietveld' for backwards compatibility.
1118 See _load_codereview_impl for more details.
1119
1120 **kwargs will be passed directly to codereview implementation.
1121 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001122 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001123 global settings
1124 if not settings:
1125 # Happens when git_cl.py is used as a utility library.
1126 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001127
1128 if issue:
1129 assert codereview, 'codereview must be known, if issue is known'
1130
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 self.branchref = branchref
1132 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001133 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 self.branch = ShortBranchName(self.branchref)
1135 else:
1136 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001138 self.lookedup_issue = False
1139 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140 self.has_description = False
1141 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001142 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001144 self.cc = None
1145 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001146 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001147
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001148 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001149 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001150 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001151 assert self._codereview_impl
1152 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001153
1154 def _load_codereview_impl(self, codereview=None, **kwargs):
1155 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001156 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1157 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1158 self._codereview = codereview
1159 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001160 return
1161
1162 # Automatic selection based on issue number set for a current branch.
1163 # Rietveld takes precedence over Gerrit.
1164 assert not self.issue
1165 # Whether we find issue or not, we are doing the lookup.
1166 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001167 if self.GetBranch():
1168 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1169 issue = _git_get_branch_config_value(
1170 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1171 if issue:
1172 self._codereview = codereview
1173 self._codereview_impl = cls(self, **kwargs)
1174 self.issue = int(issue)
1175 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001176
1177 # No issue is set for this branch, so decide based on repo-wide settings.
1178 return self._load_codereview_impl(
1179 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1180 **kwargs)
1181
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001182 def IsGerrit(self):
1183 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001184
1185 def GetCCList(self):
1186 """Return the users cc'd on this CL.
1187
agable92bec4f2016-08-24 09:27:27 -07001188 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001189 """
1190 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001191 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001192 more_cc = ','.join(self.watchers)
1193 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1194 return self.cc
1195
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001196 def GetCCListWithoutDefault(self):
1197 """Return the users cc'd on this CL excluding default ones."""
1198 if self.cc is None:
1199 self.cc = ','.join(self.watchers)
1200 return self.cc
1201
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001202 def SetWatchers(self, watchers):
1203 """Set the list of email addresses that should be cc'd based on the changed
1204 files in this CL.
1205 """
1206 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207
1208 def GetBranch(self):
1209 """Returns the short branch name, e.g. 'master'."""
1210 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001211 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001212 if not branchref:
1213 return None
1214 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215 self.branch = ShortBranchName(self.branchref)
1216 return self.branch
1217
1218 def GetBranchRef(self):
1219 """Returns the full branch name, e.g. 'refs/heads/master'."""
1220 self.GetBranch() # Poke the lazy loader.
1221 return self.branchref
1222
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001223 def ClearBranch(self):
1224 """Clears cached branch data of this object."""
1225 self.branch = self.branchref = None
1226
tandrii5d48c322016-08-18 16:19:37 -07001227 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1228 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1229 kwargs['branch'] = self.GetBranch()
1230 return _git_get_branch_config_value(key, default, **kwargs)
1231
1232 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1233 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1234 assert self.GetBranch(), (
1235 'this CL must have an associated branch to %sset %s%s' %
1236 ('un' if value is None else '',
1237 key,
1238 '' if value is None else ' to %r' % value))
1239 kwargs['branch'] = self.GetBranch()
1240 return _git_set_branch_config_value(key, value, **kwargs)
1241
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001242 @staticmethod
1243 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001244 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 e.g. 'origin', 'refs/heads/master'
1246 """
1247 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001248 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1249
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001251 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001252 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001253 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1254 error_ok=True).strip()
1255 if upstream_branch:
1256 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001258 # Else, try to guess the origin remote.
1259 remote_branches = RunGit(['branch', '-r']).split()
1260 if 'origin/master' in remote_branches:
1261 # Fall back on origin/master if it exits.
1262 remote = 'origin'
1263 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001265 DieWithError(
1266 'Unable to determine default branch to diff against.\n'
1267 'Either pass complete "git diff"-style arguments, like\n'
1268 ' git cl upload origin/master\n'
1269 'or verify this branch is set up to track another \n'
1270 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001271
1272 return remote, upstream_branch
1273
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001274 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001275 upstream_branch = self.GetUpstreamBranch()
1276 if not BranchExists(upstream_branch):
1277 DieWithError('The upstream for the current branch (%s) does not exist '
1278 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001279 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001280 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001281
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001282 def GetUpstreamBranch(self):
1283 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001284 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001286 upstream_branch = upstream_branch.replace('refs/heads/',
1287 'refs/remotes/%s/' % remote)
1288 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1289 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001290 self.upstream_branch = upstream_branch
1291 return self.upstream_branch
1292
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001294 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001295 remote, branch = None, self.GetBranch()
1296 seen_branches = set()
1297 while branch not in seen_branches:
1298 seen_branches.add(branch)
1299 remote, branch = self.FetchUpstreamTuple(branch)
1300 branch = ShortBranchName(branch)
1301 if remote != '.' or branch.startswith('refs/remotes'):
1302 break
1303 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001304 remotes = RunGit(['remote'], error_ok=True).split()
1305 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001306 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001307 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001308 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001309 logging.warn('Could not determine which remote this change is '
1310 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001311 else:
1312 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001313 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001314 branch = 'HEAD'
1315 if branch.startswith('refs/remotes'):
1316 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001317 elif branch.startswith('refs/branch-heads/'):
1318 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001319 else:
1320 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001321 return self._remote
1322
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001323 def GitSanityChecks(self, upstream_git_obj):
1324 """Checks git repo status and ensures diff is from local commits."""
1325
sbc@chromium.org79706062015-01-14 21:18:12 +00001326 if upstream_git_obj is None:
1327 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001328 print('ERROR: unable to determine current branch (detached HEAD?)',
1329 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001330 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001331 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001332 return False
1333
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001334 # Verify the commit we're diffing against is in our current branch.
1335 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1336 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1337 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001338 print('ERROR: %s is not in the current branch. You may need to rebase '
1339 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001340 return False
1341
1342 # List the commits inside the diff, and verify they are all local.
1343 commits_in_diff = RunGit(
1344 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1345 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1346 remote_branch = remote_branch.strip()
1347 if code != 0:
1348 _, remote_branch = self.GetRemoteBranch()
1349
1350 commits_in_remote = RunGit(
1351 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1352
1353 common_commits = set(commits_in_diff) & set(commits_in_remote)
1354 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001355 print('ERROR: Your diff contains %d commits already in %s.\n'
1356 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1357 'the diff. If you are using a custom git flow, you can override'
1358 ' the reference used for this check with "git config '
1359 'gitcl.remotebranch <git-ref>".' % (
1360 len(common_commits), remote_branch, upstream_git_obj),
1361 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001362 return False
1363 return True
1364
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001365 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001366 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001367
1368 Returns None if it is not set.
1369 """
tandrii5d48c322016-08-18 16:19:37 -07001370 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001371
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001372 def GetRemoteUrl(self):
1373 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1374
1375 Returns None if there is no remote.
1376 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001377 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001378 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1379
1380 # If URL is pointing to a local directory, it is probably a git cache.
1381 if os.path.isdir(url):
1382 url = RunGit(['config', 'remote.%s.url' % remote],
1383 error_ok=True,
1384 cwd=url).strip()
1385 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001386
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001387 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001388 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001389 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001390 self.issue = self._GitGetBranchConfigValue(
1391 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001392 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393 return self.issue
1394
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001395 def GetIssueURL(self):
1396 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001397 issue = self.GetIssue()
1398 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001399 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001400 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001401
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001402 def GetDescription(self, pretty=False, force=False):
1403 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001405 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 self.has_description = True
1407 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001408 # Set width to 72 columns + 2 space indent.
1409 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001410 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001411 lines = self.description.splitlines()
1412 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001413 return self.description
1414
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001415 def GetDescriptionFooters(self):
1416 """Returns (non_footer_lines, footers) for the commit message.
1417
1418 Returns:
1419 non_footer_lines (list(str)) - Simple list of description lines without
1420 any footer. The lines do not contain newlines, nor does the list contain
1421 the empty line between the message and the footers.
1422 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1423 [("Change-Id", "Ideadbeef...."), ...]
1424 """
1425 raw_description = self.GetDescription()
1426 msg_lines, _, footers = git_footers.split_footers(raw_description)
1427 if footers:
1428 msg_lines = msg_lines[:len(msg_lines)-1]
1429 return msg_lines, footers
1430
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001431 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001432 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001433 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001434 self.patchset = self._GitGetBranchConfigValue(
1435 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001436 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001437 return self.patchset
1438
1439 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001440 """Set this branch's patchset. If patchset=0, clears the patchset."""
1441 assert self.GetBranch()
1442 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001443 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001444 else:
1445 self.patchset = int(patchset)
1446 self._GitSetBranchConfigValue(
1447 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001449 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001450 """Set this branch's issue. If issue isn't given, clears the issue."""
1451 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001452 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001453 issue = int(issue)
1454 self._GitSetBranchConfigValue(
1455 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001456 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001457 codereview_server = self._codereview_impl.GetCodereviewServer()
1458 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001459 self._GitSetBranchConfigValue(
1460 self._codereview_impl.CodereviewServerConfigKey(),
1461 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001462 else:
tandrii5d48c322016-08-18 16:19:37 -07001463 # Reset all of these just to be clean.
1464 reset_suffixes = [
1465 'last-upload-hash',
1466 self._codereview_impl.IssueConfigKey(),
1467 self._codereview_impl.PatchsetConfigKey(),
1468 self._codereview_impl.CodereviewServerConfigKey(),
1469 ] + self._PostUnsetIssueProperties()
1470 for prop in reset_suffixes:
1471 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001472 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001473 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001474
dnjba1b0f32016-09-02 12:37:42 -07001475 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001476 if not self.GitSanityChecks(upstream_branch):
1477 DieWithError('\nGit sanity check failure')
1478
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001479 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001480 if not root:
1481 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001482 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001483
1484 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001485 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001486 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001487 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001488 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001489 except subprocess2.CalledProcessError:
1490 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001491 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001492 'This branch probably doesn\'t exist anymore. To reset the\n'
1493 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001494 ' git branch --set-upstream-to origin/master %s\n'
1495 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001496 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001497
maruel@chromium.org52424302012-08-29 15:14:30 +00001498 issue = self.GetIssue()
1499 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001500 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001501 description = self.GetDescription()
1502 else:
1503 # If the change was never uploaded, use the log messages of all commits
1504 # up to the branch point, as git cl upload will prefill the description
1505 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001506 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1507 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001508
1509 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001510 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001511 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001512 name,
1513 description,
1514 absroot,
1515 files,
1516 issue,
1517 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001518 author,
1519 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001520
dsansomee2d6fd92016-09-08 00:10:47 -07001521 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001522 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001523 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001524 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001525
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001526 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1527 """Sets the description for this CL remotely.
1528
1529 You can get description_lines and footers with GetDescriptionFooters.
1530
1531 Args:
1532 description_lines (list(str)) - List of CL description lines without
1533 newline characters.
1534 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1535 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1536 `List-Of-Tokens`). It will be case-normalized so that each token is
1537 title-cased.
1538 """
1539 new_description = '\n'.join(description_lines)
1540 if footers:
1541 new_description += '\n'
1542 for k, v in footers:
1543 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1544 if not git_footers.FOOTER_PATTERN.match(foot):
1545 raise ValueError('Invalid footer %r' % foot)
1546 new_description += foot + '\n'
1547 self.UpdateDescription(new_description, force)
1548
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001549 def RunHook(self, committing, may_prompt, verbose, change):
1550 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1551 try:
1552 return presubmit_support.DoPresubmitChecks(change, committing,
1553 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1554 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001555 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1556 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001557 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001558 DieWithError(
1559 ('%s\nMaybe your depot_tools is out of date?\n'
1560 'If all fails, contact maruel@') % e)
1561
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001562 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1563 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001564 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1565 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001566 else:
1567 # Assume url.
1568 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1569 urlparse.urlparse(issue_arg))
1570 if not parsed_issue_arg or not parsed_issue_arg.valid:
1571 DieWithError('Failed to parse issue argument "%s". '
1572 'Must be an issue number or a valid URL.' % issue_arg)
1573 return self._codereview_impl.CMDPatchWithParsedIssue(
1574 parsed_issue_arg, reject, nocommit, directory)
1575
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001576 def CMDUpload(self, options, git_diff_args, orig_args):
1577 """Uploads a change to codereview."""
1578 if git_diff_args:
1579 # TODO(ukai): is it ok for gerrit case?
1580 base_branch = git_diff_args[0]
1581 else:
1582 if self.GetBranch() is None:
1583 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1584
1585 # Default to diffing against common ancestor of upstream branch
1586 base_branch = self.GetCommonAncestorWithUpstream()
1587 git_diff_args = [base_branch, 'HEAD']
1588
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001589 # Fast best-effort checks to abort before running potentially
1590 # expensive hooks if uploading is likely to fail anyway. Passing these
1591 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001592 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001593 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001594
1595 # Apply watchlists on upload.
1596 change = self.GetChange(base_branch, None)
1597 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1598 files = [f.LocalPath() for f in change.AffectedFiles()]
1599 if not options.bypass_watchlists:
1600 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1601
1602 if not options.bypass_hooks:
1603 if options.reviewers or options.tbr_owners:
1604 # Set the reviewer list now so that presubmit checks can access it.
1605 change_description = ChangeDescription(change.FullDescriptionText())
1606 change_description.update_reviewers(options.reviewers,
1607 options.tbr_owners,
1608 change)
1609 change.SetDescriptionText(change_description.description)
1610 hook_results = self.RunHook(committing=False,
1611 may_prompt=not options.force,
1612 verbose=options.verbose,
1613 change=change)
1614 if not hook_results.should_continue():
1615 return 1
1616 if not options.reviewers and hook_results.reviewers:
1617 options.reviewers = hook_results.reviewers.split(',')
1618
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001619 # TODO(tandrii): Checking local patchset against remote patchset is only
1620 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1621 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 latest_patchset = self.GetMostRecentPatchset()
1623 local_patchset = self.GetPatchset()
1624 if (latest_patchset and local_patchset and
1625 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001626 print('The last upload made from this repository was patchset #%d but '
1627 'the most recent patchset on the server is #%d.'
1628 % (local_patchset, latest_patchset))
1629 print('Uploading will still work, but if you\'ve uploaded to this '
1630 'issue from another machine or branch the patch you\'re '
1631 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001632 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001633
1634 print_stats(options.similarity, options.find_copies, git_diff_args)
1635 ret = self.CMDUploadChange(options, git_diff_args, change)
1636 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001637 if options.use_commit_queue:
1638 self.SetCQState(_CQState.COMMIT)
1639 elif options.cq_dry_run:
1640 self.SetCQState(_CQState.DRY_RUN)
1641
tandrii5d48c322016-08-18 16:19:37 -07001642 _git_set_branch_config_value('last-upload-hash',
1643 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001644 # Run post upload hooks, if specified.
1645 if settings.GetRunPostUploadHook():
1646 presubmit_support.DoPostUploadExecuter(
1647 change,
1648 self,
1649 settings.GetRoot(),
1650 options.verbose,
1651 sys.stdout)
1652
1653 # Upload all dependencies if specified.
1654 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001655 print()
1656 print('--dependencies has been specified.')
1657 print('All dependent local branches will be re-uploaded.')
1658 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001659 # Remove the dependencies flag from args so that we do not end up in a
1660 # loop.
1661 orig_args.remove('--dependencies')
1662 ret = upload_branch_deps(self, orig_args)
1663 return ret
1664
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001665 def SetCQState(self, new_state):
1666 """Update the CQ state for latest patchset.
1667
1668 Issue must have been already uploaded and known.
1669 """
1670 assert new_state in _CQState.ALL_STATES
1671 assert self.GetIssue()
1672 return self._codereview_impl.SetCQState(new_state)
1673
qyearsley1fdfcb62016-10-24 13:22:03 -07001674 def TriggerDryRun(self):
1675 """Triggers a dry run and prints a warning on failure."""
1676 # TODO(qyearsley): Either re-use this method in CMDset_commit
1677 # and CMDupload, or change CMDtry to trigger dry runs with
1678 # just SetCQState, and catch keyboard interrupt and other
1679 # errors in that method.
1680 try:
1681 self.SetCQState(_CQState.DRY_RUN)
1682 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1683 return 0
1684 except KeyboardInterrupt:
1685 raise
1686 except:
1687 print('WARNING: failed to trigger CQ Dry Run.\n'
1688 'Either:\n'
1689 ' * your project has no CQ\n'
1690 ' * you don\'t have permission to trigger Dry Run\n'
1691 ' * bug in this code (see stack trace below).\n'
1692 'Consider specifying which bots to trigger manually '
1693 'or asking your project owners for permissions '
1694 'or contacting Chrome Infrastructure team at '
1695 'https://www.chromium.org/infra\n\n')
1696 # Still raise exception so that stack trace is printed.
1697 raise
1698
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001699 # Forward methods to codereview specific implementation.
1700
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001701 def AddComment(self, message):
1702 return self._codereview_impl.AddComment(message)
1703
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001704 def GetCommentsSummary(self):
1705 """Returns list of _CommentSummary for each comment.
1706
1707 Note: comments per file or per line are not included,
1708 only top-level comments are returned.
1709 """
1710 return self._codereview_impl.GetCommentsSummary()
1711
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001712 def CloseIssue(self):
1713 return self._codereview_impl.CloseIssue()
1714
1715 def GetStatus(self):
1716 return self._codereview_impl.GetStatus()
1717
1718 def GetCodereviewServer(self):
1719 return self._codereview_impl.GetCodereviewServer()
1720
tandriide281ae2016-10-12 06:02:30 -07001721 def GetIssueOwner(self):
1722 """Get owner from codereview, which may differ from this checkout."""
1723 return self._codereview_impl.GetIssueOwner()
1724
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001725 def GetApprovingReviewers(self):
1726 return self._codereview_impl.GetApprovingReviewers()
1727
1728 def GetMostRecentPatchset(self):
1729 return self._codereview_impl.GetMostRecentPatchset()
1730
tandriide281ae2016-10-12 06:02:30 -07001731 def CannotTriggerTryJobReason(self):
1732 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1733 return self._codereview_impl.CannotTriggerTryJobReason()
1734
tandrii8c5a3532016-11-04 07:52:02 -07001735 def GetTryjobProperties(self, patchset=None):
1736 """Returns dictionary of properties to launch tryjob."""
1737 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1738
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001739 def __getattr__(self, attr):
1740 # This is because lots of untested code accesses Rietveld-specific stuff
1741 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001742 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001743 # Note that child method defines __getattr__ as well, and forwards it here,
1744 # because _RietveldChangelistImpl is not cleaned up yet, and given
1745 # deprecation of Rietveld, it should probably be just removed.
1746 # Until that time, avoid infinite recursion by bypassing __getattr__
1747 # of implementation class.
1748 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001749
1750
1751class _ChangelistCodereviewBase(object):
1752 """Abstract base class encapsulating codereview specifics of a changelist."""
1753 def __init__(self, changelist):
1754 self._changelist = changelist # instance of Changelist
1755
1756 def __getattr__(self, attr):
1757 # Forward methods to changelist.
1758 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1759 # _RietveldChangelistImpl to avoid this hack?
1760 return getattr(self._changelist, attr)
1761
1762 def GetStatus(self):
1763 """Apply a rough heuristic to give a simple summary of an issue's review
1764 or CQ status, assuming adherence to a common workflow.
1765
1766 Returns None if no issue for this branch, or specific string keywords.
1767 """
1768 raise NotImplementedError()
1769
1770 def GetCodereviewServer(self):
1771 """Returns server URL without end slash, like "https://codereview.com"."""
1772 raise NotImplementedError()
1773
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001774 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001775 """Fetches and returns description from the codereview server."""
1776 raise NotImplementedError()
1777
tandrii5d48c322016-08-18 16:19:37 -07001778 @classmethod
1779 def IssueConfigKey(cls):
1780 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001781 raise NotImplementedError()
1782
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001783 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001784 def PatchsetConfigKey(cls):
1785 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001786 raise NotImplementedError()
1787
tandrii5d48c322016-08-18 16:19:37 -07001788 @classmethod
1789 def CodereviewServerConfigKey(cls):
1790 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791 raise NotImplementedError()
1792
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001793 def _PostUnsetIssueProperties(self):
1794 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001795 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001796
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797 def GetRieveldObjForPresubmit(self):
1798 # This is an unfortunate Rietveld-embeddedness in presubmit.
1799 # For non-Rietveld codereviews, this probably should return a dummy object.
1800 raise NotImplementedError()
1801
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001802 def GetGerritObjForPresubmit(self):
1803 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1804 return None
1805
dsansomee2d6fd92016-09-08 00:10:47 -07001806 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 """Update the description on codereview site."""
1808 raise NotImplementedError()
1809
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001810 def AddComment(self, message):
1811 """Posts a comment to the codereview site."""
1812 raise NotImplementedError()
1813
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001814 def GetCommentsSummary(self):
1815 raise NotImplementedError()
1816
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001817 def CloseIssue(self):
1818 """Closes the issue."""
1819 raise NotImplementedError()
1820
1821 def GetApprovingReviewers(self):
1822 """Returns a list of reviewers approving the change.
1823
1824 Note: not necessarily committers.
1825 """
1826 raise NotImplementedError()
1827
1828 def GetMostRecentPatchset(self):
1829 """Returns the most recent patchset number from the codereview site."""
1830 raise NotImplementedError()
1831
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001832 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1833 directory):
1834 """Fetches and applies the issue.
1835
1836 Arguments:
1837 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1838 reject: if True, reject the failed patch instead of switching to 3-way
1839 merge. Rietveld only.
1840 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1841 only.
1842 directory: switch to directory before applying the patch. Rietveld only.
1843 """
1844 raise NotImplementedError()
1845
1846 @staticmethod
1847 def ParseIssueURL(parsed_url):
1848 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1849 failed."""
1850 raise NotImplementedError()
1851
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001852 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001853 """Best effort check that user is authenticated with codereview server.
1854
1855 Arguments:
1856 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001857 refresh: whether to attempt to refresh credentials. Ignored if not
1858 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001859 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001860 raise NotImplementedError()
1861
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001862 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001863 """Best effort check that uploading isn't supposed to fail for predictable
1864 reasons.
1865
1866 This method should raise informative exception if uploading shouldn't
1867 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001868
1869 Arguments:
1870 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001871 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001872 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001873
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001874 def CMDUploadChange(self, options, args, change):
1875 """Uploads a change to codereview."""
1876 raise NotImplementedError()
1877
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001878 def SetCQState(self, new_state):
1879 """Update the CQ state for latest patchset.
1880
1881 Issue must have been already uploaded and known.
1882 """
1883 raise NotImplementedError()
1884
tandriie113dfd2016-10-11 10:20:12 -07001885 def CannotTriggerTryJobReason(self):
1886 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1887 raise NotImplementedError()
1888
tandriide281ae2016-10-12 06:02:30 -07001889 def GetIssueOwner(self):
1890 raise NotImplementedError()
1891
tandrii8c5a3532016-11-04 07:52:02 -07001892 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001893 raise NotImplementedError()
1894
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001895
1896class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001897 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001898 super(_RietveldChangelistImpl, self).__init__(changelist)
1899 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001900 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001901 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001902
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001903 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001904 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905 self._props = None
1906 self._rpc_server = None
1907
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001908 def GetCodereviewServer(self):
1909 if not self._rietveld_server:
1910 # If we're on a branch then get the server potentially associated
1911 # with that branch.
1912 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001913 self._rietveld_server = gclient_utils.UpgradeToHttps(
1914 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915 if not self._rietveld_server:
1916 self._rietveld_server = settings.GetDefaultServerUrl()
1917 return self._rietveld_server
1918
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001919 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001920 """Best effort check that user is authenticated with Rietveld server."""
1921 if self._auth_config.use_oauth2:
1922 authenticator = auth.get_authenticator_for_host(
1923 self.GetCodereviewServer(), self._auth_config)
1924 if not authenticator.has_cached_credentials():
1925 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001926 if refresh:
1927 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001928
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001929 def EnsureCanUploadPatchset(self, force):
1930 # No checks for Rietveld because we are deprecating Rietveld.
1931 pass
1932
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001933 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001934 issue = self.GetIssue()
1935 assert issue
1936 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001937 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001938 except urllib2.HTTPError as e:
1939 if e.code == 404:
1940 DieWithError(
1941 ('\nWhile fetching the description for issue %d, received a '
1942 '404 (not found)\n'
1943 'error. It is likely that you deleted this '
1944 'issue on the server. If this is the\n'
1945 'case, please run\n\n'
1946 ' git cl issue 0\n\n'
1947 'to clear the association with the deleted issue. Then run '
1948 'this command again.') % issue)
1949 else:
1950 DieWithError(
1951 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1952 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001953 print('Warning: Failed to retrieve CL description due to network '
1954 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001955 return ''
1956
1957 def GetMostRecentPatchset(self):
1958 return self.GetIssueProperties()['patchsets'][-1]
1959
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001960 def GetIssueProperties(self):
1961 if self._props is None:
1962 issue = self.GetIssue()
1963 if not issue:
1964 self._props = {}
1965 else:
1966 self._props = self.RpcServer().get_issue_properties(issue, True)
1967 return self._props
1968
tandriie113dfd2016-10-11 10:20:12 -07001969 def CannotTriggerTryJobReason(self):
1970 props = self.GetIssueProperties()
1971 if not props:
1972 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1973 if props.get('closed'):
1974 return 'CL %s is closed' % self.GetIssue()
1975 if props.get('private'):
1976 return 'CL %s is private' % self.GetIssue()
1977 return None
1978
tandrii8c5a3532016-11-04 07:52:02 -07001979 def GetTryjobProperties(self, patchset=None):
1980 """Returns dictionary of properties to launch tryjob."""
1981 project = (self.GetIssueProperties() or {}).get('project')
1982 return {
1983 'issue': self.GetIssue(),
1984 'patch_project': project,
1985 'patch_storage': 'rietveld',
1986 'patchset': patchset or self.GetPatchset(),
1987 'rietveld': self.GetCodereviewServer(),
1988 }
1989
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001990 def GetApprovingReviewers(self):
1991 return get_approving_reviewers(self.GetIssueProperties())
1992
tandriide281ae2016-10-12 06:02:30 -07001993 def GetIssueOwner(self):
1994 return (self.GetIssueProperties() or {}).get('owner_email')
1995
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001996 def AddComment(self, message):
1997 return self.RpcServer().add_comment(self.GetIssue(), message)
1998
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001999 def GetCommentsSummary(self):
2000 summary = []
2001 for message in self.GetIssueProperties().get('messages', []):
2002 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2003 summary.append(_CommentSummary(
2004 date=date,
2005 disapproval=bool(message['disapproval']),
2006 approval=bool(message['approval']),
2007 sender=message['sender'],
2008 message=message['text'],
2009 ))
2010 return summary
2011
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002012 def GetStatus(self):
2013 """Apply a rough heuristic to give a simple summary of an issue's review
2014 or CQ status, assuming adherence to a common workflow.
2015
2016 Returns None if no issue for this branch, or one of the following keywords:
2017 * 'error' - error from review tool (including deleted issues)
2018 * 'unsent' - not sent for review
2019 * 'waiting' - waiting for review
2020 * 'reply' - waiting for owner to reply to review
2021 * 'lgtm' - LGTM from at least one approved reviewer
2022 * 'commit' - in the commit queue
2023 * 'closed' - closed
2024 """
2025 if not self.GetIssue():
2026 return None
2027
2028 try:
2029 props = self.GetIssueProperties()
2030 except urllib2.HTTPError:
2031 return 'error'
2032
2033 if props.get('closed'):
2034 # Issue is closed.
2035 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002036 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002037 # Issue is in the commit queue.
2038 return 'commit'
2039
2040 try:
2041 reviewers = self.GetApprovingReviewers()
2042 except urllib2.HTTPError:
2043 return 'error'
2044
2045 if reviewers:
2046 # Was LGTM'ed.
2047 return 'lgtm'
2048
2049 messages = props.get('messages') or []
2050
tandrii9d2c7a32016-06-22 03:42:45 -07002051 # Skip CQ messages that don't require owner's action.
2052 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2053 if 'Dry run:' in messages[-1]['text']:
2054 messages.pop()
2055 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2056 # This message always follows prior messages from CQ,
2057 # so skip this too.
2058 messages.pop()
2059 else:
2060 # This is probably a CQ messages warranting user attention.
2061 break
2062
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002063 if not messages:
2064 # No message was sent.
2065 return 'unsent'
2066 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002067 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002068 return 'reply'
2069 return 'waiting'
2070
dsansomee2d6fd92016-09-08 00:10:47 -07002071 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002072 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002073
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002074 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002075 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002076
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002077 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002078 return self.SetFlags({flag: value})
2079
2080 def SetFlags(self, flags):
2081 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002082 """
phajdan.jr68598232016-08-10 03:28:28 -07002083 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002084 try:
tandrii4b233bd2016-07-06 03:50:29 -07002085 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002086 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002087 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002088 if e.code == 404:
2089 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2090 if e.code == 403:
2091 DieWithError(
2092 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002093 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002094 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002095
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002096 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002097 """Returns an upload.RpcServer() to access this review's rietveld instance.
2098 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002099 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002100 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002101 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002102 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002103 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002104
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002105 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002106 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002107 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002108
tandrii5d48c322016-08-18 16:19:37 -07002109 @classmethod
2110 def PatchsetConfigKey(cls):
2111 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002112
tandrii5d48c322016-08-18 16:19:37 -07002113 @classmethod
2114 def CodereviewServerConfigKey(cls):
2115 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002116
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002117 def GetRieveldObjForPresubmit(self):
2118 return self.RpcServer()
2119
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002120 def SetCQState(self, new_state):
2121 props = self.GetIssueProperties()
2122 if props.get('private'):
2123 DieWithError('Cannot set-commit on private issue')
2124
2125 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002126 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002127 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002128 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002129 else:
tandrii4b233bd2016-07-06 03:50:29 -07002130 assert new_state == _CQState.DRY_RUN
2131 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002132
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2134 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002135 # PatchIssue should never be called with a dirty tree. It is up to the
2136 # caller to check this, but just in case we assert here since the
2137 # consequences of the caller not checking this could be dire.
2138 assert(not git_common.is_dirty_git_tree('apply'))
2139 assert(parsed_issue_arg.valid)
2140 self._changelist.issue = parsed_issue_arg.issue
2141 if parsed_issue_arg.hostname:
2142 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2143
skobes6468b902016-10-24 08:45:10 -07002144 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2145 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2146 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147 try:
skobes6468b902016-10-24 08:45:10 -07002148 scm_obj.apply_patch(patchset_object)
2149 except Exception as e:
2150 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002151 return 1
2152
2153 # If we had an issue, commit the current state and register the issue.
2154 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002155 self.SetIssue(self.GetIssue())
2156 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002157 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2158 'patch from issue %(i)s at patchset '
2159 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2160 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002161 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002163 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 return 0
2165
2166 @staticmethod
2167 def ParseIssueURL(parsed_url):
2168 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2169 return None
wychen3c1c1722016-08-04 11:46:36 -07002170 # Rietveld patch: https://domain/<number>/#ps<patchset>
2171 match = re.match(r'/(\d+)/$', parsed_url.path)
2172 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2173 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002174 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002175 issue=int(match.group(1)),
2176 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002177 hostname=parsed_url.netloc,
2178 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002179 # Typical url: https://domain/<issue_number>[/[other]]
2180 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2181 if match:
skobes6468b902016-10-24 08:45:10 -07002182 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002183 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002184 hostname=parsed_url.netloc,
2185 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2187 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2188 if match:
skobes6468b902016-10-24 08:45:10 -07002189 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 issue=int(match.group(1)),
2191 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002192 hostname=parsed_url.netloc,
2193 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 return None
2195
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002196 def CMDUploadChange(self, options, args, change):
2197 """Upload the patch to Rietveld."""
2198 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2199 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002200 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2201 if options.emulate_svn_auto_props:
2202 upload_args.append('--emulate_svn_auto_props')
2203
2204 change_desc = None
2205
2206 if options.email is not None:
2207 upload_args.extend(['--email', options.email])
2208
2209 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002210 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002211 upload_args.extend(['--title', options.title])
2212 if options.message:
2213 upload_args.extend(['--message', options.message])
2214 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002215 print('This branch is associated with issue %s. '
2216 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002217 else:
nodirca166002016-06-27 10:59:51 -07002218 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002219 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002220 if options.message:
2221 message = options.message
2222 else:
2223 message = CreateDescriptionFromLog(args)
2224 if options.title:
2225 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002226 change_desc = ChangeDescription(message)
2227 if options.reviewers or options.tbr_owners:
2228 change_desc.update_reviewers(options.reviewers,
2229 options.tbr_owners,
2230 change)
2231 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002232 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002233
2234 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002235 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002236 return 1
2237
2238 upload_args.extend(['--message', change_desc.description])
2239 if change_desc.get_reviewers():
2240 upload_args.append('--reviewers=%s' % ','.join(
2241 change_desc.get_reviewers()))
2242 if options.send_mail:
2243 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002244 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002245 upload_args.append('--send_mail')
2246
2247 # We check this before applying rietveld.private assuming that in
2248 # rietveld.cc only addresses which we can send private CLs to are listed
2249 # if rietveld.private is set, and so we should ignore rietveld.cc only
2250 # when --private is specified explicitly on the command line.
2251 if options.private:
2252 logging.warn('rietveld.cc is ignored since private flag is specified. '
2253 'You need to review and add them manually if necessary.')
2254 cc = self.GetCCListWithoutDefault()
2255 else:
2256 cc = self.GetCCList()
2257 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002258 if change_desc.get_cced():
2259 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002260 if cc:
2261 upload_args.extend(['--cc', cc])
2262
2263 if options.private or settings.GetDefaultPrivateFlag() == "True":
2264 upload_args.append('--private')
2265
2266 upload_args.extend(['--git_similarity', str(options.similarity)])
2267 if not options.find_copies:
2268 upload_args.extend(['--git_no_find_copies'])
2269
2270 # Include the upstream repo's URL in the change -- this is useful for
2271 # projects that have their source spread across multiple repos.
2272 remote_url = self.GetGitBaseUrlFromConfig()
2273 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002274 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2275 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2276 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002277 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002279 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002280 if target_ref:
2281 upload_args.extend(['--target_ref', target_ref])
2282
2283 # Look for dependent patchsets. See crbug.com/480453 for more details.
2284 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2285 upstream_branch = ShortBranchName(upstream_branch)
2286 if remote is '.':
2287 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002288 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002290 print()
2291 print('Skipping dependency patchset upload because git config '
2292 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2293 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002294 else:
2295 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002296 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002297 auth_config=auth_config)
2298 branch_cl_issue_url = branch_cl.GetIssueURL()
2299 branch_cl_issue = branch_cl.GetIssue()
2300 branch_cl_patchset = branch_cl.GetPatchset()
2301 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2302 upload_args.extend(
2303 ['--depends_on_patchset', '%s:%s' % (
2304 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002305 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002306 '\n'
2307 'The current branch (%s) is tracking a local branch (%s) with '
2308 'an associated CL.\n'
2309 'Adding %s/#ps%s as a dependency patchset.\n'
2310 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2311 branch_cl_patchset))
2312
2313 project = settings.GetProject()
2314 if project:
2315 upload_args.extend(['--project', project])
2316
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002317 try:
2318 upload_args = ['upload'] + upload_args + args
2319 logging.info('upload.RealMain(%s)', upload_args)
2320 issue, patchset = upload.RealMain(upload_args)
2321 issue = int(issue)
2322 patchset = int(patchset)
2323 except KeyboardInterrupt:
2324 sys.exit(1)
2325 except:
2326 # If we got an exception after the user typed a description for their
2327 # change, back up the description before re-raising.
2328 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002329 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002330 raise
2331
2332 if not self.GetIssue():
2333 self.SetIssue(issue)
2334 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002335 return 0
2336
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002337
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002338class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002339 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002340 # auth_config is Rietveld thing, kept here to preserve interface only.
2341 super(_GerritChangelistImpl, self).__init__(changelist)
2342 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002343 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002344 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002345 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002346 # Map from change number (issue) to its detail cache.
2347 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002348
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002349 if codereview_host is not None:
2350 assert not codereview_host.startswith('https://'), codereview_host
2351 self._gerrit_host = codereview_host
2352 self._gerrit_server = 'https://%s' % codereview_host
2353
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002354 def _GetGerritHost(self):
2355 # Lazy load of configs.
2356 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002357 if self._gerrit_host and '.' not in self._gerrit_host:
2358 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2359 # This happens for internal stuff http://crbug.com/614312.
2360 parsed = urlparse.urlparse(self.GetRemoteUrl())
2361 if parsed.scheme == 'sso':
2362 print('WARNING: using non https URLs for remote is likely broken\n'
2363 ' Your current remote is: %s' % self.GetRemoteUrl())
2364 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2365 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002366 return self._gerrit_host
2367
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002368 def _GetGitHost(self):
2369 """Returns git host to be used when uploading change to Gerrit."""
2370 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2371
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002372 def GetCodereviewServer(self):
2373 if not self._gerrit_server:
2374 # If we're on a branch then get the server potentially associated
2375 # with that branch.
2376 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002377 self._gerrit_server = self._GitGetBranchConfigValue(
2378 self.CodereviewServerConfigKey())
2379 if self._gerrit_server:
2380 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002381 if not self._gerrit_server:
2382 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2383 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002384 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002385 parts[0] = parts[0] + '-review'
2386 self._gerrit_host = '.'.join(parts)
2387 self._gerrit_server = 'https://%s' % self._gerrit_host
2388 return self._gerrit_server
2389
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002390 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002391 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002392 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002393
tandrii5d48c322016-08-18 16:19:37 -07002394 @classmethod
2395 def PatchsetConfigKey(cls):
2396 return 'gerritpatchset'
2397
2398 @classmethod
2399 def CodereviewServerConfigKey(cls):
2400 return 'gerritserver'
2401
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002402 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002403 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002404 if settings.GetGerritSkipEnsureAuthenticated():
2405 # For projects with unusual authentication schemes.
2406 # See http://crbug.com/603378.
2407 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002408 # Lazy-loader to identify Gerrit and Git hosts.
2409 if gerrit_util.GceAuthenticator.is_gce():
2410 return
2411 self.GetCodereviewServer()
2412 git_host = self._GetGitHost()
2413 assert self._gerrit_server and self._gerrit_host
2414 cookie_auth = gerrit_util.CookiesAuthenticator()
2415
2416 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2417 git_auth = cookie_auth.get_auth_header(git_host)
2418 if gerrit_auth and git_auth:
2419 if gerrit_auth == git_auth:
2420 return
2421 print((
2422 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2423 ' Check your %s or %s file for credentials of hosts:\n'
2424 ' %s\n'
2425 ' %s\n'
2426 ' %s') %
2427 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2428 git_host, self._gerrit_host,
2429 cookie_auth.get_new_password_message(git_host)))
2430 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002431 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002432 return
2433 else:
2434 missing = (
2435 [] if gerrit_auth else [self._gerrit_host] +
2436 [] if git_auth else [git_host])
2437 DieWithError('Credentials for the following hosts are required:\n'
2438 ' %s\n'
2439 'These are read from %s (or legacy %s)\n'
2440 '%s' % (
2441 '\n '.join(missing),
2442 cookie_auth.get_gitcookies_path(),
2443 cookie_auth.get_netrc_path(),
2444 cookie_auth.get_new_password_message(git_host)))
2445
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002446 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002447 if not self.GetIssue():
2448 return
2449
2450 # Warm change details cache now to avoid RPCs later, reducing latency for
2451 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002452 self._GetChangeDetail(
2453 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002454
2455 status = self._GetChangeDetail()['status']
2456 if status in ('MERGED', 'ABANDONED'):
2457 DieWithError('Change %s has been %s, new uploads are not allowed' %
2458 (self.GetIssueURL(),
2459 'submitted' if status == 'MERGED' else 'abandoned'))
2460
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002461 if gerrit_util.GceAuthenticator.is_gce():
2462 return
2463 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2464 self._GetGerritHost())
2465 if self.GetIssueOwner() == cookies_user:
2466 return
2467 logging.debug('change %s owner is %s, cookies user is %s',
2468 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2469 # Maybe user has linked accounts or smth like that,
2470 # so ask what Gerrit thinks of this user.
2471 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2472 if details['email'] == self.GetIssueOwner():
2473 return
2474 if not force:
2475 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2476 'as %s.\n'
2477 'Uploading may fail due to lack of permissions.' %
2478 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2479 confirm_or_exit(action='upload')
2480
2481
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002482 def _PostUnsetIssueProperties(self):
2483 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002484 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002485
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002486 def GetRieveldObjForPresubmit(self):
2487 class ThisIsNotRietveldIssue(object):
2488 def __nonzero__(self):
2489 # This is a hack to make presubmit_support think that rietveld is not
2490 # defined, yet still ensure that calls directly result in a decent
2491 # exception message below.
2492 return False
2493
2494 def __getattr__(self, attr):
2495 print(
2496 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2497 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2498 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2499 'or use Rietveld for codereview.\n'
2500 'See also http://crbug.com/579160.' % attr)
2501 raise NotImplementedError()
2502 return ThisIsNotRietveldIssue()
2503
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002504 def GetGerritObjForPresubmit(self):
2505 return presubmit_support.GerritAccessor(self._GetGerritHost())
2506
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002507 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002508 """Apply a rough heuristic to give a simple summary of an issue's review
2509 or CQ status, assuming adherence to a common workflow.
2510
2511 Returns None if no issue for this branch, or one of the following keywords:
2512 * 'error' - error from review tool (including deleted issues)
2513 * 'unsent' - no reviewers added
2514 * 'waiting' - waiting for review
2515 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002516 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002517 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002518 * 'commit' - in the commit queue
2519 * 'closed' - abandoned
2520 """
2521 if not self.GetIssue():
2522 return None
2523
2524 try:
2525 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002526 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002527 return 'error'
2528
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002529 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002530 return 'closed'
2531
2532 cq_label = data['labels'].get('Commit-Queue', {})
2533 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002534 votes = cq_label.get('all', [])
2535 highest_vote = 0
2536 for v in votes:
2537 highest_vote = max(highest_vote, v.get('value', 0))
2538 vote_value = str(highest_vote)
2539 if vote_value != '0':
2540 # Add a '+' if the value is not 0 to match the values in the label.
2541 # The cq_label does not have negatives.
2542 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002543 vote_text = cq_label.get('values', {}).get(vote_value, '')
2544 if vote_text.lower() == 'commit':
2545 return 'commit'
2546
2547 lgtm_label = data['labels'].get('Code-Review', {})
2548 if lgtm_label:
2549 if 'rejected' in lgtm_label:
2550 return 'not lgtm'
2551 if 'approved' in lgtm_label:
2552 return 'lgtm'
2553
2554 if not data.get('reviewers', {}).get('REVIEWER', []):
2555 return 'unsent'
2556
2557 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002558 owner = data['owner'].get('_account_id')
2559 while messages:
2560 last_message_author = messages.pop().get('author', {})
2561 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2562 # Ignore replies from CQ.
2563 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002564 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002565 # Some reply from non-owner.
2566 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002567 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002568
2569 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002570 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002571 return data['revisions'][data['current_revision']]['_number']
2572
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002573 def FetchDescription(self, force=False):
2574 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2575 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002576 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002577 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002578
dsansomee2d6fd92016-09-08 00:10:47 -07002579 def UpdateDescriptionRemote(self, description, force=False):
2580 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2581 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002582 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002583 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002584 'unpublished edit. Either publish the edit in the Gerrit web UI '
2585 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002586
2587 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2588 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002589 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002590 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002591
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002592 def AddComment(self, message):
2593 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2594 msg=message)
2595
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002596 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002597 # DETAILED_ACCOUNTS is to get emails in accounts.
2598 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2599 summary = []
2600 for msg in data.get('messages', []):
2601 # Gerrit spits out nanoseconds.
2602 assert len(msg['date'].split('.')[-1]) == 9
2603 date = datetime.datetime.strptime(msg['date'][:-3],
2604 '%Y-%m-%d %H:%M:%S.%f')
2605 summary.append(_CommentSummary(
2606 date=date,
2607 message=msg['message'],
2608 sender=msg['author']['email'],
2609 # These could be inferred from the text messages and correlated with
2610 # Code-Review label maximum, however this is not reliable.
2611 # Leaving as is until the need arises.
2612 approval=False,
2613 disapproval=False,
2614 ))
2615 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002616
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002617 def CloseIssue(self):
2618 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2619
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002620 def GetApprovingReviewers(self):
2621 """Returns a list of reviewers approving the change.
2622
2623 Note: not necessarily committers.
2624 """
2625 raise NotImplementedError()
2626
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002627 def SubmitIssue(self, wait_for_merge=True):
2628 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2629 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002630
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002631 def _GetChangeDetail(self, options=None, issue=None,
2632 no_cache=False):
2633 """Returns details of the issue by querying Gerrit and caching results.
2634
2635 If fresh data is needed, set no_cache=True which will clear cache and
2636 thus new data will be fetched from Gerrit.
2637 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002638 options = options or []
2639 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002640 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002641
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002642 # Optimization to avoid multiple RPCs:
2643 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2644 'CURRENT_COMMIT' not in options):
2645 options.append('CURRENT_COMMIT')
2646
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002647 # Normalize issue and options for consistent keys in cache.
2648 issue = str(issue)
2649 options = [o.upper() for o in options]
2650
2651 # Check in cache first unless no_cache is True.
2652 if no_cache:
2653 self._detail_cache.pop(issue, None)
2654 else:
2655 options_set = frozenset(options)
2656 for cached_options_set, data in self._detail_cache.get(issue, []):
2657 # Assumption: data fetched before with extra options is suitable
2658 # for return for a smaller set of options.
2659 # For example, if we cached data for
2660 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2661 # and request is for options=[CURRENT_REVISION],
2662 # THEN we can return prior cached data.
2663 if options_set.issubset(cached_options_set):
2664 return data
2665
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002666 try:
2667 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2668 options, ignore_404=False)
2669 except gerrit_util.GerritError as e:
2670 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002671 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002672 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002673
2674 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002675 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002676
agable32978d92016-11-01 12:55:02 -07002677 def _GetChangeCommit(self, issue=None):
2678 issue = issue or self.GetIssue()
2679 assert issue, 'issue is required to query Gerrit'
2680 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2681 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002682 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002683 return data
2684
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002685 def CMDLand(self, force, bypass_hooks, verbose):
2686 if git_common.is_dirty_git_tree('land'):
2687 return 1
tandriid60367b2016-06-22 05:25:12 -07002688 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2689 if u'Commit-Queue' in detail.get('labels', {}):
2690 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002691 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2692 'which can test and land changes for you. '
2693 'Are you sure you wish to bypass it?\n',
2694 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002695
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002696 differs = True
tandriic4344b52016-08-29 06:04:54 -07002697 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002698 # Note: git diff outputs nothing if there is no diff.
2699 if not last_upload or RunGit(['diff', last_upload]).strip():
2700 print('WARNING: some changes from local branch haven\'t been uploaded')
2701 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002702 if detail['current_revision'] == last_upload:
2703 differs = False
2704 else:
2705 print('WARNING: local branch contents differ from latest uploaded '
2706 'patchset')
2707 if differs:
2708 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002709 confirm_or_exit(
2710 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2711 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002712 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2713 elif not bypass_hooks:
2714 hook_results = self.RunHook(
2715 committing=True,
2716 may_prompt=not force,
2717 verbose=verbose,
2718 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2719 if not hook_results.should_continue():
2720 return 1
2721
2722 self.SubmitIssue(wait_for_merge=True)
2723 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002724 links = self._GetChangeCommit().get('web_links', [])
2725 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002726 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002727 print('Landed as %s' % link.get('url'))
2728 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002729 return 0
2730
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002731 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2732 directory):
2733 assert not reject
2734 assert not nocommit
2735 assert not directory
2736 assert parsed_issue_arg.valid
2737
2738 self._changelist.issue = parsed_issue_arg.issue
2739
2740 if parsed_issue_arg.hostname:
2741 self._gerrit_host = parsed_issue_arg.hostname
2742 self._gerrit_server = 'https://%s' % self._gerrit_host
2743
tandriic2405f52016-10-10 08:13:15 -07002744 try:
2745 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002746 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002747 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002748
2749 if not parsed_issue_arg.patchset:
2750 # Use current revision by default.
2751 revision_info = detail['revisions'][detail['current_revision']]
2752 patchset = int(revision_info['_number'])
2753 else:
2754 patchset = parsed_issue_arg.patchset
2755 for revision_info in detail['revisions'].itervalues():
2756 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2757 break
2758 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002759 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002760 (parsed_issue_arg.patchset, self.GetIssue()))
2761
2762 fetch_info = revision_info['fetch']['http']
2763 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002764 self.SetIssue(self.GetIssue())
2765 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002766 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002767 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002768 (self.GetIssue(), self.GetPatchset()))
2769 return 0
2770
2771 @staticmethod
2772 def ParseIssueURL(parsed_url):
2773 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2774 return None
2775 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2776 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2777 # Short urls like https://domain/<issue_number> can be used, but don't allow
2778 # specifying the patchset (you'd 404), but we allow that here.
2779 if parsed_url.path == '/':
2780 part = parsed_url.fragment
2781 else:
2782 part = parsed_url.path
2783 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2784 if match:
2785 return _ParsedIssueNumberArgument(
2786 issue=int(match.group(2)),
2787 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002788 hostname=parsed_url.netloc,
2789 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002790 return None
2791
tandrii16e0b4e2016-06-07 10:34:28 -07002792 def _GerritCommitMsgHookCheck(self, offer_removal):
2793 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2794 if not os.path.exists(hook):
2795 return
2796 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2797 # custom developer made one.
2798 data = gclient_utils.FileRead(hook)
2799 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2800 return
2801 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002802 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002803 'and may interfere with it in subtle ways.\n'
2804 'We recommend you remove the commit-msg hook.')
2805 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002806 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002807 gclient_utils.rm_file_or_tree(hook)
2808 print('Gerrit commit-msg hook removed.')
2809 else:
2810 print('OK, will keep Gerrit commit-msg hook in place.')
2811
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002812 def CMDUploadChange(self, options, args, change):
2813 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002814 if options.squash and options.no_squash:
2815 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002816
2817 if not options.squash and not options.no_squash:
2818 # Load default for user, repo, squash=true, in this order.
2819 options.squash = settings.GetSquashGerritUploads()
2820 elif options.no_squash:
2821 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002822
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002823 # We assume the remote called "origin" is the one we want.
2824 # It is probably not worthwhile to support different workflows.
2825 gerrit_remote = 'origin'
2826
2827 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002828 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002829
Aaron Gableb56ad332017-01-06 15:24:31 -08002830 # This may be None; default fallback value is determined in logic below.
2831 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002832 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002833
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002834 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002835 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002836 if self.GetIssue():
2837 # Try to get the message from a previous upload.
2838 message = self.GetDescription()
2839 if not message:
2840 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002841 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002842 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002843 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002844 if options.message:
2845 # For compatibility with Rietveld, if -m|--message is given on
2846 # command line, title should be the first line of that message,
2847 # which shouldn't be confused with CL description.
2848 default_title = options.message.strip().split()[0]
2849 else:
2850 default_title = RunGit(
2851 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002852 if options.force:
2853 title = default_title
2854 else:
2855 title = ask_for_data(
2856 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002857 if title == default_title:
2858 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002859 change_id = self._GetChangeDetail()['change_id']
2860 while True:
2861 footer_change_ids = git_footers.get_footer_change_id(message)
2862 if footer_change_ids == [change_id]:
2863 break
2864 if not footer_change_ids:
2865 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002866 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002867 continue
2868 # There is already a valid footer but with different or several ids.
2869 # Doing this automatically is non-trivial as we don't want to lose
2870 # existing other footers, yet we want to append just 1 desired
2871 # Change-Id. Thus, just create a new footer, but let user verify the
2872 # new description.
2873 message = '%s\n\nChange-Id: %s' % (message, change_id)
2874 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002875 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002876 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002877 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002878 'Please, check the proposed correction to the description, '
2879 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2880 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2881 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002882 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002883 if not options.force:
2884 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002885 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002886 message = change_desc.description
2887 if not message:
2888 DieWithError("Description is empty. Aborting...")
2889 # Continue the while loop.
2890 # Sanity check of this code - we should end up with proper message
2891 # footer.
2892 assert [change_id] == git_footers.get_footer_change_id(message)
2893 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002894 else: # if not self.GetIssue()
2895 if options.message:
2896 message = options.message
2897 else:
2898 message = CreateDescriptionFromLog(args)
2899 if options.title:
2900 message = options.title + '\n\n' + message
2901 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002902 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002903 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002904 # On first upload, patchset title is always this string, while
2905 # --title flag gets converted to first line of message.
2906 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002907 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002908 if not change_desc.description:
2909 DieWithError("Description is empty. Aborting...")
2910 message = change_desc.description
2911 change_ids = git_footers.get_footer_change_id(message)
2912 if len(change_ids) > 1:
2913 DieWithError('too many Change-Id footers, at most 1 allowed.')
2914 if not change_ids:
2915 # Generate the Change-Id automatically.
2916 message = git_footers.add_footer_change_id(
2917 message, GenerateGerritChangeId(message))
2918 change_desc.set_description(message)
2919 change_ids = git_footers.get_footer_change_id(message)
2920 assert len(change_ids) == 1
2921 change_id = change_ids[0]
2922
2923 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Aaron Gablef97e33d2017-03-30 15:44:27 -07002924 parent = self._ComputeParent(remote, upstream_branch, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002925 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2926 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2927 '-m', message]).strip()
2928 else:
2929 change_desc = ChangeDescription(
2930 options.message or CreateDescriptionFromLog(args))
2931 if not change_desc.description:
2932 DieWithError("Description is empty. Aborting...")
2933
2934 if not git_footers.get_footer_change_id(change_desc.description):
2935 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002936 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2937 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002938 ref_to_push = 'HEAD'
2939 parent = '%s/%s' % (gerrit_remote, branch)
2940 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2941
2942 assert change_desc
2943 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2944 ref_to_push)]).splitlines()
2945 if len(commits) > 1:
2946 print('WARNING: This will upload %d commits. Run the following command '
2947 'to see which commits will be uploaded: ' % len(commits))
2948 print('git log %s..%s' % (parent, ref_to_push))
2949 print('You can also use `git squash-branch` to squash these into a '
2950 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002951 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002952
2953 if options.reviewers or options.tbr_owners:
2954 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2955 change)
2956
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002957 # Extra options that can be specified at push time. Doc:
2958 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002959 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002960 if change_desc.get_reviewers(tbr_only=True):
2961 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002962 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002963
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002964
2965 # TODO(tandrii): options.message should be posted as a comment
2966 # if --send-email is set on non-initial upload as Rietveld used to do it.
2967
Aaron Gable9b713dd2016-12-14 16:04:21 -08002968 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002969 if not re.match(r'^[\w ]+$', title):
2970 title = re.sub(r'[^\w ]', '', title)
2971 if not automatic_title:
2972 print('WARNING: Patchset title may only contain alphanumeric chars '
2973 'and spaces. You can edit it in the UI. '
2974 'See https://crbug.com/663787.\n'
2975 'Cleaned up title: %s' % title)
2976 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2977 # reverse on its side.
2978 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002979
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002980 if options.send_mail:
2981 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002982 DieWithError('Must specify reviewers to send email.', change_desc)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002983 refspec_opts.append('notify=ALL')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002984 else:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002985 refspec_opts.append('notify=NONE')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002986
tandrii99a72f22016-08-17 14:33:24 -07002987 reviewers = change_desc.get_reviewers()
2988 if reviewers:
Andrii Shyshkalovfbee1652017-04-10 14:00:51 +02002989 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002990
agablec6787972016-09-09 16:13:34 -07002991 if options.private:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002992 refspec_opts.append('draft')
agablec6787972016-09-09 16:13:34 -07002993
rmistry9eadede2016-09-19 11:22:43 -07002994 if options.topic:
2995 # Documentation on Gerrit topics is here:
2996 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002997 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002998
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002999 refspec_suffix = ''
3000 if refspec_opts:
3001 refspec_suffix = '%' + ','.join(refspec_opts)
3002 assert ' ' not in refspec_suffix, (
3003 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3004 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3005
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003006 try:
3007 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003008 ['git', 'push', self.GetRemoteUrl(), refspec],
3009 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003010 # Flush after every line: useful for seeing progress when running as
3011 # recipe.
3012 filter_fn=lambda _: sys.stdout.flush())
3013 except subprocess2.CalledProcessError:
3014 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003015 'for the reason of the failure.\n'
3016 'Hint: run command below to diangose common Git/Gerrit '
3017 'credential problems:\n'
3018 ' git cl creds-check\n',
3019 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003020
3021 if options.squash:
3022 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3023 change_numbers = [m.group(1)
3024 for m in map(regex.match, push_stdout.splitlines())
3025 if m]
3026 if len(change_numbers) != 1:
3027 DieWithError(
3028 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003029 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003030 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003031 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003032
3033 # Add cc's from the CC_LIST and --cc flag (if any).
3034 cc = self.GetCCList().split(',')
3035 if options.cc:
3036 cc.extend(options.cc)
3037 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003038 if change_desc.get_cced():
3039 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07003040 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08003041 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08003042 self._GetGerritHost(), self.GetIssue(), cc,
3043 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003044 return 0
3045
Aaron Gablef97e33d2017-03-30 15:44:27 -07003046 def _ComputeParent(self, remote, upstream_branch, change_desc):
3047 if remote != '.':
3048 return self.GetCommonAncestorWithUpstream()
3049
3050 # If our upstream branch is local, we base our squashed commit on its
3051 # squashed version.
3052 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3053
3054 # TODO(tandrii): Remove this master-specific hack
3055 # Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=682104
3056 if upstream_branch_name == 'master':
3057 return RunGitSilent(['rev-parse', 'origin/master']).strip()
3058
3059 # Check the squashed hash of the parent.
3060 parent = RunGit(['config',
3061 'branch.%s.gerritsquashhash' % upstream_branch_name],
3062 error_ok=True).strip()
3063 # Verify that the upstream branch has been uploaded too, otherwise
3064 # Gerrit will create additional CLs when uploading.
3065 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3066 RunGitSilent(['rev-parse', parent + ':'])):
3067 DieWithError(
3068 '\nUpload upstream branch %s first.\n'
3069 'It is likely that this branch has been rebased since its last '
3070 'upload, so you just need to upload it again.\n'
3071 '(If you uploaded it with --no-squash, then branch dependencies '
3072 'are not supported, and you should reupload with --squash.)'
3073 % upstream_branch_name,
3074 change_desc)
3075 return parent
3076
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003077 def _AddChangeIdToCommitMessage(self, options, args):
3078 """Re-commits using the current message, assumes the commit hook is in
3079 place.
3080 """
3081 log_desc = options.message or CreateDescriptionFromLog(args)
3082 git_command = ['commit', '--amend', '-m', log_desc]
3083 RunGit(git_command)
3084 new_log_desc = CreateDescriptionFromLog(args)
3085 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003086 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003087 return new_log_desc
3088 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003089 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003090
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003091 def SetCQState(self, new_state):
3092 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003093 vote_map = {
3094 _CQState.NONE: 0,
3095 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003096 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003097 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003098 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3099 if new_state == _CQState.DRY_RUN:
3100 # Don't spam everybody reviewer/owner.
3101 kwargs['notify'] = 'NONE'
3102 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003103
tandriie113dfd2016-10-11 10:20:12 -07003104 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003105 try:
3106 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003107 except GerritChangeNotExists:
3108 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003109
3110 if data['status'] in ('ABANDONED', 'MERGED'):
3111 return 'CL %s is closed' % self.GetIssue()
3112
3113 def GetTryjobProperties(self, patchset=None):
3114 """Returns dictionary of properties to launch tryjob."""
3115 data = self._GetChangeDetail(['ALL_REVISIONS'])
3116 patchset = int(patchset or self.GetPatchset())
3117 assert patchset
3118 revision_data = None # Pylint wants it to be defined.
3119 for revision_data in data['revisions'].itervalues():
3120 if int(revision_data['_number']) == patchset:
3121 break
3122 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003123 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003124 (patchset, self.GetIssue()))
3125 return {
3126 'patch_issue': self.GetIssue(),
3127 'patch_set': patchset or self.GetPatchset(),
3128 'patch_project': data['project'],
3129 'patch_storage': 'gerrit',
3130 'patch_ref': revision_data['fetch']['http']['ref'],
3131 'patch_repository_url': revision_data['fetch']['http']['url'],
3132 'patch_gerrit_url': self.GetCodereviewServer(),
3133 }
tandriie113dfd2016-10-11 10:20:12 -07003134
tandriide281ae2016-10-12 06:02:30 -07003135 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003136 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003137
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003138
3139_CODEREVIEW_IMPLEMENTATIONS = {
3140 'rietveld': _RietveldChangelistImpl,
3141 'gerrit': _GerritChangelistImpl,
3142}
3143
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003144
iannuccie53c9352016-08-17 14:40:40 -07003145def _add_codereview_issue_select_options(parser, extra=""):
3146 _add_codereview_select_options(parser)
3147
3148 text = ('Operate on this issue number instead of the current branch\'s '
3149 'implicit issue.')
3150 if extra:
3151 text += ' '+extra
3152 parser.add_option('-i', '--issue', type=int, help=text)
3153
3154
3155def _process_codereview_issue_select_options(parser, options):
3156 _process_codereview_select_options(parser, options)
3157 if options.issue is not None and not options.forced_codereview:
3158 parser.error('--issue must be specified with either --rietveld or --gerrit')
3159
3160
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003161def _add_codereview_select_options(parser):
3162 """Appends --gerrit and --rietveld options to force specific codereview."""
3163 parser.codereview_group = optparse.OptionGroup(
3164 parser, 'EXPERIMENTAL! Codereview override options')
3165 parser.add_option_group(parser.codereview_group)
3166 parser.codereview_group.add_option(
3167 '--gerrit', action='store_true',
3168 help='Force the use of Gerrit for codereview')
3169 parser.codereview_group.add_option(
3170 '--rietveld', action='store_true',
3171 help='Force the use of Rietveld for codereview')
3172
3173
3174def _process_codereview_select_options(parser, options):
3175 if options.gerrit and options.rietveld:
3176 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3177 options.forced_codereview = None
3178 if options.gerrit:
3179 options.forced_codereview = 'gerrit'
3180 elif options.rietveld:
3181 options.forced_codereview = 'rietveld'
3182
3183
tandriif9aefb72016-07-01 09:06:51 -07003184def _get_bug_line_values(default_project, bugs):
3185 """Given default_project and comma separated list of bugs, yields bug line
3186 values.
3187
3188 Each bug can be either:
3189 * a number, which is combined with default_project
3190 * string, which is left as is.
3191
3192 This function may produce more than one line, because bugdroid expects one
3193 project per line.
3194
3195 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3196 ['v8:123', 'chromium:789']
3197 """
3198 default_bugs = []
3199 others = []
3200 for bug in bugs.split(','):
3201 bug = bug.strip()
3202 if bug:
3203 try:
3204 default_bugs.append(int(bug))
3205 except ValueError:
3206 others.append(bug)
3207
3208 if default_bugs:
3209 default_bugs = ','.join(map(str, default_bugs))
3210 if default_project:
3211 yield '%s:%s' % (default_project, default_bugs)
3212 else:
3213 yield default_bugs
3214 for other in sorted(others):
3215 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3216 yield other
3217
3218
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003219class ChangeDescription(object):
3220 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003221 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003222 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003223 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003224 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003225
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003226 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003227 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003228
agable@chromium.org42c20792013-09-12 17:34:49 +00003229 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003230 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003231 return '\n'.join(self._description_lines)
3232
3233 def set_description(self, desc):
3234 if isinstance(desc, basestring):
3235 lines = desc.splitlines()
3236 else:
3237 lines = [line.rstrip() for line in desc]
3238 while lines and not lines[0]:
3239 lines.pop(0)
3240 while lines and not lines[-1]:
3241 lines.pop(-1)
3242 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003243
piman@chromium.org336f9122014-09-04 02:16:55 +00003244 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003246 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003247 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003248 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003249 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003250
agable@chromium.org42c20792013-09-12 17:34:49 +00003251 # Get the set of R= and TBR= lines and remove them from the desciption.
3252 regexp = re.compile(self.R_LINE)
3253 matches = [regexp.match(line) for line in self._description_lines]
3254 new_desc = [l for i, l in enumerate(self._description_lines)
3255 if not matches[i]]
3256 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003257
agable@chromium.org42c20792013-09-12 17:34:49 +00003258 # Construct new unified R= and TBR= lines.
3259 r_names = []
3260 tbr_names = []
3261 for match in matches:
3262 if not match:
3263 continue
3264 people = cleanup_list([match.group(2).strip()])
3265 if match.group(1) == 'TBR':
3266 tbr_names.extend(people)
3267 else:
3268 r_names.extend(people)
3269 for name in r_names:
3270 if name not in reviewers:
3271 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003272 if add_owners_tbr:
3273 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003274 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003275 all_reviewers = set(tbr_names + reviewers)
3276 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3277 all_reviewers)
3278 tbr_names.extend(owners_db.reviewers_for(missing_files,
3279 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003280 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3281 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3282
3283 # Put the new lines in the description where the old first R= line was.
3284 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3285 if 0 <= line_loc < len(self._description_lines):
3286 if new_tbr_line:
3287 self._description_lines.insert(line_loc, new_tbr_line)
3288 if new_r_line:
3289 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003290 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003291 if new_r_line:
3292 self.append_footer(new_r_line)
3293 if new_tbr_line:
3294 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003295
Aaron Gable3a16ed12017-03-23 10:51:55 -07003296 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003297 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003298 self.set_description([
3299 '# Enter a description of the change.',
3300 '# This will be displayed on the codereview site.',
3301 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003302 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003303 '--------------------',
3304 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003305
agable@chromium.org42c20792013-09-12 17:34:49 +00003306 regexp = re.compile(self.BUG_LINE)
3307 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003308 prefix = settings.GetBugPrefix()
3309 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003310 if git_footer:
3311 self.append_footer('Bug: %s' % ', '.join(values))
3312 else:
3313 for value in values:
3314 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003315
agable@chromium.org42c20792013-09-12 17:34:49 +00003316 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003317 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003318 if not content:
3319 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003320 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003321
3322 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003323 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3324 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003325 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003326 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003327
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003328 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003329 """Adds a footer line to the description.
3330
3331 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3332 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3333 that Gerrit footers are always at the end.
3334 """
3335 parsed_footer_line = git_footers.parse_footer(line)
3336 if parsed_footer_line:
3337 # Line is a gerrit footer in the form: Footer-Key: any value.
3338 # Thus, must be appended observing Gerrit footer rules.
3339 self.set_description(
3340 git_footers.add_footer(self.description,
3341 key=parsed_footer_line[0],
3342 value=parsed_footer_line[1]))
3343 return
3344
3345 if not self._description_lines:
3346 self._description_lines.append(line)
3347 return
3348
3349 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3350 if gerrit_footers:
3351 # git_footers.split_footers ensures that there is an empty line before
3352 # actual (gerrit) footers, if any. We have to keep it that way.
3353 assert top_lines and top_lines[-1] == ''
3354 top_lines, separator = top_lines[:-1], top_lines[-1:]
3355 else:
3356 separator = [] # No need for separator if there are no gerrit_footers.
3357
3358 prev_line = top_lines[-1] if top_lines else ''
3359 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3360 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3361 top_lines.append('')
3362 top_lines.append(line)
3363 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003364
tandrii99a72f22016-08-17 14:33:24 -07003365 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003366 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003367 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003368 reviewers = [match.group(2).strip()
3369 for match in matches
3370 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003371 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003372
bradnelsond975b302016-10-23 12:20:23 -07003373 def get_cced(self):
3374 """Retrieves the list of reviewers."""
3375 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3376 cced = [match.group(2).strip() for match in matches if match]
3377 return cleanup_list(cced)
3378
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003379 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3380 """Updates this commit description given the parent.
3381
3382 This is essentially what Gnumbd used to do.
3383 Consult https://goo.gl/WMmpDe for more details.
3384 """
3385 assert parent_msg # No, orphan branch creation isn't supported.
3386 assert parent_hash
3387 assert dest_ref
3388 parent_footer_map = git_footers.parse_footers(parent_msg)
3389 # This will also happily parse svn-position, which GnumbD is no longer
3390 # supporting. While we'd generate correct footers, the verifier plugin
3391 # installed in Gerrit will block such commit (ie git push below will fail).
3392 parent_position = git_footers.get_position(parent_footer_map)
3393
3394 # Cherry-picks may have last line obscuring their prior footers,
3395 # from git_footers perspective. This is also what Gnumbd did.
3396 cp_line = None
3397 if (self._description_lines and
3398 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3399 cp_line = self._description_lines.pop()
3400
3401 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3402
3403 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3404 # user interference with actual footers we'd insert below.
3405 for i, (k, v) in enumerate(parsed_footers):
3406 if k.startswith('Cr-'):
3407 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3408
3409 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003410 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003411 if parent_position[0] == dest_ref:
3412 # Same branch as parent.
3413 number = int(parent_position[1]) + 1
3414 else:
3415 number = 1 # New branch, and extra lineage.
3416 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3417 int(parent_position[1])))
3418
3419 parsed_footers.append(('Cr-Commit-Position',
3420 '%s@{#%d}' % (dest_ref, number)))
3421 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3422
3423 self._description_lines = top_lines
3424 if cp_line:
3425 self._description_lines.append(cp_line)
3426 if self._description_lines[-1] != '':
3427 self._description_lines.append('') # Ensure footer separator.
3428 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3429
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003430
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003431def get_approving_reviewers(props):
3432 """Retrieves the reviewers that approved a CL from the issue properties with
3433 messages.
3434
3435 Note that the list may contain reviewers that are not committer, thus are not
3436 considered by the CQ.
3437 """
3438 return sorted(
3439 set(
3440 message['sender']
3441 for message in props['messages']
3442 if message['approval'] and message['sender'] in props['reviewers']
3443 )
3444 )
3445
3446
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003447def FindCodereviewSettingsFile(filename='codereview.settings'):
3448 """Finds the given file starting in the cwd and going up.
3449
3450 Only looks up to the top of the repository unless an
3451 'inherit-review-settings-ok' file exists in the root of the repository.
3452 """
3453 inherit_ok_file = 'inherit-review-settings-ok'
3454 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003455 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003456 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3457 root = '/'
3458 while True:
3459 if filename in os.listdir(cwd):
3460 if os.path.isfile(os.path.join(cwd, filename)):
3461 return open(os.path.join(cwd, filename))
3462 if cwd == root:
3463 break
3464 cwd = os.path.dirname(cwd)
3465
3466
3467def LoadCodereviewSettingsFromFile(fileobj):
3468 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003469 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003470
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003471 def SetProperty(name, setting, unset_error_ok=False):
3472 fullname = 'rietveld.' + name
3473 if setting in keyvals:
3474 RunGit(['config', fullname, keyvals[setting]])
3475 else:
3476 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3477
tandrii48df5812016-10-17 03:55:37 -07003478 if not keyvals.get('GERRIT_HOST', False):
3479 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003480 # Only server setting is required. Other settings can be absent.
3481 # In that case, we ignore errors raised during option deletion attempt.
3482 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003483 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003484 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3485 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003486 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003487 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3488 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003489 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003490 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3491 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003492
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003493 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003494 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003495
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003496 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003497 RunGit(['config', 'gerrit.squash-uploads',
3498 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003499
tandrii@chromium.org28253532016-04-14 13:46:56 +00003500 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003501 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003502 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3503
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003504 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003505 # should be of the form
3506 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3507 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003508 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3509 keyvals['ORIGIN_URL_CONFIG']])
3510
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003511
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003512def urlretrieve(source, destination):
3513 """urllib is broken for SSL connections via a proxy therefore we
3514 can't use urllib.urlretrieve()."""
3515 with open(destination, 'w') as f:
3516 f.write(urllib2.urlopen(source).read())
3517
3518
ukai@chromium.org712d6102013-11-27 00:52:58 +00003519def hasSheBang(fname):
3520 """Checks fname is a #! script."""
3521 with open(fname) as f:
3522 return f.read(2).startswith('#!')
3523
3524
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003525# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3526def DownloadHooks(*args, **kwargs):
3527 pass
3528
3529
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003530def DownloadGerritHook(force):
3531 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003532
3533 Args:
3534 force: True to update hooks. False to install hooks if not present.
3535 """
3536 if not settings.GetIsGerrit():
3537 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003538 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003539 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3540 if not os.access(dst, os.X_OK):
3541 if os.path.exists(dst):
3542 if not force:
3543 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003544 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003545 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003546 if not hasSheBang(dst):
3547 DieWithError('Not a script: %s\n'
3548 'You need to download from\n%s\n'
3549 'into .git/hooks/commit-msg and '
3550 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003551 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3552 except Exception:
3553 if os.path.exists(dst):
3554 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003555 DieWithError('\nFailed to download hooks.\n'
3556 'You need to download from\n%s\n'
3557 'into .git/hooks/commit-msg and '
3558 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003559
3560
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003561def GetRietveldCodereviewSettingsInteractively():
3562 """Prompt the user for settings."""
3563 server = settings.GetDefaultServerUrl(error_ok=True)
3564 prompt = 'Rietveld server (host[:port])'
3565 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3566 newserver = ask_for_data(prompt + ':')
3567 if not server and not newserver:
3568 newserver = DEFAULT_SERVER
3569 if newserver:
3570 newserver = gclient_utils.UpgradeToHttps(newserver)
3571 if newserver != server:
3572 RunGit(['config', 'rietveld.server', newserver])
3573
3574 def SetProperty(initial, caption, name, is_url):
3575 prompt = caption
3576 if initial:
3577 prompt += ' ("x" to clear) [%s]' % initial
3578 new_val = ask_for_data(prompt + ':')
3579 if new_val == 'x':
3580 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3581 elif new_val:
3582 if is_url:
3583 new_val = gclient_utils.UpgradeToHttps(new_val)
3584 if new_val != initial:
3585 RunGit(['config', 'rietveld.' + name, new_val])
3586
3587 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3588 SetProperty(settings.GetDefaultPrivateFlag(),
3589 'Private flag (rietveld only)', 'private', False)
3590 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3591 'tree-status-url', False)
3592 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3593 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3594 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3595 'run-post-upload-hook', False)
3596
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003597
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003598class _GitCookiesChecker(object):
3599 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003600
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003601 _GOOGLESOURCE = 'googlesource.com'
3602
3603 def __init__(self):
3604 # Cached list of [host, identity, source], where source is either
3605 # .gitcookies or .netrc.
3606 self._all_hosts = None
3607
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003608 def ensure_configured_gitcookies(self):
3609 """Runs checks and suggests fixes to make git use .gitcookies from default
3610 path."""
3611 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3612 configured_path = RunGitSilent(
3613 ['config', '--global', 'http.cookiefile']).strip()
3614 if configured_path:
3615 self._ensure_default_gitcookies_path(configured_path, default)
3616 else:
3617 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003618
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003619 @staticmethod
3620 def _ensure_default_gitcookies_path(configured_path, default_path):
3621 assert configured_path
3622 if configured_path == default_path:
3623 print('git is already configured to use your .gitcookies from %s' %
3624 configured_path)
3625 return
3626
3627 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3628 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3629 (configured_path, default_path))
3630
3631 if not os.path.exists(configured_path):
3632 print('However, your configured .gitcookies file is missing.')
3633 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3634 action='reconfigure')
3635 RunGit(['config', '--global', 'http.cookiefile', default_path])
3636 return
3637
3638 if os.path.exists(default_path):
3639 print('WARNING: default .gitcookies file already exists %s' %
3640 default_path)
3641 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3642 default_path)
3643
3644 confirm_or_exit('Move existing .gitcookies to default location?',
3645 action='move')
3646 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003647 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003648 print('Moved and reconfigured git to use .gitcookies from %s' %
3649 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003650
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003651 @staticmethod
3652 def _configure_gitcookies_path(default_path):
3653 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3654 if os.path.exists(netrc_path):
3655 print('You seem to be using outdated .netrc for git credentials: %s' %
3656 netrc_path)
3657 print('This tool will guide you through setting up recommended '
3658 '.gitcookies store for git credentials.\n'
3659 '\n'
3660 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3661 ' git config --global --unset http.cookiefile\n'
3662 ' mv %s %s.backup\n\n' % (default_path, default_path))
3663 confirm_or_exit(action='setup .gitcookies')
3664 RunGit(['config', '--global', 'http.cookiefile', default_path])
3665 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003666
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003667 def get_hosts_with_creds(self, include_netrc=False):
3668 if self._all_hosts is None:
3669 a = gerrit_util.CookiesAuthenticator()
3670 self._all_hosts = [
3671 (h, u, s)
3672 for h, u, s in itertools.chain(
3673 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3674 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3675 )
3676 if h.endswith(self._GOOGLESOURCE)
3677 ]
3678
3679 if include_netrc:
3680 return self._all_hosts
3681 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3682
3683 def print_current_creds(self, include_netrc=False):
3684 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3685 if not hosts:
3686 print('No Git/Gerrit credentials found')
3687 return
3688 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3689 header = [('Host', 'User', 'Which file'),
3690 ['=' * l for l in lengths]]
3691 for row in (header + hosts):
3692 print('\t'.join((('%%+%ds' % l) % s)
3693 for l, s in zip(lengths, row)))
3694
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003695 @staticmethod
3696 def _parse_identity(identity):
3697 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3698 username, domain = identity.split('.', 1)
3699 if username.startswith('git-'):
3700 username = username[len('git-'):]
3701 return username, domain
3702
3703 def _get_usernames_of_domain(self, domain):
3704 """Returns list of usernames referenced by .gitcookies in a given domain."""
3705 identities_by_domain = {}
3706 for _, identity, _ in self.get_hosts_with_creds():
3707 username, domain = self._parse_identity(identity)
3708 identities_by_domain.setdefault(domain, []).append(username)
3709 return identities_by_domain.get(domain)
3710
3711 def _canonical_git_googlesource_host(self, host):
3712 """Normalizes Gerrit hosts (with '-review') to Git host."""
3713 assert host.endswith(self._GOOGLESOURCE)
3714 # Prefix doesn't include '.' at the end.
3715 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3716 if prefix.endswith('-review'):
3717 prefix = prefix[:-len('-review')]
3718 return prefix + '.' + self._GOOGLESOURCE
3719
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003720 def _canonical_gerrit_googlesource_host(self, host):
3721 git_host = self._canonical_git_googlesource_host(host)
3722 prefix = git_host.split('.', 1)[0]
3723 return prefix + '-review.' + self._GOOGLESOURCE
3724
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003725 def has_generic_host(self):
3726 """Returns whether generic .googlesource.com has been configured.
3727
3728 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3729 """
3730 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3731 if host == '.' + self._GOOGLESOURCE:
3732 return True
3733 return False
3734
3735 def _get_git_gerrit_identity_pairs(self):
3736 """Returns map from canonic host to pair of identities (Git, Gerrit).
3737
3738 One of identities might be None, meaning not configured.
3739 """
3740 host_to_identity_pairs = {}
3741 for host, identity, _ in self.get_hosts_with_creds():
3742 canonical = self._canonical_git_googlesource_host(host)
3743 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3744 idx = 0 if canonical == host else 1
3745 pair[idx] = identity
3746 return host_to_identity_pairs
3747
3748 def get_partially_configured_hosts(self):
3749 return set(
3750 host for host, identities_pair in
3751 self._get_git_gerrit_identity_pairs().iteritems()
3752 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3753
3754 def get_conflicting_hosts(self):
3755 return set(
3756 host for host, (i1, i2) in
3757 self._get_git_gerrit_identity_pairs().iteritems()
3758 if None not in (i1, i2) and i1 != i2)
3759
3760 def get_duplicated_hosts(self):
3761 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3762 return set(host for host, count in counters.iteritems() if count > 1)
3763
3764 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3765 'chromium.googlesource.com': 'chromium.org',
3766 'chrome-internal.googlesource.com': 'google.com',
3767 }
3768
3769 def get_hosts_with_wrong_identities(self):
3770 """Finds hosts which **likely** reference wrong identities.
3771
3772 Note: skips hosts which have conflicting identities for Git and Gerrit.
3773 """
3774 hosts = set()
3775 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3776 pair = self._get_git_gerrit_identity_pairs().get(host)
3777 if pair and pair[0] == pair[1]:
3778 _, domain = self._parse_identity(pair[0])
3779 if domain != expected:
3780 hosts.add(host)
3781 return hosts
3782
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003783 @staticmethod
3784 def print_hosts(hosts, extra_column_func=None):
3785 hosts = sorted(hosts)
3786 assert hosts
3787 if extra_column_func is None:
3788 extras = [''] * len(hosts)
3789 else:
3790 extras = [extra_column_func(host) for host in hosts]
3791 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3792 for he in zip(hosts, extras):
3793 print(tmpl % he)
3794 print()
3795
3796 def find_and_report_problems(self):
3797 """Returns True if there was at least one problem, else False."""
3798 problems = [False]
3799 def add_problem():
3800 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003801 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003802 problems[0] = True
3803
3804 if self.has_generic_host():
3805 add_problem()
3806 print(' .googlesource.com record detected\n'
3807 ' Chrome Infrastructure team recommends to list full host names '
3808 'explicitly.\n')
3809
3810 dups = self.get_duplicated_hosts()
3811 if dups:
3812 add_problem()
3813 print(' The following hosts were defined twice:\n')
3814 self.print_hosts(dups)
3815
3816 partial = self.get_partially_configured_hosts()
3817 if partial:
3818 add_problem()
3819 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3820 'These hosts are missing:')
3821 self.print_hosts(partial)
3822
3823 conflicting = self.get_conflicting_hosts()
3824 if conflicting:
3825 add_problem()
3826 print(' The following Git hosts have differing credentials from their '
3827 'Gerrit counterparts:\n')
3828 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3829 tuple(self._get_git_gerrit_identity_pairs()[host]))
3830
3831 wrong = self.get_hosts_with_wrong_identities()
3832 if wrong:
3833 add_problem()
3834 print(' These hosts likely use wrong identity:\n')
3835 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3836 (self._get_git_gerrit_identity_pairs()[host][0],
3837 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3838 return problems[0]
3839
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003840
3841def CMDcreds_check(parser, args):
3842 """Checks credentials and suggests changes."""
3843 _, _ = parser.parse_args(args)
3844
3845 if gerrit_util.GceAuthenticator.is_gce():
3846 DieWithError('this command is not designed for GCE, are you on a bot?')
3847
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003848 checker = _GitCookiesChecker()
3849 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003850
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003851 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003852 checker.print_current_creds(include_netrc=True)
3853
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003854 if not checker.find_and_report_problems():
3855 print('\nNo problems detected in your .gitcookies')
3856 return 0
3857 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003858
3859
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003860@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003861def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003862 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003863
tandrii5d0a0422016-09-14 06:24:35 -07003864 print('WARNING: git cl config works for Rietveld only')
3865 # TODO(tandrii): remove this once we switch to Gerrit.
3866 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003867 parser.add_option('--activate-update', action='store_true',
3868 help='activate auto-updating [rietveld] section in '
3869 '.git/config')
3870 parser.add_option('--deactivate-update', action='store_true',
3871 help='deactivate auto-updating [rietveld] section in '
3872 '.git/config')
3873 options, args = parser.parse_args(args)
3874
3875 if options.deactivate_update:
3876 RunGit(['config', 'rietveld.autoupdate', 'false'])
3877 return
3878
3879 if options.activate_update:
3880 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3881 return
3882
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003883 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003884 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003885 return 0
3886
3887 url = args[0]
3888 if not url.endswith('codereview.settings'):
3889 url = os.path.join(url, 'codereview.settings')
3890
3891 # Load code review settings and download hooks (if available).
3892 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3893 return 0
3894
3895
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003896def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003897 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003898 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3899 branch = ShortBranchName(branchref)
3900 _, args = parser.parse_args(args)
3901 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003902 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003903 return RunGit(['config', 'branch.%s.base-url' % branch],
3904 error_ok=False).strip()
3905 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003906 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003907 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3908 error_ok=False).strip()
3909
3910
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003911def color_for_status(status):
3912 """Maps a Changelist status to color, for CMDstatus and other tools."""
3913 return {
3914 'unsent': Fore.RED,
3915 'waiting': Fore.BLUE,
3916 'reply': Fore.YELLOW,
3917 'lgtm': Fore.GREEN,
3918 'commit': Fore.MAGENTA,
3919 'closed': Fore.CYAN,
3920 'error': Fore.WHITE,
3921 }.get(status, Fore.WHITE)
3922
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003923
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003924def get_cl_statuses(changes, fine_grained, max_processes=None):
3925 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003926
3927 If fine_grained is true, this will fetch CL statuses from the server.
3928 Otherwise, simply indicate if there's a matching url for the given branches.
3929
3930 If max_processes is specified, it is used as the maximum number of processes
3931 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3932 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003933
3934 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003935 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003936 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003937 upload.verbosity = 0
3938
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003939 if not changes:
3940 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003941
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003942 if not fine_grained:
3943 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003944 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003945 for cl in changes:
3946 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003947 return
3948
3949 # First, sort out authentication issues.
3950 logging.debug('ensuring credentials exist')
3951 for cl in changes:
3952 cl.EnsureAuthenticated(force=False, refresh=True)
3953
3954 def fetch(cl):
3955 try:
3956 return (cl, cl.GetStatus())
3957 except:
3958 # See http://crbug.com/629863.
3959 logging.exception('failed to fetch status for %s:', cl)
3960 raise
3961
3962 threads_count = len(changes)
3963 if max_processes:
3964 threads_count = max(1, min(threads_count, max_processes))
3965 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3966
3967 pool = ThreadPool(threads_count)
3968 fetched_cls = set()
3969 try:
3970 it = pool.imap_unordered(fetch, changes).__iter__()
3971 while True:
3972 try:
3973 cl, status = it.next(timeout=5)
3974 except multiprocessing.TimeoutError:
3975 break
3976 fetched_cls.add(cl)
3977 yield cl, status
3978 finally:
3979 pool.close()
3980
3981 # Add any branches that failed to fetch.
3982 for cl in set(changes) - fetched_cls:
3983 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003984
rmistry@google.com2dd99862015-06-22 12:22:18 +00003985
3986def upload_branch_deps(cl, args):
3987 """Uploads CLs of local branches that are dependents of the current branch.
3988
3989 If the local branch dependency tree looks like:
3990 test1 -> test2.1 -> test3.1
3991 -> test3.2
3992 -> test2.2 -> test3.3
3993
3994 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3995 run on the dependent branches in this order:
3996 test2.1, test3.1, test3.2, test2.2, test3.3
3997
3998 Note: This function does not rebase your local dependent branches. Use it when
3999 you make a change to the parent branch that will not conflict with its
4000 dependent branches, and you would like their dependencies updated in
4001 Rietveld.
4002 """
4003 if git_common.is_dirty_git_tree('upload-branch-deps'):
4004 return 1
4005
4006 root_branch = cl.GetBranch()
4007 if root_branch is None:
4008 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4009 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004010 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004011 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4012 'patchset dependencies without an uploaded CL.')
4013
4014 branches = RunGit(['for-each-ref',
4015 '--format=%(refname:short) %(upstream:short)',
4016 'refs/heads'])
4017 if not branches:
4018 print('No local branches found.')
4019 return 0
4020
4021 # Create a dictionary of all local branches to the branches that are dependent
4022 # on it.
4023 tracked_to_dependents = collections.defaultdict(list)
4024 for b in branches.splitlines():
4025 tokens = b.split()
4026 if len(tokens) == 2:
4027 branch_name, tracked = tokens
4028 tracked_to_dependents[tracked].append(branch_name)
4029
vapiera7fbd5a2016-06-16 09:17:49 -07004030 print()
4031 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004032 dependents = []
4033 def traverse_dependents_preorder(branch, padding=''):
4034 dependents_to_process = tracked_to_dependents.get(branch, [])
4035 padding += ' '
4036 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004037 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004038 dependents.append(dependent)
4039 traverse_dependents_preorder(dependent, padding)
4040 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004041 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004042
4043 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004044 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004045 return 0
4046
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004047 confirm_or_exit('This command will checkout all dependent branches and run '
4048 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004049
andybons@chromium.org962f9462016-02-03 20:00:42 +00004050 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004051 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004052 args.extend(['-t', 'Updated patchset dependency'])
4053
rmistry@google.com2dd99862015-06-22 12:22:18 +00004054 # Record all dependents that failed to upload.
4055 failures = {}
4056 # Go through all dependents, checkout the branch and upload.
4057 try:
4058 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004059 print()
4060 print('--------------------------------------')
4061 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004062 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004063 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004064 try:
4065 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004066 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004067 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004068 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004069 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004070 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004071 finally:
4072 # Swap back to the original root branch.
4073 RunGit(['checkout', '-q', root_branch])
4074
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print()
4076 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004077 for dependent_branch in dependents:
4078 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print(' %s : %s' % (dependent_branch, upload_status))
4080 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004081
4082 return 0
4083
4084
kmarshall3bff56b2016-06-06 18:31:47 -07004085def CMDarchive(parser, args):
4086 """Archives and deletes branches associated with closed changelists."""
4087 parser.add_option(
4088 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004089 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004090 parser.add_option(
4091 '-f', '--force', action='store_true',
4092 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004093 parser.add_option(
4094 '-d', '--dry-run', action='store_true',
4095 help='Skip the branch tagging and removal steps.')
4096 parser.add_option(
4097 '-t', '--notags', action='store_true',
4098 help='Do not tag archived branches. '
4099 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004100
4101 auth.add_auth_options(parser)
4102 options, args = parser.parse_args(args)
4103 if args:
4104 parser.error('Unsupported args: %s' % ' '.join(args))
4105 auth_config = auth.extract_auth_config_from_options(options)
4106
4107 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4108 if not branches:
4109 return 0
4110
vapiera7fbd5a2016-06-16 09:17:49 -07004111 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004112 changes = [Changelist(branchref=b, auth_config=auth_config)
4113 for b in branches.splitlines()]
4114 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4115 statuses = get_cl_statuses(changes,
4116 fine_grained=True,
4117 max_processes=options.maxjobs)
4118 proposal = [(cl.GetBranch(),
4119 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4120 for cl, status in statuses
4121 if status == 'closed']
4122 proposal.sort()
4123
4124 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004125 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004126 return 0
4127
4128 current_branch = GetCurrentBranch()
4129
vapiera7fbd5a2016-06-16 09:17:49 -07004130 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004131 if options.notags:
4132 for next_item in proposal:
4133 print(' ' + next_item[0])
4134 else:
4135 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4136 for next_item in proposal:
4137 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004138
kmarshall9249e012016-08-23 12:02:16 -07004139 # Quit now on precondition failure or if instructed by the user, either
4140 # via an interactive prompt or by command line flags.
4141 if options.dry_run:
4142 print('\nNo changes were made (dry run).\n')
4143 return 0
4144 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004145 print('You are currently on a branch \'%s\' which is associated with a '
4146 'closed codereview issue, so archive cannot proceed. Please '
4147 'checkout another branch and run this command again.' %
4148 current_branch)
4149 return 1
kmarshall9249e012016-08-23 12:02:16 -07004150 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004151 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4152 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004153 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004154 return 1
4155
4156 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004157 if not options.notags:
4158 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004159 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004160
vapiera7fbd5a2016-06-16 09:17:49 -07004161 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004162
4163 return 0
4164
4165
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004166def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004167 """Show status of changelists.
4168
4169 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004170 - Red not sent for review or broken
4171 - Blue waiting for review
4172 - Yellow waiting for you to reply to review
4173 - Green LGTM'ed
4174 - Magenta in the commit queue
4175 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004176
4177 Also see 'git cl comments'.
4178 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004179 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004180 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004181 parser.add_option('-f', '--fast', action='store_true',
4182 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004183 parser.add_option(
4184 '-j', '--maxjobs', action='store', type=int,
4185 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004186
4187 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004188 _add_codereview_issue_select_options(
4189 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004190 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004191 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004192 if args:
4193 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004194 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004195
iannuccie53c9352016-08-17 14:40:40 -07004196 if options.issue is not None and not options.field:
4197 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004198
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004199 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004200 cl = Changelist(auth_config=auth_config, issue=options.issue,
4201 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004202 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004203 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004204 elif options.field == 'id':
4205 issueid = cl.GetIssue()
4206 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004207 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004208 elif options.field == 'patch':
4209 patchset = cl.GetPatchset()
4210 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004212 elif options.field == 'status':
4213 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004214 elif options.field == 'url':
4215 url = cl.GetIssueURL()
4216 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004217 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004218 return 0
4219
4220 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4221 if not branches:
4222 print('No local branch found.')
4223 return 0
4224
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004225 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004226 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004227 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004228 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004229 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004230 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004231 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004232
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004233 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004234 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4235 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4236 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004237 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004238 c, status = output.next()
4239 branch_statuses[c.GetBranch()] = status
4240 status = branch_statuses.pop(branch)
4241 url = cl.GetIssueURL()
4242 if url and (not status or status == 'error'):
4243 # The issue probably doesn't exist anymore.
4244 url += ' (broken)'
4245
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004246 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004247 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004248 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004249 color = ''
4250 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004251 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004252 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004253 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004254 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004255
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004256
4257 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004258 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004259 print('Current branch: %s' % branch)
4260 for cl in changes:
4261 if cl.GetBranch() == branch:
4262 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004263 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004264 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004265 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004266 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004267 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004268 print('Issue description:')
4269 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004270 return 0
4271
4272
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004273def colorize_CMDstatus_doc():
4274 """To be called once in main() to add colors to git cl status help."""
4275 colors = [i for i in dir(Fore) if i[0].isupper()]
4276
4277 def colorize_line(line):
4278 for color in colors:
4279 if color in line.upper():
4280 # Extract whitespaces first and the leading '-'.
4281 indent = len(line) - len(line.lstrip(' ')) + 1
4282 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4283 return line
4284
4285 lines = CMDstatus.__doc__.splitlines()
4286 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4287
4288
phajdan.jre328cf92016-08-22 04:12:17 -07004289def write_json(path, contents):
4290 with open(path, 'w') as f:
4291 json.dump(contents, f)
4292
4293
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004294@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004295def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004296 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004297
4298 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004299 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004300 parser.add_option('-r', '--reverse', action='store_true',
4301 help='Lookup the branch(es) for the specified issues. If '
4302 'no issues are specified, all branches with mapped '
4303 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004304 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004305 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004306 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004307 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004308
dnj@chromium.org406c4402015-03-03 17:22:28 +00004309 if options.reverse:
4310 branches = RunGit(['for-each-ref', 'refs/heads',
4311 '--format=%(refname:short)']).splitlines()
4312
4313 # Reverse issue lookup.
4314 issue_branch_map = {}
4315 for branch in branches:
4316 cl = Changelist(branchref=branch)
4317 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4318 if not args:
4319 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004320 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004321 for issue in args:
4322 if not issue:
4323 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004324 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004325 print('Branch for issue number %s: %s' % (
4326 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004327 if options.json:
4328 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004329 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004330 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004331 if len(args) > 0:
4332 try:
4333 issue = int(args[0])
4334 except ValueError:
4335 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004336 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004337 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004338 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004339 if options.json:
4340 write_json(options.json, {
4341 'issue': cl.GetIssue(),
4342 'issue_url': cl.GetIssueURL(),
4343 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004344 return 0
4345
4346
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004347def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004348 """Shows or posts review comments for any changelist."""
4349 parser.add_option('-a', '--add-comment', dest='comment',
4350 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004351 parser.add_option('-i', '--issue', dest='issue',
4352 help='review issue id (defaults to current issue). '
4353 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004354 parser.add_option('-j', '--json-file',
4355 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004356 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004357 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004358 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004359 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004360 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004361
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004362 issue = None
4363 if options.issue:
4364 try:
4365 issue = int(options.issue)
4366 except ValueError:
4367 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004368 if not options.forced_codereview:
4369 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004370
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004371 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004372 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004373 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004374
4375 if options.comment:
4376 cl.AddComment(options.comment)
4377 return 0
4378
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004379 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4380 for comment in summary:
4381 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004382 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004383 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004384 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004385 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004386 color = Fore.MAGENTA
4387 else:
4388 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004389 print('\n%s%s %s%s\n%s' % (
4390 color,
4391 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4392 comment.sender,
4393 Fore.RESET,
4394 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4395
smut@google.comc85ac942015-09-15 16:34:43 +00004396 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004397 def pre_serialize(c):
4398 dct = c.__dict__.copy()
4399 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4400 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004401 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004402 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004403 return 0
4404
4405
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004406@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004407def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004408 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004409 parser.add_option('-d', '--display', action='store_true',
4410 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004411 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004412 help='New description to set for this issue (- for stdin, '
4413 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004414 parser.add_option('-f', '--force', action='store_true',
4415 help='Delete any unpublished Gerrit edits for this issue '
4416 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004417
4418 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004419 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004420 options, args = parser.parse_args(args)
4421 _process_codereview_select_options(parser, options)
4422
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004423 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004424 if len(args) > 0:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004425 target_issue_arg = ParseIssueNumberArgument(args[0])
4426 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004427 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004428 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004429
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004430 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004431
martiniss6eda05f2016-06-30 10:18:35 -07004432 kwargs = {
4433 'auth_config': auth_config,
4434 'codereview': options.forced_codereview,
4435 }
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004436 if target_issue_arg:
4437 kwargs['issue'] = target_issue_arg.issue
4438 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004439
4440 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004441
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004442 if not cl.GetIssue():
4443 DieWithError('This branch has no associated changelist.')
4444 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004445
smut@google.com34fb6b12015-07-13 20:03:26 +00004446 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004447 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004448 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004449
4450 if options.new_description:
4451 text = options.new_description
4452 if text == '-':
4453 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004454 elif text == '+':
4455 base_branch = cl.GetCommonAncestorWithUpstream()
4456 change = cl.GetChange(base_branch, None, local_description=True)
4457 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004458
4459 description.set_description(text)
4460 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004461 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004462
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004463 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004464 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004465 return 0
4466
4467
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468def CreateDescriptionFromLog(args):
4469 """Pulls out the commit log to use as a base for the CL description."""
4470 log_args = []
4471 if len(args) == 1 and not args[0].endswith('.'):
4472 log_args = [args[0] + '..']
4473 elif len(args) == 1 and args[0].endswith('...'):
4474 log_args = [args[0][:-1]]
4475 elif len(args) == 2:
4476 log_args = [args[0] + '..' + args[1]]
4477 else:
4478 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004479 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480
4481
thestig@chromium.org44202a22014-03-11 19:22:18 +00004482def CMDlint(parser, args):
4483 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004484 parser.add_option('--filter', action='append', metavar='-x,+y',
4485 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004486 auth.add_auth_options(parser)
4487 options, args = parser.parse_args(args)
4488 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004489
4490 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004491 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004492 try:
4493 import cpplint
4494 import cpplint_chromium
4495 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004496 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004497 return 1
4498
4499 # Change the current working directory before calling lint so that it
4500 # shows the correct base.
4501 previous_cwd = os.getcwd()
4502 os.chdir(settings.GetRoot())
4503 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004504 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004505 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4506 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004507 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004508 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004509 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004510
4511 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004512 command = args + files
4513 if options.filter:
4514 command = ['--filter=' + ','.join(options.filter)] + command
4515 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004516
4517 white_regex = re.compile(settings.GetLintRegex())
4518 black_regex = re.compile(settings.GetLintIgnoreRegex())
4519 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4520 for filename in filenames:
4521 if white_regex.match(filename):
4522 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004523 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004524 else:
4525 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4526 extra_check_functions)
4527 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004528 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004529 finally:
4530 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004531 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004532 if cpplint._cpplint_state.error_count != 0:
4533 return 1
4534 return 0
4535
4536
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004537def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004538 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004539 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004540 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004541 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004542 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004543 auth.add_auth_options(parser)
4544 options, args = parser.parse_args(args)
4545 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004546
sbc@chromium.org71437c02015-04-09 19:29:40 +00004547 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004548 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004549 return 1
4550
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004551 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004552 if args:
4553 base_branch = args[0]
4554 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004555 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004556 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004557
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004558 cl.RunHook(
4559 committing=not options.upload,
4560 may_prompt=False,
4561 verbose=options.verbose,
4562 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004563 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004564
4565
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004566def GenerateGerritChangeId(message):
4567 """Returns Ixxxxxx...xxx change id.
4568
4569 Works the same way as
4570 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4571 but can be called on demand on all platforms.
4572
4573 The basic idea is to generate git hash of a state of the tree, original commit
4574 message, author/committer info and timestamps.
4575 """
4576 lines = []
4577 tree_hash = RunGitSilent(['write-tree'])
4578 lines.append('tree %s' % tree_hash.strip())
4579 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4580 if code == 0:
4581 lines.append('parent %s' % parent.strip())
4582 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4583 lines.append('author %s' % author.strip())
4584 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4585 lines.append('committer %s' % committer.strip())
4586 lines.append('')
4587 # Note: Gerrit's commit-hook actually cleans message of some lines and
4588 # whitespace. This code is not doing this, but it clearly won't decrease
4589 # entropy.
4590 lines.append(message)
4591 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4592 stdin='\n'.join(lines))
4593 return 'I%s' % change_hash.strip()
4594
4595
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004596def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004597 """Computes the remote branch ref to use for the CL.
4598
4599 Args:
4600 remote (str): The git remote for the CL.
4601 remote_branch (str): The git remote branch for the CL.
4602 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004603 """
4604 if not (remote and remote_branch):
4605 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004606
wittman@chromium.org455dc922015-01-26 20:15:50 +00004607 if target_branch:
4608 # Cannonicalize branch references to the equivalent local full symbolic
4609 # refs, which are then translated into the remote full symbolic refs
4610 # below.
4611 if '/' not in target_branch:
4612 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4613 else:
4614 prefix_replacements = (
4615 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4616 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4617 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4618 )
4619 match = None
4620 for regex, replacement in prefix_replacements:
4621 match = re.search(regex, target_branch)
4622 if match:
4623 remote_branch = target_branch.replace(match.group(0), replacement)
4624 break
4625 if not match:
4626 # This is a branch path but not one we recognize; use as-is.
4627 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004628 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4629 # Handle the refs that need to land in different refs.
4630 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004631
wittman@chromium.org455dc922015-01-26 20:15:50 +00004632 # Create the true path to the remote branch.
4633 # Does the following translation:
4634 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4635 # * refs/remotes/origin/master -> refs/heads/master
4636 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4637 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4638 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4639 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4640 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4641 'refs/heads/')
4642 elif remote_branch.startswith('refs/remotes/branch-heads'):
4643 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004644
wittman@chromium.org455dc922015-01-26 20:15:50 +00004645 return remote_branch
4646
4647
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004648def cleanup_list(l):
4649 """Fixes a list so that comma separated items are put as individual items.
4650
4651 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4652 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4653 """
4654 items = sum((i.split(',') for i in l), [])
4655 stripped_items = (i.strip() for i in items)
4656 return sorted(filter(None, stripped_items))
4657
4658
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004659@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004660def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004661 """Uploads the current changelist to codereview.
4662
4663 Can skip dependency patchset uploads for a branch by running:
4664 git config branch.branch_name.skip-deps-uploads True
4665 To unset run:
4666 git config --unset branch.branch_name.skip-deps-uploads
4667 Can also set the above globally by using the --global flag.
4668 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004669 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4670 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004671 parser.add_option('--bypass-watchlists', action='store_true',
4672 dest='bypass_watchlists',
4673 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004674 parser.add_option('-f', action='store_true', dest='force',
4675 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004676 parser.add_option('--message', '-m', dest='message',
4677 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004678 parser.add_option('-b', '--bug',
4679 help='pre-populate the bug number(s) for this issue. '
4680 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004681 parser.add_option('--message-file', dest='message_file',
4682 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004683 parser.add_option('--title', '-t', dest='title',
4684 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004685 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004686 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004687 help='reviewer email addresses')
4688 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004689 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004690 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004691 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004692 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004693 parser.add_option('--emulate_svn_auto_props',
4694 '--emulate-svn-auto-props',
4695 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004696 dest="emulate_svn_auto_props",
4697 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004698 parser.add_option('-c', '--use-commit-queue', action='store_true',
4699 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004700 parser.add_option('--private', action='store_true',
4701 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004702 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004703 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004704 metavar='TARGET',
4705 help='Apply CL to remote ref TARGET. ' +
4706 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004707 parser.add_option('--squash', action='store_true',
4708 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004709 parser.add_option('--no-squash', action='store_true',
4710 help='Don\'t squash multiple commits into one ' +
4711 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004712 parser.add_option('--topic', default=None,
4713 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004714 parser.add_option('--email', default=None,
4715 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004716 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4717 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004718 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4719 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004720 help='Send the patchset to do a CQ dry run right after '
4721 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004722 parser.add_option('--dependencies', action='store_true',
4723 help='Uploads CLs of all the local branches that depend on '
4724 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004725
rmistry@google.com2dd99862015-06-22 12:22:18 +00004726 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004727 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004728 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004729 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004730 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004731 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004732 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004733
sbc@chromium.org71437c02015-04-09 19:29:40 +00004734 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004735 return 1
4736
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004737 options.reviewers = cleanup_list(options.reviewers)
4738 options.cc = cleanup_list(options.cc)
4739
tandriib80458a2016-06-23 12:20:07 -07004740 if options.message_file:
4741 if options.message:
4742 parser.error('only one of --message and --message-file allowed.')
4743 options.message = gclient_utils.FileRead(options.message_file)
4744 options.message_file = None
4745
tandrii4d0545a2016-07-06 03:56:49 -07004746 if options.cq_dry_run and options.use_commit_queue:
4747 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4748
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004749 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4750 settings.GetIsGerrit()
4751
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004752 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004753 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004754
4755
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004756@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004757def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004758 """DEPRECATED: Used to commit the current changelist via git-svn."""
4759 message = ('git-cl no longer supports committing to SVN repositories via '
4760 'git-svn. You probably want to use `git cl land` instead.')
4761 print(message)
4762 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004763
4764
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004765# Two special branches used by git cl land.
4766MERGE_BRANCH = 'git-cl-commit'
4767CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4768
4769
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004770@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004771def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004772 """Commits the current changelist via git.
4773
4774 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4775 upstream and closes the issue automatically and atomically.
4776
4777 Otherwise (in case of Rietveld):
4778 Squashes branch into a single commit.
4779 Updates commit message with metadata (e.g. pointer to review).
4780 Pushes the code upstream.
4781 Updates review and closes.
4782 """
4783 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4784 help='bypass upload presubmit hook')
4785 parser.add_option('-m', dest='message',
4786 help="override review description")
4787 parser.add_option('-f', action='store_true', dest='force',
4788 help="force yes to questions (don't prompt)")
4789 parser.add_option('-c', dest='contributor',
4790 help="external contributor for patch (appended to " +
4791 "description and used as author for git). Should be " +
4792 "formatted as 'First Last <email@example.com>'")
4793 add_git_similarity(parser)
4794 auth.add_auth_options(parser)
4795 (options, args) = parser.parse_args(args)
4796 auth_config = auth.extract_auth_config_from_options(options)
4797
4798 cl = Changelist(auth_config=auth_config)
4799
4800 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4801 if cl.IsGerrit():
4802 if options.message:
4803 # This could be implemented, but it requires sending a new patch to
4804 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4805 # Besides, Gerrit has the ability to change the commit message on submit
4806 # automatically, thus there is no need to support this option (so far?).
4807 parser.error('-m MESSAGE option is not supported for Gerrit.')
4808 if options.contributor:
4809 parser.error(
4810 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4811 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4812 'the contributor\'s "name <email>". If you can\'t upload such a '
4813 'commit for review, contact your repository admin and request'
4814 '"Forge-Author" permission.')
4815 if not cl.GetIssue():
4816 DieWithError('You must upload the change first to Gerrit.\n'
4817 ' If you would rather have `git cl land` upload '
4818 'automatically for you, see http://crbug.com/642759')
4819 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4820 options.verbose)
4821
4822 current = cl.GetBranch()
4823 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4824 if remote == '.':
4825 print()
4826 print('Attempting to push branch %r into another local branch!' % current)
4827 print()
4828 print('Either reparent this branch on top of origin/master:')
4829 print(' git reparent-branch --root')
4830 print()
4831 print('OR run `git rebase-update` if you think the parent branch is ')
4832 print('already committed.')
4833 print()
4834 print(' Current parent: %r' % upstream_branch)
4835 return 1
4836
4837 if not args:
4838 # Default to merging against our best guess of the upstream branch.
4839 args = [cl.GetUpstreamBranch()]
4840
4841 if options.contributor:
4842 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4843 print("Please provide contibutor as 'First Last <email@example.com>'")
4844 return 1
4845
4846 base_branch = args[0]
4847
4848 if git_common.is_dirty_git_tree('land'):
4849 return 1
4850
4851 # This rev-list syntax means "show all commits not in my branch that
4852 # are in base_branch".
4853 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4854 base_branch]).splitlines()
4855 if upstream_commits:
4856 print('Base branch "%s" has %d commits '
4857 'not in this branch.' % (base_branch, len(upstream_commits)))
4858 print('Run "git merge %s" before attempting to land.' % base_branch)
4859 return 1
4860
4861 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4862 if not options.bypass_hooks:
4863 author = None
4864 if options.contributor:
4865 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4866 hook_results = cl.RunHook(
4867 committing=True,
4868 may_prompt=not options.force,
4869 verbose=options.verbose,
4870 change=cl.GetChange(merge_base, author))
4871 if not hook_results.should_continue():
4872 return 1
4873
4874 # Check the tree status if the tree status URL is set.
4875 status = GetTreeStatus()
4876 if 'closed' == status:
4877 print('The tree is closed. Please wait for it to reopen. Use '
4878 '"git cl land --bypass-hooks" to commit on a closed tree.')
4879 return 1
4880 elif 'unknown' == status:
4881 print('Unable to determine tree status. Please verify manually and '
4882 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4883 return 1
4884
4885 change_desc = ChangeDescription(options.message)
4886 if not change_desc.description and cl.GetIssue():
4887 change_desc = ChangeDescription(cl.GetDescription())
4888
4889 if not change_desc.description:
4890 if not cl.GetIssue() and options.bypass_hooks:
4891 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4892 else:
4893 print('No description set.')
4894 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4895 return 1
4896
4897 # Keep a separate copy for the commit message, because the commit message
4898 # contains the link to the Rietveld issue, while the Rietveld message contains
4899 # the commit viewvc url.
4900 if cl.GetIssue():
4901 change_desc.update_reviewers(cl.GetApprovingReviewers())
4902
4903 commit_desc = ChangeDescription(change_desc.description)
4904 if cl.GetIssue():
4905 # Xcode won't linkify this URL unless there is a non-whitespace character
4906 # after it. Add a period on a new line to circumvent this. Also add a space
4907 # before the period to make sure that Gitiles continues to correctly resolve
4908 # the URL.
4909 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4910 if options.contributor:
4911 commit_desc.append_footer('Patch from %s.' % options.contributor)
4912
4913 print('Description:')
4914 print(commit_desc.description)
4915
4916 branches = [merge_base, cl.GetBranchRef()]
4917 if not options.force:
4918 print_stats(options.similarity, options.find_copies, branches)
4919
4920 # We want to squash all this branch's commits into one commit with the proper
4921 # description. We do this by doing a "reset --soft" to the base branch (which
4922 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004923 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004924 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4925 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4926 result = RunGitWithCode(showref_cmd)
4927 if result[0] == 0:
4928 RunGit(['branch', '-D', branch])
4929
4930 # We might be in a directory that's present in this branch but not in the
4931 # trunk. Move up to the top of the tree so that git commands that expect a
4932 # valid CWD won't fail after we check out the merge branch.
4933 rel_base_path = settings.GetRelativeRoot()
4934 if rel_base_path:
4935 os.chdir(rel_base_path)
4936
4937 # Stuff our change into the merge branch.
4938 # We wrap in a try...finally block so if anything goes wrong,
4939 # we clean up the branches.
4940 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004941 revision = None
4942 try:
4943 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4944 RunGit(['reset', '--soft', merge_base])
4945 if options.contributor:
4946 RunGit(
4947 [
4948 'commit', '--author', options.contributor,
4949 '-m', commit_desc.description,
4950 ])
4951 else:
4952 RunGit(['commit', '-m', commit_desc.description])
4953
4954 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4955 mirror = settings.GetGitMirror(remote)
4956 if mirror:
4957 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004958 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004959 else:
4960 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004961 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004962 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4963
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004964 retcode = PushToGitWithAutoRebase(
4965 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004966 if retcode == 0:
4967 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004968 if git_numberer_enabled:
4969 change_desc = ChangeDescription(
4970 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004971 except: # pylint: disable=bare-except
4972 if _IS_BEING_TESTED:
4973 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4974 + '-' * 30 + '8<' + '-' * 30)
4975 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4976 raise
4977 finally:
4978 # And then swap back to the original branch and clean up.
4979 RunGit(['checkout', '-q', cl.GetBranch()])
4980 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004981 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004982
4983 if not revision:
4984 print('Failed to push. If this persists, please file a bug.')
4985 return 1
4986
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004987 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004988 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004989 if viewvc_url and revision:
4990 change_desc.append_footer(
4991 'Committed: %s%s' % (viewvc_url, revision))
4992 elif revision:
4993 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004994 print('Closing issue '
4995 '(you may be prompted for your codereview password)...')
4996 cl.UpdateDescription(change_desc.description)
4997 cl.CloseIssue()
4998 props = cl.GetIssueProperties()
4999 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005000 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5001 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005002 if options.bypass_hooks:
5003 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5004 else:
5005 comment += ' (presubmit successful).'
5006 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5007
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005008 if os.path.isfile(POSTUPSTREAM_HOOK):
5009 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5010
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005011 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005012
5013
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005014def PushToGitWithAutoRebase(remote, branch, original_description,
5015 git_numberer_enabled, max_attempts=3):
5016 """Pushes current HEAD commit on top of remote's branch.
5017
5018 Attempts to fetch and autorebase on push failures.
5019 Adds git number footers on the fly.
5020
5021 Returns integer code from last command.
5022 """
5023 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5024 code = 0
5025 attempts_left = max_attempts
5026 while attempts_left:
5027 attempts_left -= 1
5028 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5029
5030 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5031 # If fetch fails, retry.
5032 print('Fetching %s/%s...' % (remote, branch))
5033 code, out = RunGitWithCode(
5034 ['retry', 'fetch', remote,
5035 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5036 if code:
5037 print('Fetch failed with exit code %d.' % code)
5038 print(out.strip())
5039 continue
5040
5041 print('Cherry-picking commit on top of latest %s' % branch)
5042 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5043 suppress_stderr=True)
5044 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5045 code, out = RunGitWithCode(['cherry-pick', cherry])
5046 if code:
5047 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5048 'the following files have merge conflicts:' %
5049 (branch, parent_hash))
5050 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5051 print('Please rebase your patch and try again.')
5052 RunGitWithCode(['cherry-pick', '--abort'])
5053 break
5054
5055 commit_desc = ChangeDescription(original_description)
5056 if git_numberer_enabled:
5057 logging.debug('Adding git number footers')
5058 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5059 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5060 branch)
5061 # Ensure timestamps are monotonically increasing.
5062 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5063 _get_committer_timestamp('HEAD'))
5064 _git_amend_head(commit_desc.description, timestamp)
5065
5066 code, out = RunGitWithCode(
5067 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5068 print(out)
5069 if code == 0:
5070 break
5071 if IsFatalPushFailure(out):
5072 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005073 'user.email are correct and you have push access to the repo.\n'
5074 'Hint: run command below to diangose common Git/Gerrit credential '
5075 'problems:\n'
5076 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005077 break
5078 return code
5079
5080
5081def IsFatalPushFailure(push_stdout):
5082 """True if retrying push won't help."""
5083 return '(prohibited by Gerrit)' in push_stdout
5084
5085
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005086@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005087def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005088 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005089 parser.add_option('-b', dest='newbranch',
5090 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005091 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005092 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005093 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5094 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005095 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005096 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005097 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005098 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005099 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005100 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005101
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005102
5103 group = optparse.OptionGroup(
5104 parser,
5105 'Options for continuing work on the current issue uploaded from a '
5106 'different clone (e.g. different machine). Must be used independently '
5107 'from the other options. No issue number should be specified, and the '
5108 'branch must have an issue number associated with it')
5109 group.add_option('--reapply', action='store_true', dest='reapply',
5110 help='Reset the branch and reapply the issue.\n'
5111 'CAUTION: This will undo any local changes in this '
5112 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005113
5114 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005115 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005116 parser.add_option_group(group)
5117
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005118 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005119 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005120 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005121 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005122 auth_config = auth.extract_auth_config_from_options(options)
5123
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005124
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005125 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005126 if options.newbranch:
5127 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005128 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005129 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005130
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005131 cl = Changelist(auth_config=auth_config,
5132 codereview=options.forced_codereview)
5133 if not cl.GetIssue():
5134 parser.error('current branch must have an associated issue')
5135
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005136 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005137 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005138 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005139
5140 RunGit(['reset', '--hard', upstream])
5141 if options.pull:
5142 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005143
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005144 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5145 options.directory)
5146
5147 if len(args) != 1 or not args[0]:
5148 parser.error('Must specify issue number or url')
5149
5150 # We don't want uncommitted changes mixed up with the patch.
5151 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005152 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005153
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005154 if options.newbranch:
5155 if options.force:
5156 RunGit(['branch', '-D', options.newbranch],
5157 stderr=subprocess2.PIPE, error_ok=True)
5158 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005159 elif not GetCurrentBranch():
5160 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005161
5162 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
5163
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005164 if cl.IsGerrit():
5165 if options.reject:
5166 parser.error('--reject is not supported with Gerrit codereview.')
5167 if options.nocommit:
5168 parser.error('--nocommit is not supported with Gerrit codereview.')
5169 if options.directory:
5170 parser.error('--directory is not supported with Gerrit codereview.')
5171
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005172 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005173 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005174
5175
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005176def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005177 """Fetches the tree status and returns either 'open', 'closed',
5178 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005179 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005180 if url:
5181 status = urllib2.urlopen(url).read().lower()
5182 if status.find('closed') != -1 or status == '0':
5183 return 'closed'
5184 elif status.find('open') != -1 or status == '1':
5185 return 'open'
5186 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005187 return 'unset'
5188
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005189
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005190def GetTreeStatusReason():
5191 """Fetches the tree status from a json url and returns the message
5192 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005193 url = settings.GetTreeStatusUrl()
5194 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005195 connection = urllib2.urlopen(json_url)
5196 status = json.loads(connection.read())
5197 connection.close()
5198 return status['message']
5199
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005200
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005201def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005202 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005203 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005204 status = GetTreeStatus()
5205 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005206 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005207 return 2
5208
vapiera7fbd5a2016-06-16 09:17:49 -07005209 print('The tree is %s' % status)
5210 print()
5211 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005212 if status != 'open':
5213 return 1
5214 return 0
5215
5216
maruel@chromium.org15192402012-09-06 12:38:29 +00005217def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005218 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005219 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005220 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005221 '-b', '--bot', action='append',
5222 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5223 'times to specify multiple builders. ex: '
5224 '"-b win_rel -b win_layout". See '
5225 'the try server waterfall for the builders name and the tests '
5226 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005227 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005228 '-B', '--bucket', default='',
5229 help=('Buildbucket bucket to send the try requests.'))
5230 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005231 '-m', '--master', default='',
5232 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005233 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005234 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005235 help='Revision to use for the try job; default: the revision will '
5236 'be determined by the try recipe that builder runs, which usually '
5237 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005238 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005239 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005240 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005241 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005242 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005243 '--project',
5244 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005245 'in recipe to determine to which repository or directory to '
5246 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005247 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005248 '-p', '--property', dest='properties', action='append', default=[],
5249 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005250 'key2=value2 etc. The value will be treated as '
5251 'json if decodable, or as string otherwise. '
5252 'NOTE: using this may make your try job not usable for CQ, '
5253 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005254 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005255 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5256 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005257 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005258 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005259 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005260 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005261
machenbach@chromium.org45453142015-09-15 08:45:22 +00005262 # Make sure that all properties are prop=value pairs.
5263 bad_params = [x for x in options.properties if '=' not in x]
5264 if bad_params:
5265 parser.error('Got properties with missing "=": %s' % bad_params)
5266
maruel@chromium.org15192402012-09-06 12:38:29 +00005267 if args:
5268 parser.error('Unknown arguments: %s' % args)
5269
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005270 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005271 if not cl.GetIssue():
5272 parser.error('Need to upload first')
5273
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005274 if cl.IsGerrit():
5275 # HACK: warm up Gerrit change detail cache to save on RPCs.
5276 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5277
tandriie113dfd2016-10-11 10:20:12 -07005278 error_message = cl.CannotTriggerTryJobReason()
5279 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005280 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005281
borenet6c0efe62016-10-19 08:13:29 -07005282 if options.bucket and options.master:
5283 parser.error('Only one of --bucket and --master may be used.')
5284
qyearsley1fdfcb62016-10-24 13:22:03 -07005285 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005286
qyearsleydd49f942016-10-28 11:57:22 -07005287 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5288 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005289 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005290 if options.verbose:
5291 print('git cl try with no bots now defaults to CQ Dry Run.')
5292 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005293
borenet6c0efe62016-10-19 08:13:29 -07005294 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005295 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005296 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005297 'of bot requires an initial job from a parent (usually a builder). '
5298 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005299 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005300 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005301
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005302 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005303 # TODO(tandrii): Checking local patchset against remote patchset is only
5304 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5305 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005306 print('Warning: Codereview server has newer patchsets (%s) than most '
5307 'recent upload from local checkout (%s). Did a previous upload '
5308 'fail?\n'
5309 'By default, git cl try uses the latest patchset from '
5310 'codereview, continuing to use patchset %s.\n' %
5311 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005312
tandrii568043b2016-10-11 07:49:18 -07005313 try:
borenet6c0efe62016-10-19 08:13:29 -07005314 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5315 patchset)
tandrii568043b2016-10-11 07:49:18 -07005316 except BuildbucketResponseException as ex:
5317 print('ERROR: %s' % ex)
5318 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005319 return 0
5320
5321
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005322def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005323 """Prints info about try jobs associated with current CL."""
5324 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005325 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005326 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005327 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005328 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005329 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005330 '--color', action='store_true', default=setup_color.IS_TTY,
5331 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005332 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005333 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5334 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005335 group.add_option(
5336 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005337 parser.add_option_group(group)
5338 auth.add_auth_options(parser)
5339 options, args = parser.parse_args(args)
5340 if args:
5341 parser.error('Unrecognized args: %s' % ' '.join(args))
5342
5343 auth_config = auth.extract_auth_config_from_options(options)
5344 cl = Changelist(auth_config=auth_config)
5345 if not cl.GetIssue():
5346 parser.error('Need to upload first')
5347
tandrii221ab252016-10-06 08:12:04 -07005348 patchset = options.patchset
5349 if not patchset:
5350 patchset = cl.GetMostRecentPatchset()
5351 if not patchset:
5352 parser.error('Codereview doesn\'t know about issue %s. '
5353 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005354 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005355 cl.GetIssue())
5356
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005357 # TODO(tandrii): Checking local patchset against remote patchset is only
5358 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5359 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005360 print('Warning: Codereview server has newer patchsets (%s) than most '
5361 'recent upload from local checkout (%s). Did a previous upload '
5362 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005363 'By default, git cl try-results uses the latest patchset from '
5364 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005365 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005366 try:
tandrii221ab252016-10-06 08:12:04 -07005367 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005368 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005369 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005370 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005371 if options.json:
5372 write_try_results_json(options.json, jobs)
5373 else:
5374 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005375 return 0
5376
5377
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005378@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005379def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005380 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005381 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005382 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005383 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005384
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005385 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005386 if args:
5387 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005388 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005389 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005390 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005391 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005392
5393 # Clear configured merge-base, if there is one.
5394 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005395 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005396 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005397 return 0
5398
5399
thestig@chromium.org00858c82013-12-02 23:08:03 +00005400def CMDweb(parser, args):
5401 """Opens the current CL in the web browser."""
5402 _, args = parser.parse_args(args)
5403 if args:
5404 parser.error('Unrecognized args: %s' % ' '.join(args))
5405
5406 issue_url = Changelist().GetIssueURL()
5407 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005408 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005409 return 1
5410
5411 webbrowser.open(issue_url)
5412 return 0
5413
5414
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005415def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005416 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005417 parser.add_option('-d', '--dry-run', action='store_true',
5418 help='trigger in dry run mode')
5419 parser.add_option('-c', '--clear', action='store_true',
5420 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005421 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005422 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005423 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005424 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005425 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005426 if args:
5427 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005428 if options.dry_run and options.clear:
5429 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5430
iannuccie53c9352016-08-17 14:40:40 -07005431 cl = Changelist(auth_config=auth_config, issue=options.issue,
5432 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005433 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005434 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005435 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005436 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005437 state = _CQState.DRY_RUN
5438 else:
5439 state = _CQState.COMMIT
5440 if not cl.GetIssue():
5441 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005442 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005443 return 0
5444
5445
groby@chromium.org411034a2013-02-26 15:12:01 +00005446def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005447 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005448 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005449 auth.add_auth_options(parser)
5450 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005451 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005452 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005453 if args:
5454 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005455 cl = Changelist(auth_config=auth_config, issue=options.issue,
5456 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005457 # Ensure there actually is an issue to close.
5458 cl.GetDescription()
5459 cl.CloseIssue()
5460 return 0
5461
5462
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005463def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005464 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005465 parser.add_option(
5466 '--stat',
5467 action='store_true',
5468 dest='stat',
5469 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005470 auth.add_auth_options(parser)
5471 options, args = parser.parse_args(args)
5472 auth_config = auth.extract_auth_config_from_options(options)
5473 if args:
5474 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005475
5476 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005477 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005478 # Staged changes would be committed along with the patch from last
5479 # upload, hence counted toward the "last upload" side in the final
5480 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005481 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005482 return 1
5483
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005484 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005485 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005486 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005487 if not issue:
5488 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005489 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005490 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005491
5492 # Create a new branch based on the merge-base
5493 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005494 # Clear cached branch in cl object, to avoid overwriting original CL branch
5495 # properties.
5496 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005497 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005498 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005499 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005500 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005501 return rtn
5502
wychen@chromium.org06928532015-02-03 02:11:29 +00005503 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005504 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005505 cmd = ['git', 'diff']
5506 if options.stat:
5507 cmd.append('--stat')
5508 cmd.extend([TMP_BRANCH, branch, '--'])
5509 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005510 finally:
5511 RunGit(['checkout', '-q', branch])
5512 RunGit(['branch', '-D', TMP_BRANCH])
5513
5514 return 0
5515
5516
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005517def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005518 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005519 parser.add_option(
5520 '--no-color',
5521 action='store_true',
5522 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005523 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005524 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005525 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005526
5527 author = RunGit(['config', 'user.email']).strip() or None
5528
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005529 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005530
5531 if args:
5532 if len(args) > 1:
5533 parser.error('Unknown args')
5534 base_branch = args[0]
5535 else:
5536 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005537 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005538
5539 change = cl.GetChange(base_branch, None)
5540 return owners_finder.OwnersFinder(
5541 [f.LocalPath() for f in
5542 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005543 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005544 author, fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005545 disable_color=options.no_color).run()
5546
5547
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005548def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005549 """Generates a diff command."""
5550 # Generate diff for the current branch's changes.
5551 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005552 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005553
5554 if args:
5555 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005556 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005557 diff_cmd.append(arg)
5558 else:
5559 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005560
5561 return diff_cmd
5562
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005563
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005564def MatchingFileType(file_name, extensions):
5565 """Returns true if the file name ends with one of the given extensions."""
5566 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005567
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005568
enne@chromium.org555cfe42014-01-29 18:21:39 +00005569@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005570def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005571 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005572 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005573 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005574 parser.add_option('--full', action='store_true',
5575 help='Reformat the full content of all touched files')
5576 parser.add_option('--dry-run', action='store_true',
5577 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005578 parser.add_option('--python', action='store_true',
5579 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005580 parser.add_option('--js', action='store_true',
5581 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005582 parser.add_option('--diff', action='store_true',
5583 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005584 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005585
Daniel Chengc55eecf2016-12-30 03:11:02 -08005586 # Normalize any remaining args against the current path, so paths relative to
5587 # the current directory are still resolved as expected.
5588 args = [os.path.join(os.getcwd(), arg) for arg in args]
5589
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005590 # git diff generates paths against the root of the repository. Change
5591 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005592 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005593 if rel_base_path:
5594 os.chdir(rel_base_path)
5595
digit@chromium.org29e47272013-05-17 17:01:46 +00005596 # Grab the merge-base commit, i.e. the upstream commit of the current
5597 # branch when it was created or the last time it was rebased. This is
5598 # to cover the case where the user may have called "git fetch origin",
5599 # moving the origin branch to a newer commit, but hasn't rebased yet.
5600 upstream_commit = None
5601 cl = Changelist()
5602 upstream_branch = cl.GetUpstreamBranch()
5603 if upstream_branch:
5604 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5605 upstream_commit = upstream_commit.strip()
5606
5607 if not upstream_commit:
5608 DieWithError('Could not find base commit for this branch. '
5609 'Are you in detached state?')
5610
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005611 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5612 diff_output = RunGit(changed_files_cmd)
5613 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005614 # Filter out files deleted by this CL
5615 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005616
Christopher Lamc5ba6922017-01-24 11:19:14 +11005617 if opts.js:
5618 CLANG_EXTS.append('.js')
5619
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005620 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5621 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5622 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005623 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005624
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005625 top_dir = os.path.normpath(
5626 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5627
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005628 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5629 # formatted. This is used to block during the presubmit.
5630 return_value = 0
5631
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005632 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005633 # Locate the clang-format binary in the checkout
5634 try:
5635 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005636 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005637 DieWithError(e)
5638
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005639 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005640 cmd = [clang_format_tool]
5641 if not opts.dry_run and not opts.diff:
5642 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005643 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005644 if opts.diff:
5645 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005646 else:
5647 env = os.environ.copy()
5648 env['PATH'] = str(os.path.dirname(clang_format_tool))
5649 try:
5650 script = clang_format.FindClangFormatScriptInChromiumTree(
5651 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005652 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005653 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005654
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005655 cmd = [sys.executable, script, '-p0']
5656 if not opts.dry_run and not opts.diff:
5657 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005658
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005659 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5660 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005661
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005662 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5663 if opts.diff:
5664 sys.stdout.write(stdout)
5665 if opts.dry_run and len(stdout) > 0:
5666 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005667
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005668 # Similar code to above, but using yapf on .py files rather than clang-format
5669 # on C/C++ files
5670 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005671 yapf_tool = gclient_utils.FindExecutable('yapf')
5672 if yapf_tool is None:
5673 DieWithError('yapf not found in PATH')
5674
5675 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005676 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005677 cmd = [yapf_tool]
5678 if not opts.dry_run and not opts.diff:
5679 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005680 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005681 if opts.diff:
5682 sys.stdout.write(stdout)
5683 else:
5684 # TODO(sbc): yapf --lines mode still has some issues.
5685 # https://github.com/google/yapf/issues/154
5686 DieWithError('--python currently only works with --full')
5687
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005688 # Dart's formatter does not have the nice property of only operating on
5689 # modified chunks, so hard code full.
5690 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005691 try:
5692 command = [dart_format.FindDartFmtToolInChromiumTree()]
5693 if not opts.dry_run and not opts.diff:
5694 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005695 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005696
ppi@chromium.org6593d932016-03-03 15:41:15 +00005697 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005698 if opts.dry_run and stdout:
5699 return_value = 2
5700 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005701 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5702 'found in this checkout. Files in other languages are still '
5703 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005704
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005705 # Format GN build files. Always run on full build files for canonical form.
5706 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005707 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005708 if opts.dry_run or opts.diff:
5709 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005710 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005711 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5712 shell=sys.platform == 'win32',
5713 cwd=top_dir)
5714 if opts.dry_run and gn_ret == 2:
5715 return_value = 2 # Not formatted.
5716 elif opts.diff and gn_ret == 2:
5717 # TODO this should compute and print the actual diff.
5718 print("This change has GN build file diff for " + gn_diff_file)
5719 elif gn_ret != 0:
5720 # For non-dry run cases (and non-2 return values for dry-run), a
5721 # nonzero error code indicates a failure, probably because the file
5722 # doesn't parse.
5723 DieWithError("gn format failed on " + gn_diff_file +
5724 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005725
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005726 metrics_xml_files = [
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005727 os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
5728 os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
5729 os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005730 for xml_file in metrics_xml_files:
5731 if xml_file in diff_files:
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005732 tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
5733 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005734 if opts.dry_run or opts.diff:
5735 cmd.append('--diff')
5736 stdout = RunCommand(cmd, cwd=top_dir)
5737 if opts.diff:
5738 sys.stdout.write(stdout)
5739 if opts.dry_run and stdout:
5740 return_value = 2 # Not formatted.
5741
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005742 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005743
5744
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005745@subcommand.usage('<codereview url or issue id>')
5746def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005747 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005748 _, args = parser.parse_args(args)
5749
5750 if len(args) != 1:
5751 parser.print_help()
5752 return 1
5753
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005754 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005755 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005756 parser.error('invalid codereview url or CL id')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005757 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005758 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005759
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005760 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005761 output = RunGit(['config', '--local', '--get-regexp',
5762 r'branch\..*\.%s' % issueprefix],
5763 error_ok=True)
5764 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005765 if issue == target_issue:
5766 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005767
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005768 branches = []
5769 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005770 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005771 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005772 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005773 return 1
5774 if len(branches) == 1:
5775 RunGit(['checkout', branches[0]])
5776 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005777 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005778 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005779 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005780 which = raw_input('Choose by index: ')
5781 try:
5782 RunGit(['checkout', branches[int(which)]])
5783 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005784 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005785 return 1
5786
5787 return 0
5788
5789
maruel@chromium.org29404b52014-09-08 22:58:00 +00005790def CMDlol(parser, args):
5791 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005792 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005793 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5794 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5795 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005796 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005797 return 0
5798
5799
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005800class OptionParser(optparse.OptionParser):
5801 """Creates the option parse and add --verbose support."""
5802 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005803 optparse.OptionParser.__init__(
5804 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005805 self.add_option(
5806 '-v', '--verbose', action='count', default=0,
5807 help='Use 2 times for more debugging info')
5808
5809 def parse_args(self, args=None, values=None):
5810 options, args = optparse.OptionParser.parse_args(self, args, values)
5811 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005812 logging.basicConfig(
5813 level=levels[min(options.verbose, len(levels) - 1)],
5814 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5815 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005816 return options, args
5817
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005818
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005819def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005820 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005821 print('\nYour python version %s is unsupported, please upgrade.\n' %
5822 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005823 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005824
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005825 # Reload settings.
5826 global settings
5827 settings = Settings()
5828
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005829 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005830 dispatcher = subcommand.CommandDispatcher(__name__)
5831 try:
5832 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005833 except auth.AuthenticationError as e:
5834 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005835 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005836 if e.code != 500:
5837 raise
5838 DieWithError(
5839 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5840 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005841 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005842
5843
5844if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005845 # These affect sys.stdout so do it outside of main() to simplify mocks in
5846 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005847 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005848 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005849 try:
5850 sys.exit(main(sys.argv[1:]))
5851 except KeyboardInterrupt:
5852 sys.stderr.write('interrupted\n')
5853 sys.exit(1)