blob: c556efd4bba5a7ead2a19d321ece6a952cbe00c3 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
38try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080039 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000040except ImportError:
41 pass
42
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000043from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000044from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000045from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000046import auth
skobes6468b902016-10-24 08:45:10 -070047import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000048import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000049import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000050import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000051import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000052import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000053import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000054import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000056import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000057import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000058import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000060import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000062import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000063import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064import watchlists
65
tandrii7400cf02016-06-21 08:48:07 -070066__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000067
tandrii9d2c7a32016-06-22 03:42:45 -070068COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070069DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080070POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000071DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000072REFS_THAT_ALIAS_TO_OTHER_REFS = {
73 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
74 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
75}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000076
thestig@chromium.org44202a22014-03-11 19:22:18 +000077# Valid extensions for files we want to lint.
78DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
79DEFAULT_LINT_IGNORE_REGEX = r"$^"
80
borenet6c0efe62016-10-19 08:13:29 -070081# Buildbucket master name prefix.
82MASTER_PREFIX = 'master.'
83
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000084# Shortcut since it quickly becomes redundant.
85Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000086
maruel@chromium.orgddd59412011-11-30 14:20:38 +000087# Initialized in main()
88settings = None
89
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010090# Used by tests/git_cl_test.py to add extra logging.
91# Inside the weirdly failing test, add this:
92# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
93# And scroll up to see the strack trace printed.
94_IS_BEING_TESTED = False
95
maruel@chromium.orgddd59412011-11-30 14:20:38 +000096
Christopher Lamf732cd52017-01-24 12:40:11 +110097def DieWithError(message, change_desc=None):
98 if change_desc:
99 SaveDescriptionBackup(change_desc)
100
vapiera7fbd5a2016-06-16 09:17:49 -0700101 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102 sys.exit(1)
103
104
Christopher Lamf732cd52017-01-24 12:40:11 +1100105def SaveDescriptionBackup(change_desc):
106 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
107 print('\nError after CL description prompt -- saving description to %s\n' %
108 backup_path)
109 backup_file = open(backup_path, 'w')
110 backup_file.write(change_desc.description)
111 backup_file.close()
112
113
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000114def GetNoGitPagerEnv():
115 env = os.environ.copy()
116 # 'cat' is a magical git string that disables pagers on all platforms.
117 env['GIT_PAGER'] = 'cat'
118 return env
119
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000120
bsep@chromium.org627d9002016-04-29 00:00:52 +0000121def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000122 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000123 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000124 except subprocess2.CalledProcessError as e:
125 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000126 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000127 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000128 'Command "%s" failed.\n%s' % (
129 ' '.join(args), error_message or e.stdout or ''))
130 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131
132
133def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000134 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000135 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000136
137
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000138def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000139 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700140 if suppress_stderr:
141 stderr = subprocess2.VOID
142 else:
143 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000144 try:
tandrii5d48c322016-08-18 16:19:37 -0700145 (out, _), code = subprocess2.communicate(['git'] + args,
146 env=GetNoGitPagerEnv(),
147 stdout=subprocess2.PIPE,
148 stderr=stderr)
149 return code, out
150 except subprocess2.CalledProcessError as e:
151 logging.debug('Failed running %s', args)
152 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000153
154
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000155def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000156 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000157 return RunGitWithCode(args, suppress_stderr=True)[1]
158
159
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000160def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000161 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000162 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000163 return (version.startswith(prefix) and
164 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000165
166
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000167def BranchExists(branch):
168 """Return True if specified branch exists."""
169 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
170 suppress_stderr=True)
171 return not code
172
173
tandrii2a16b952016-10-19 07:09:44 -0700174def time_sleep(seconds):
175 # Use this so that it can be mocked in tests without interfering with python
176 # system machinery.
177 import time # Local import to discourage others from importing time globally.
178 return time.sleep(seconds)
179
180
maruel@chromium.org90541732011-04-01 17:54:18 +0000181def ask_for_data(prompt):
182 try:
183 return raw_input(prompt)
184 except KeyboardInterrupt:
185 # Hide the exception.
186 sys.exit(1)
187
188
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100189def confirm_or_exit(prefix='', action='confirm'):
190 """Asks user to press enter to continue or press Ctrl+C to abort."""
191 if not prefix or prefix.endswith('\n'):
192 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100193 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100194 mid = ' Press'
195 elif prefix.endswith(' '):
196 mid = 'press'
197 else:
198 mid = ' press'
199 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
200
201
202def ask_for_explicit_yes(prompt):
203 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
204 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
205 while True:
206 if 'yes'.startswith(result):
207 return True
208 if 'no'.startswith(result):
209 return False
210 result = ask_for_data('Please, type yes or no: ').lower()
211
212
tandrii5d48c322016-08-18 16:19:37 -0700213def _git_branch_config_key(branch, key):
214 """Helper method to return Git config key for a branch."""
215 assert branch, 'branch name is required to set git config for it'
216 return 'branch.%s.%s' % (branch, key)
217
218
219def _git_get_branch_config_value(key, default=None, value_type=str,
220 branch=False):
221 """Returns git config value of given or current branch if any.
222
223 Returns default in all other cases.
224 """
225 assert value_type in (int, str, bool)
226 if branch is False: # Distinguishing default arg value from None.
227 branch = GetCurrentBranch()
228
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000229 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700230 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000231
tandrii5d48c322016-08-18 16:19:37 -0700232 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700233 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700234 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700235 # git config also has --int, but apparently git config suffers from integer
236 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700237 args.append(_git_branch_config_key(branch, key))
238 code, out = RunGitWithCode(args)
239 if code == 0:
240 value = out.strip()
241 if value_type == int:
242 return int(value)
243 if value_type == bool:
244 return bool(value.lower() == 'true')
245 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000246 return default
247
248
tandrii5d48c322016-08-18 16:19:37 -0700249def _git_set_branch_config_value(key, value, branch=None, **kwargs):
250 """Sets the value or unsets if it's None of a git branch config.
251
252 Valid, though not necessarily existing, branch must be provided,
253 otherwise currently checked out branch is used.
254 """
255 if not branch:
256 branch = GetCurrentBranch()
257 assert branch, 'a branch name OR currently checked out branch is required'
258 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700259 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700260 if value is None:
261 args.append('--unset')
262 elif isinstance(value, bool):
263 args.append('--bool')
264 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700265 else:
tandrii33a46ff2016-08-23 05:53:40 -0700266 # git config also has --int, but apparently git config suffers from integer
267 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700268 value = str(value)
269 args.append(_git_branch_config_key(branch, key))
270 if value is not None:
271 args.append(value)
272 RunGit(args, **kwargs)
273
274
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100275def _get_committer_timestamp(commit):
276 """Returns unix timestamp as integer of a committer in a commit.
277
278 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
279 """
280 # Git also stores timezone offset, but it only affects visual display,
281 # actual point in time is defined by this timestamp only.
282 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
283
284
285def _git_amend_head(message, committer_timestamp):
286 """Amends commit with new message and desired committer_timestamp.
287
288 Sets committer timezone to UTC.
289 """
290 env = os.environ.copy()
291 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
292 return RunGit(['commit', '--amend', '-m', message], env=env)
293
294
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000295def add_git_similarity(parser):
296 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700297 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000298 help='Sets the percentage that a pair of files need to match in order to'
299 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000300 parser.add_option(
301 '--find-copies', action='store_true',
302 help='Allows git to look for copies.')
303 parser.add_option(
304 '--no-find-copies', action='store_false', dest='find_copies',
305 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000306
307 old_parser_args = parser.parse_args
308 def Parse(args):
309 options, args = old_parser_args(args)
310
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000311 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700312 options.similarity = _git_get_branch_config_value(
313 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000315 print('Note: Saving similarity of %d%% in git config.'
316 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700317 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000318
iannucci@chromium.org79540052012-10-19 23:15:26 +0000319 options.similarity = max(0, min(options.similarity, 100))
320
321 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700322 options.find_copies = _git_get_branch_config_value(
323 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000324 else:
tandrii5d48c322016-08-18 16:19:37 -0700325 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000326
327 print('Using %d%% similarity for rename/copy detection. '
328 'Override with --similarity.' % options.similarity)
329
330 return options, args
331 parser.parse_args = Parse
332
333
machenbach@chromium.org45453142015-09-15 08:45:22 +0000334def _get_properties_from_options(options):
335 properties = dict(x.split('=', 1) for x in options.properties)
336 for key, val in properties.iteritems():
337 try:
338 properties[key] = json.loads(val)
339 except ValueError:
340 pass # If a value couldn't be evaluated, treat it as a string.
341 return properties
342
343
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000344def _prefix_master(master):
345 """Convert user-specified master name to full master name.
346
347 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
348 name, while the developers always use shortened master name
349 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
350 function does the conversion for buildbucket migration.
351 """
borenet6c0efe62016-10-19 08:13:29 -0700352 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000353 return master
borenet6c0efe62016-10-19 08:13:29 -0700354 return '%s%s' % (MASTER_PREFIX, master)
355
356
357def _unprefix_master(bucket):
358 """Convert bucket name to shortened master name.
359
360 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
361 name, while the developers always use shortened master name
362 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
363 function does the conversion for buildbucket migration.
364 """
365 if bucket.startswith(MASTER_PREFIX):
366 return bucket[len(MASTER_PREFIX):]
367 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000368
369
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370def _buildbucket_retry(operation_name, http, *args, **kwargs):
371 """Retries requests to buildbucket service and returns parsed json content."""
372 try_count = 0
373 while True:
374 response, content = http.request(*args, **kwargs)
375 try:
376 content_json = json.loads(content)
377 except ValueError:
378 content_json = None
379
380 # Buildbucket could return an error even if status==200.
381 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000382 error = content_json.get('error')
383 if error.get('code') == 403:
384 raise BuildbucketResponseException(
385 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000386 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000387 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000388 raise BuildbucketResponseException(msg)
389
390 if response.status == 200:
391 if not content_json:
392 raise BuildbucketResponseException(
393 'Buildbucket returns invalid json content: %s.\n'
394 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
395 content)
396 return content_json
397 if response.status < 500 or try_count >= 2:
398 raise httplib2.HttpLib2Error(content)
399
400 # status >= 500 means transient failures.
401 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700402 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 try_count += 1
404 assert False, 'unreachable'
405
406
qyearsley1fdfcb62016-10-24 13:22:03 -0700407def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700408 """Returns a dict mapping bucket names to builders and tests,
409 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 """
qyearsleydd49f942016-10-28 11:57:22 -0700411 # If no bots are listed, we try to get a set of builders and tests based
412 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 if not options.bot:
414 change = changelist.GetChange(
415 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700416 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700417 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 change=change,
419 changed_files=change.LocalPaths(),
420 repository_root=settings.GetRoot(),
421 default_presubmit=None,
422 project=None,
423 verbose=options.verbose,
424 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700425 if masters is None:
426 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100427 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700428
qyearsley1fdfcb62016-10-24 13:22:03 -0700429 if options.bucket:
430 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700431 if options.master:
432 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700433
qyearsleydd49f942016-10-28 11:57:22 -0700434 # If bots are listed but no master or bucket, then we need to find out
435 # the corresponding master for each bot.
436 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
437 if error_message:
438 option_parser.error(
439 'Tryserver master cannot be found because: %s\n'
440 'Please manually specify the tryserver master, e.g. '
441 '"-m tryserver.chromium.linux".' % error_message)
442 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700443
444
qyearsley123a4682016-10-26 09:12:17 -0700445def _get_bucket_map_for_builders(builders):
446 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700447 map_url = 'https://builders-map.appspot.com/'
448 try:
qyearsley123a4682016-10-26 09:12:17 -0700449 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700450 except urllib2.URLError as e:
451 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
452 (map_url, e))
453 except ValueError as e:
454 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700455 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 return None, 'Failed to build master map.'
457
qyearsley123a4682016-10-26 09:12:17 -0700458 bucket_map = {}
459 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700460 masters = builders_map.get(builder, [])
461 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700463 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700464 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700465 (builder, masters))
466 bucket = _prefix_master(masters[0])
467 bucket_map.setdefault(bucket, {})[builder] = []
468
469 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700470
471
borenet6c0efe62016-10-19 08:13:29 -0700472def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700473 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700474 """Sends a request to Buildbucket to trigger try jobs for a changelist.
475
476 Args:
477 auth_config: AuthConfig for Rietveld.
478 changelist: Changelist that the try jobs are associated with.
479 buckets: A nested dict mapping bucket names to builders to tests.
480 options: Command-line options.
481 """
tandriide281ae2016-10-12 06:02:30 -0700482 assert changelist.GetIssue(), 'CL must be uploaded first'
483 codereview_url = changelist.GetCodereviewServer()
484 assert codereview_url, 'CL must be uploaded first'
485 patchset = patchset or changelist.GetMostRecentPatchset()
486 assert patchset, 'CL must be uploaded first'
487
488 codereview_host = urlparse.urlparse(codereview_url).hostname
489 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000490 http = authenticator.authorize(httplib2.Http())
491 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700492
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493 buildbucket_put_url = (
494 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000495 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700496 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
497 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
498 hostname=codereview_host,
499 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700501
502 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
503 shared_parameters_properties['category'] = category
504 if options.clobber:
505 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700506 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700507 if extra_properties:
508 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000509
510 batch_req_body = {'builds': []}
511 print_text = []
512 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700513 for bucket, builders_and_tests in sorted(buckets.iteritems()):
514 print_text.append('Bucket: %s' % bucket)
515 master = None
516 if bucket.startswith(MASTER_PREFIX):
517 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000518 for builder, tests in sorted(builders_and_tests.iteritems()):
519 print_text.append(' %s: %s' % (builder, tests))
520 parameters = {
521 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000522 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100523 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000524 'revision': options.revision,
525 }],
tandrii8c5a3532016-11-04 07:52:02 -0700526 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000527 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000528 if 'presubmit' in builder.lower():
529 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000530 if tests:
531 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700532
533 tags = [
534 'builder:%s' % builder,
535 'buildset:%s' % buildset,
536 'user_agent:git_cl_try',
537 ]
538 if master:
539 parameters['properties']['master'] = master
540 tags.append('master:%s' % master)
541
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000542 batch_req_body['builds'].append(
543 {
544 'bucket': bucket,
545 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700547 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000548 }
549 )
550
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700552 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 http,
554 buildbucket_put_url,
555 'PUT',
556 body=json.dumps(batch_req_body),
557 headers={'Content-Type': 'application/json'}
558 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000559 print_text.append('To see results here, run: git cl try-results')
560 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700561 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000562
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000563
tandrii221ab252016-10-06 08:12:04 -0700564def fetch_try_jobs(auth_config, changelist, buildbucket_host,
565 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700566 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
qyearsley53f48a12016-09-01 10:45:13 -0700568 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 """
tandrii221ab252016-10-06 08:12:04 -0700570 assert buildbucket_host
571 assert changelist.GetIssue(), 'CL must be uploaded first'
572 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
573 patchset = patchset or changelist.GetMostRecentPatchset()
574 assert patchset, 'CL must be uploaded first'
575
576 codereview_url = changelist.GetCodereviewServer()
577 codereview_host = urlparse.urlparse(codereview_url).hostname
578 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 if authenticator.has_cached_credentials():
580 http = authenticator.authorize(httplib2.Http())
581 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700582 print('Warning: Some results might be missing because %s' %
583 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700584 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 http = httplib2.Http()
586
587 http.force_exception_to_status_code = True
588
tandrii221ab252016-10-06 08:12:04 -0700589 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
590 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
591 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700593 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 params = {'tag': 'buildset:%s' % buildset}
595
596 builds = {}
597 while True:
598 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700599 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700601 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000602 for build in content.get('builds', []):
603 builds[build['id']] = build
604 if 'next_cursor' in content:
605 params['start_cursor'] = content['next_cursor']
606 else:
607 break
608 return builds
609
610
qyearsleyeab3c042016-08-24 09:18:28 -0700611def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 """Prints nicely result of fetch_try_jobs."""
613 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700614 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 return
616
617 # Make a copy, because we'll be modifying builds dictionary.
618 builds = builds.copy()
619 builder_names_cache = {}
620
621 def get_builder(b):
622 try:
623 return builder_names_cache[b['id']]
624 except KeyError:
625 try:
626 parameters = json.loads(b['parameters_json'])
627 name = parameters['builder_name']
628 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700629 print('WARNING: failed to get builder name for build %s: %s' % (
630 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 name = None
632 builder_names_cache[b['id']] = name
633 return name
634
635 def get_bucket(b):
636 bucket = b['bucket']
637 if bucket.startswith('master.'):
638 return bucket[len('master.'):]
639 return bucket
640
641 if options.print_master:
642 name_fmt = '%%-%ds %%-%ds' % (
643 max(len(str(get_bucket(b))) for b in builds.itervalues()),
644 max(len(str(get_builder(b))) for b in builds.itervalues()))
645 def get_name(b):
646 return name_fmt % (get_bucket(b), get_builder(b))
647 else:
648 name_fmt = '%%-%ds' % (
649 max(len(str(get_builder(b))) for b in builds.itervalues()))
650 def get_name(b):
651 return name_fmt % get_builder(b)
652
653 def sort_key(b):
654 return b['status'], b.get('result'), get_name(b), b.get('url')
655
656 def pop(title, f, color=None, **kwargs):
657 """Pop matching builds from `builds` dict and print them."""
658
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000659 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 colorize = str
661 else:
662 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
663
664 result = []
665 for b in builds.values():
666 if all(b.get(k) == v for k, v in kwargs.iteritems()):
667 builds.pop(b['id'])
668 result.append(b)
669 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700670 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700672 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674 total = len(builds)
675 pop(status='COMPLETED', result='SUCCESS',
676 title='Successes:', color=Fore.GREEN,
677 f=lambda b: (get_name(b), b.get('url')))
678 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
679 title='Infra Failures:', color=Fore.MAGENTA,
680 f=lambda b: (get_name(b), b.get('url')))
681 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
682 title='Failures:', color=Fore.RED,
683 f=lambda b: (get_name(b), b.get('url')))
684 pop(status='COMPLETED', result='CANCELED',
685 title='Canceled:', color=Fore.MAGENTA,
686 f=lambda b: (get_name(b),))
687 pop(status='COMPLETED', result='FAILURE',
688 failure_reason='INVALID_BUILD_DEFINITION',
689 title='Wrong master/builder name:', color=Fore.MAGENTA,
690 f=lambda b: (get_name(b),))
691 pop(status='COMPLETED', result='FAILURE',
692 title='Other failures:',
693 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
694 pop(status='COMPLETED',
695 title='Other finished:',
696 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
697 pop(status='STARTED',
698 title='Started:', color=Fore.YELLOW,
699 f=lambda b: (get_name(b), b.get('url')))
700 pop(status='SCHEDULED',
701 title='Scheduled:',
702 f=lambda b: (get_name(b), 'id=%s' % b['id']))
703 # The last section is just in case buildbucket API changes OR there is a bug.
704 pop(title='Other:',
705 f=lambda b: (get_name(b), 'id=%s' % b['id']))
706 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700707 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000708
709
qyearsley53f48a12016-09-01 10:45:13 -0700710def write_try_results_json(output_file, builds):
711 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
712
713 The input |builds| dict is assumed to be generated by Buildbucket.
714 Buildbucket documentation: http://goo.gl/G0s101
715 """
716
717 def convert_build_dict(build):
718 return {
719 'buildbucket_id': build.get('id'),
720 'status': build.get('status'),
721 'result': build.get('result'),
722 'bucket': build.get('bucket'),
723 'builder_name': json.loads(
724 build.get('parameters_json', '{}')).get('builder_name'),
725 'failure_reason': build.get('failure_reason'),
726 'url': build.get('url'),
727 }
728
729 converted = []
730 for _, build in sorted(builds.items()):
731 converted.append(convert_build_dict(build))
732 write_json(output_file, converted)
733
734
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 """Prints statistics about the change to the user."""
737 # --no-ext-diff is broken in some versions of Git, so try to work around
738 # this by overriding the environment (but there is still a problem if the
739 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 if 'GIT_EXTERNAL_DIFF' in env:
742 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
744 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800745 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746 else:
747 similarity_options = ['-M%s' % similarity]
748
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000749 try:
750 stdout = sys.stdout.fileno()
751 except AttributeError:
752 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000755 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000756 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
765 self.default_server = None
766 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000767 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.tree_status_url = None
769 self.viewvc_url = None
770 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000771 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000773 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000775 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000776 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
778 def LazyUpdateIfNeeded(self):
779 """Updates the settings from a codereview.settings file, if available."""
780 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000783 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000784 error_ok=True
785 ).strip().lower()
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 self.updated = True
791
792 def GetDefaultServerUrl(self, error_ok=False):
793 if not self.default_server:
794 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000795 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 if error_ok:
798 return self.default_server
799 if not self.default_server:
800 error_message = ('Could not find settings file. You must configure '
801 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000802 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000803 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804 return self.default_server
805
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 @staticmethod
807 def GetRelativeRoot():
808 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 if self.root is None:
812 self.root = os.path.abspath(self.GetRelativeRoot())
813 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000815 def GetGitMirror(self, remote='origin'):
816 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000817 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000818 if not os.path.isdir(local_url):
819 return None
820 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
821 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100822 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100823 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000824 if mirror.exists():
825 return mirror
826 return None
827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 def GetTreeStatusUrl(self, error_ok=False):
829 if not self.tree_status_url:
830 error_message = ('You must configure your tree status URL by running '
831 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000832 self.tree_status_url = self._GetRietveldConfig(
833 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.tree_status_url
835
836 def GetViewVCUrl(self):
837 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000838 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.viewvc_url
840
rmistry@google.com90752582014-01-14 21:04:50 +0000841 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000842 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000843
rmistry@google.com78948ed2015-07-08 23:09:57 +0000844 def GetIsSkipDependencyUpload(self, branch_name):
845 """Returns true if specified branch should skip dep uploads."""
846 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
847 error_ok=True)
848
rmistry@google.com5626a922015-02-26 14:03:30 +0000849 def GetRunPostUploadHook(self):
850 run_post_upload_hook = self._GetRietveldConfig(
851 'run-post-upload-hook', error_ok=True)
852 return run_post_upload_hook == "True"
853
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000854 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000856
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000858 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000859
ukai@chromium.orge8077812012-02-03 03:41:46 +0000860 def GetIsGerrit(self):
861 """Return true if this repo is assosiated with gerrit code review system."""
862 if self.is_gerrit is None:
863 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
864 return self.is_gerrit
865
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000866 def GetSquashGerritUploads(self):
867 """Return true if uploads to Gerrit should be squashed by default."""
868 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700869 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
870 if self.squash_gerrit_uploads is None:
871 # Default is squash now (http://crbug.com/611892#c23).
872 self.squash_gerrit_uploads = not (
873 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
874 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000875 return self.squash_gerrit_uploads
876
tandriia60502f2016-06-20 02:01:53 -0700877 def GetSquashGerritUploadsOverride(self):
878 """Return True or False if codereview.settings should be overridden.
879
880 Returns None if no override has been defined.
881 """
882 # See also http://crbug.com/611892#c23
883 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
884 error_ok=True).strip()
885 if result == 'true':
886 return True
887 if result == 'false':
888 return False
889 return None
890
tandrii@chromium.org28253532016-04-14 13:46:56 +0000891 def GetGerritSkipEnsureAuthenticated(self):
892 """Return True if EnsureAuthenticated should not be done for Gerrit
893 uploads."""
894 if self.gerrit_skip_ensure_authenticated is None:
895 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000896 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000897 error_ok=True).strip() == 'true')
898 return self.gerrit_skip_ensure_authenticated
899
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000900 def GetGitEditor(self):
901 """Return the editor specified in the git config, or None if none is."""
902 if self.git_editor is None:
903 self.git_editor = self._GetConfig('core.editor', error_ok=True)
904 return self.git_editor or None
905
thestig@chromium.org44202a22014-03-11 19:22:18 +0000906 def GetLintRegex(self):
907 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
908 DEFAULT_LINT_REGEX)
909
910 def GetLintIgnoreRegex(self):
911 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
912 DEFAULT_LINT_IGNORE_REGEX)
913
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000914 def GetProject(self):
915 if not self.project:
916 self.project = self._GetRietveldConfig('project', error_ok=True)
917 return self.project
918
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000919 def _GetRietveldConfig(self, param, **kwargs):
920 return self._GetConfig('rietveld.' + param, **kwargs)
921
rmistry@google.com78948ed2015-07-08 23:09:57 +0000922 def _GetBranchConfig(self, branch_name, param, **kwargs):
923 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
924
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000925 def _GetConfig(self, param, **kwargs):
926 self.LazyUpdateIfNeeded()
927 return RunGit(['config', param], **kwargs).strip()
928
929
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100930@contextlib.contextmanager
931def _get_gerrit_project_config_file(remote_url):
932 """Context manager to fetch and store Gerrit's project.config from
933 refs/meta/config branch and store it in temp file.
934
935 Provides a temporary filename or None if there was error.
936 """
937 error, _ = RunGitWithCode([
938 'fetch', remote_url,
939 '+refs/meta/config:refs/git_cl/meta/config'])
940 if error:
941 # Ref doesn't exist or isn't accessible to current user.
942 print('WARNING: failed to fetch project config for %s: %s' %
943 (remote_url, error))
944 yield None
945 return
946
947 error, project_config_data = RunGitWithCode(
948 ['show', 'refs/git_cl/meta/config:project.config'])
949 if error:
950 print('WARNING: project.config file not found')
951 yield None
952 return
953
954 with gclient_utils.temporary_directory() as tempdir:
955 project_config_file = os.path.join(tempdir, 'project.config')
956 gclient_utils.FileWrite(project_config_file, project_config_data)
957 yield project_config_file
958
959
960def _is_git_numberer_enabled(remote_url, remote_ref):
961 """Returns True if Git Numberer is enabled on this ref."""
962 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100963 KNOWN_PROJECTS_WHITELIST = [
964 'chromium/src',
965 'external/webrtc',
966 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100967 'infra/experimental',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100968 ]
969
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100970 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
971 url_parts = urlparse.urlparse(remote_url)
972 project_name = url_parts.path.lstrip('/').rstrip('git./')
973 for known in KNOWN_PROJECTS_WHITELIST:
974 if project_name.endswith(known):
975 break
976 else:
977 # Early exit to avoid extra fetches for repos that aren't using Git
978 # Numberer.
979 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100980
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100981 with _get_gerrit_project_config_file(remote_url) as project_config_file:
982 if project_config_file is None:
983 # Failed to fetch project.config, which shouldn't happen on open source
984 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100985 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100986 def get_opts(x):
987 code, out = RunGitWithCode(
988 ['config', '-f', project_config_file, '--get-all',
989 'plugin.git-numberer.validate-%s-refglob' % x])
990 if code == 0:
991 return out.strip().splitlines()
992 return []
993 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100994
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100995 logging.info('validator config enabled %s disabled %s refglobs for '
996 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000997
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100998 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100999 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001000 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001001 return True
1002 return False
1003
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001004 if match_refglobs(disabled):
1005 return False
1006 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001007
1008
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001009def ShortBranchName(branch):
1010 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001011 return branch.replace('refs/heads/', '', 1)
1012
1013
1014def GetCurrentBranchRef():
1015 """Returns branch ref (e.g., refs/heads/master) or None."""
1016 return RunGit(['symbolic-ref', 'HEAD'],
1017 stderr=subprocess2.VOID, error_ok=True).strip() or None
1018
1019
1020def GetCurrentBranch():
1021 """Returns current branch or None.
1022
1023 For refs/heads/* branches, returns just last part. For others, full ref.
1024 """
1025 branchref = GetCurrentBranchRef()
1026 if branchref:
1027 return ShortBranchName(branchref)
1028 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029
1030
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001031class _CQState(object):
1032 """Enum for states of CL with respect to Commit Queue."""
1033 NONE = 'none'
1034 DRY_RUN = 'dry_run'
1035 COMMIT = 'commit'
1036
1037 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1038
1039
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001040class _ParsedIssueNumberArgument(object):
1041 def __init__(self, issue=None, patchset=None, hostname=None):
1042 self.issue = issue
1043 self.patchset = patchset
1044 self.hostname = hostname
1045
1046 @property
1047 def valid(self):
1048 return self.issue is not None
1049
1050
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001051def ParseIssueNumberArgument(arg):
1052 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1053 fail_result = _ParsedIssueNumberArgument()
1054
1055 if arg.isdigit():
1056 return _ParsedIssueNumberArgument(issue=int(arg))
1057 if not arg.startswith('http'):
1058 return fail_result
1059 url = gclient_utils.UpgradeToHttps(arg)
1060 try:
1061 parsed_url = urlparse.urlparse(url)
1062 except ValueError:
1063 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001064
1065 results = {}
1066 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1067 parsed = cls.ParseIssueURL(parsed_url)
1068 if parsed is not None:
1069 results[name] = parsed
1070
1071 if not results:
1072 return fail_result
1073 if len(results) == 1:
1074 return results.values()[0]
1075 # Choose Rietveld if there are two.
1076 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001077
1078
Aaron Gablea45ee112016-11-22 15:14:38 -08001079class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001080 def __init__(self, issue, url):
1081 self.issue = issue
1082 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001083 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001084
1085 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001086 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001087 self.issue, self.url)
1088
1089
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001090_CommentSummary = collections.namedtuple(
1091 '_CommentSummary', ['date', 'message', 'sender',
1092 # TODO(tandrii): these two aren't known in Gerrit.
1093 'approval', 'disapproval'])
1094
1095
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001096class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001097 """Changelist works with one changelist in local branch.
1098
1099 Supports two codereview backends: Rietveld or Gerrit, selected at object
1100 creation.
1101
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001102 Notes:
1103 * Not safe for concurrent multi-{thread,process} use.
1104 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001105 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001106 """
1107
1108 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1109 """Create a new ChangeList instance.
1110
1111 If issue is given, the codereview must be given too.
1112
1113 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1114 Otherwise, it's decided based on current configuration of the local branch,
1115 with default being 'rietveld' for backwards compatibility.
1116 See _load_codereview_impl for more details.
1117
1118 **kwargs will be passed directly to codereview implementation.
1119 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001120 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001121 global settings
1122 if not settings:
1123 # Happens when git_cl.py is used as a utility library.
1124 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001125
1126 if issue:
1127 assert codereview, 'codereview must be known, if issue is known'
1128
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001129 self.branchref = branchref
1130 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001131 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 self.branch = ShortBranchName(self.branchref)
1133 else:
1134 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001136 self.lookedup_issue = False
1137 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001138 self.has_description = False
1139 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001140 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001142 self.cc = None
1143 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001144 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001145
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001146 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001147 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001148 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001149 assert self._codereview_impl
1150 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001151
1152 def _load_codereview_impl(self, codereview=None, **kwargs):
1153 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001154 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1155 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1156 self._codereview = codereview
1157 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 return
1159
1160 # Automatic selection based on issue number set for a current branch.
1161 # Rietveld takes precedence over Gerrit.
1162 assert not self.issue
1163 # Whether we find issue or not, we are doing the lookup.
1164 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001165 if self.GetBranch():
1166 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1167 issue = _git_get_branch_config_value(
1168 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1169 if issue:
1170 self._codereview = codereview
1171 self._codereview_impl = cls(self, **kwargs)
1172 self.issue = int(issue)
1173 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001174
1175 # No issue is set for this branch, so decide based on repo-wide settings.
1176 return self._load_codereview_impl(
1177 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1178 **kwargs)
1179
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001180 def IsGerrit(self):
1181 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001182
1183 def GetCCList(self):
1184 """Return the users cc'd on this CL.
1185
agable92bec4f2016-08-24 09:27:27 -07001186 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001187 """
1188 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001189 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001190 more_cc = ','.join(self.watchers)
1191 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1192 return self.cc
1193
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001194 def GetCCListWithoutDefault(self):
1195 """Return the users cc'd on this CL excluding default ones."""
1196 if self.cc is None:
1197 self.cc = ','.join(self.watchers)
1198 return self.cc
1199
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200 def SetWatchers(self, watchers):
1201 """Set the list of email addresses that should be cc'd based on the changed
1202 files in this CL.
1203 """
1204 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001205
1206 def GetBranch(self):
1207 """Returns the short branch name, e.g. 'master'."""
1208 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001209 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001210 if not branchref:
1211 return None
1212 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001213 self.branch = ShortBranchName(self.branchref)
1214 return self.branch
1215
1216 def GetBranchRef(self):
1217 """Returns the full branch name, e.g. 'refs/heads/master'."""
1218 self.GetBranch() # Poke the lazy loader.
1219 return self.branchref
1220
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001221 def ClearBranch(self):
1222 """Clears cached branch data of this object."""
1223 self.branch = self.branchref = None
1224
tandrii5d48c322016-08-18 16:19:37 -07001225 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1226 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1227 kwargs['branch'] = self.GetBranch()
1228 return _git_get_branch_config_value(key, default, **kwargs)
1229
1230 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1231 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1232 assert self.GetBranch(), (
1233 'this CL must have an associated branch to %sset %s%s' %
1234 ('un' if value is None else '',
1235 key,
1236 '' if value is None else ' to %r' % value))
1237 kwargs['branch'] = self.GetBranch()
1238 return _git_set_branch_config_value(key, value, **kwargs)
1239
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001240 @staticmethod
1241 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001242 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001243 e.g. 'origin', 'refs/heads/master'
1244 """
1245 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001246 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1247
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001248 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001249 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001250 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001251 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1252 error_ok=True).strip()
1253 if upstream_branch:
1254 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001256 # Else, try to guess the origin remote.
1257 remote_branches = RunGit(['branch', '-r']).split()
1258 if 'origin/master' in remote_branches:
1259 # Fall back on origin/master if it exits.
1260 remote = 'origin'
1261 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001263 DieWithError(
1264 'Unable to determine default branch to diff against.\n'
1265 'Either pass complete "git diff"-style arguments, like\n'
1266 ' git cl upload origin/master\n'
1267 'or verify this branch is set up to track another \n'
1268 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001269
1270 return remote, upstream_branch
1271
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001272 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001273 upstream_branch = self.GetUpstreamBranch()
1274 if not BranchExists(upstream_branch):
1275 DieWithError('The upstream for the current branch (%s) does not exist '
1276 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001277 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001278 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001279
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001280 def GetUpstreamBranch(self):
1281 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001282 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001283 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001284 upstream_branch = upstream_branch.replace('refs/heads/',
1285 'refs/remotes/%s/' % remote)
1286 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1287 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288 self.upstream_branch = upstream_branch
1289 return self.upstream_branch
1290
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001291 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001292 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001293 remote, branch = None, self.GetBranch()
1294 seen_branches = set()
1295 while branch not in seen_branches:
1296 seen_branches.add(branch)
1297 remote, branch = self.FetchUpstreamTuple(branch)
1298 branch = ShortBranchName(branch)
1299 if remote != '.' or branch.startswith('refs/remotes'):
1300 break
1301 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001302 remotes = RunGit(['remote'], error_ok=True).split()
1303 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001305 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001306 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001307 logging.warn('Could not determine which remote this change is '
1308 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001309 else:
1310 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001311 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001312 branch = 'HEAD'
1313 if branch.startswith('refs/remotes'):
1314 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001315 elif branch.startswith('refs/branch-heads/'):
1316 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001317 else:
1318 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001319 return self._remote
1320
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001321 def GitSanityChecks(self, upstream_git_obj):
1322 """Checks git repo status and ensures diff is from local commits."""
1323
sbc@chromium.org79706062015-01-14 21:18:12 +00001324 if upstream_git_obj is None:
1325 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001326 print('ERROR: unable to determine current branch (detached HEAD?)',
1327 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001328 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001329 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001330 return False
1331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 # Verify the commit we're diffing against is in our current branch.
1333 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1334 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1335 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001336 print('ERROR: %s is not in the current branch. You may need to rebase '
1337 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001338 return False
1339
1340 # List the commits inside the diff, and verify they are all local.
1341 commits_in_diff = RunGit(
1342 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1343 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1344 remote_branch = remote_branch.strip()
1345 if code != 0:
1346 _, remote_branch = self.GetRemoteBranch()
1347
1348 commits_in_remote = RunGit(
1349 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1350
1351 common_commits = set(commits_in_diff) & set(commits_in_remote)
1352 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001353 print('ERROR: Your diff contains %d commits already in %s.\n'
1354 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1355 'the diff. If you are using a custom git flow, you can override'
1356 ' the reference used for this check with "git config '
1357 'gitcl.remotebranch <git-ref>".' % (
1358 len(common_commits), remote_branch, upstream_git_obj),
1359 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001360 return False
1361 return True
1362
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001363 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001364 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001365
1366 Returns None if it is not set.
1367 """
tandrii5d48c322016-08-18 16:19:37 -07001368 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001369
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001370 def GetRemoteUrl(self):
1371 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1372
1373 Returns None if there is no remote.
1374 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001375 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001376 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1377
1378 # If URL is pointing to a local directory, it is probably a git cache.
1379 if os.path.isdir(url):
1380 url = RunGit(['config', 'remote.%s.url' % remote],
1381 error_ok=True,
1382 cwd=url).strip()
1383 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001384
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001385 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001386 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001387 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001388 self.issue = self._GitGetBranchConfigValue(
1389 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001390 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001391 return self.issue
1392
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001393 def GetIssueURL(self):
1394 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001395 issue = self.GetIssue()
1396 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001397 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001398 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001400 def GetDescription(self, pretty=False, force=False):
1401 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001402 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001403 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404 self.has_description = True
1405 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001406 # Set width to 72 columns + 2 space indent.
1407 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001409 lines = self.description.splitlines()
1410 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411 return self.description
1412
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001413 def GetDescriptionFooters(self):
1414 """Returns (non_footer_lines, footers) for the commit message.
1415
1416 Returns:
1417 non_footer_lines (list(str)) - Simple list of description lines without
1418 any footer. The lines do not contain newlines, nor does the list contain
1419 the empty line between the message and the footers.
1420 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1421 [("Change-Id", "Ideadbeef...."), ...]
1422 """
1423 raw_description = self.GetDescription()
1424 msg_lines, _, footers = git_footers.split_footers(raw_description)
1425 if footers:
1426 msg_lines = msg_lines[:len(msg_lines)-1]
1427 return msg_lines, footers
1428
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001429 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001430 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001431 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001432 self.patchset = self._GitGetBranchConfigValue(
1433 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001434 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001435 return self.patchset
1436
1437 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001438 """Set this branch's patchset. If patchset=0, clears the patchset."""
1439 assert self.GetBranch()
1440 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001441 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001442 else:
1443 self.patchset = int(patchset)
1444 self._GitSetBranchConfigValue(
1445 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001446
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001447 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001448 """Set this branch's issue. If issue isn't given, clears the issue."""
1449 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001450 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001451 issue = int(issue)
1452 self._GitSetBranchConfigValue(
1453 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001454 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001455 codereview_server = self._codereview_impl.GetCodereviewServer()
1456 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001457 self._GitSetBranchConfigValue(
1458 self._codereview_impl.CodereviewServerConfigKey(),
1459 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001460 else:
tandrii5d48c322016-08-18 16:19:37 -07001461 # Reset all of these just to be clean.
1462 reset_suffixes = [
1463 'last-upload-hash',
1464 self._codereview_impl.IssueConfigKey(),
1465 self._codereview_impl.PatchsetConfigKey(),
1466 self._codereview_impl.CodereviewServerConfigKey(),
1467 ] + self._PostUnsetIssueProperties()
1468 for prop in reset_suffixes:
1469 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001470 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001471 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001472
dnjba1b0f32016-09-02 12:37:42 -07001473 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001474 if not self.GitSanityChecks(upstream_branch):
1475 DieWithError('\nGit sanity check failure')
1476
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001477 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001478 if not root:
1479 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001480 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001481
1482 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001483 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001484 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001485 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001486 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001487 except subprocess2.CalledProcessError:
1488 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001489 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001490 'This branch probably doesn\'t exist anymore. To reset the\n'
1491 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001492 ' git branch --set-upstream-to origin/master %s\n'
1493 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001494 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001495
maruel@chromium.org52424302012-08-29 15:14:30 +00001496 issue = self.GetIssue()
1497 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001498 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001499 description = self.GetDescription()
1500 else:
1501 # If the change was never uploaded, use the log messages of all commits
1502 # up to the branch point, as git cl upload will prefill the description
1503 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001504 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1505 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001506
1507 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001508 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001509 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001510 name,
1511 description,
1512 absroot,
1513 files,
1514 issue,
1515 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001516 author,
1517 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001518
dsansomee2d6fd92016-09-08 00:10:47 -07001519 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001520 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001521 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001522 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001523
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001524 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1525 """Sets the description for this CL remotely.
1526
1527 You can get description_lines and footers with GetDescriptionFooters.
1528
1529 Args:
1530 description_lines (list(str)) - List of CL description lines without
1531 newline characters.
1532 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1533 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1534 `List-Of-Tokens`). It will be case-normalized so that each token is
1535 title-cased.
1536 """
1537 new_description = '\n'.join(description_lines)
1538 if footers:
1539 new_description += '\n'
1540 for k, v in footers:
1541 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1542 if not git_footers.FOOTER_PATTERN.match(foot):
1543 raise ValueError('Invalid footer %r' % foot)
1544 new_description += foot + '\n'
1545 self.UpdateDescription(new_description, force)
1546
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001547 def RunHook(self, committing, may_prompt, verbose, change):
1548 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1549 try:
1550 return presubmit_support.DoPresubmitChecks(change, committing,
1551 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1552 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001553 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1554 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001555 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001556 DieWithError(
1557 ('%s\nMaybe your depot_tools is out of date?\n'
1558 'If all fails, contact maruel@') % e)
1559
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001560 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1561 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001562 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1563 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001564 else:
1565 # Assume url.
1566 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1567 urlparse.urlparse(issue_arg))
1568 if not parsed_issue_arg or not parsed_issue_arg.valid:
1569 DieWithError('Failed to parse issue argument "%s". '
1570 'Must be an issue number or a valid URL.' % issue_arg)
1571 return self._codereview_impl.CMDPatchWithParsedIssue(
1572 parsed_issue_arg, reject, nocommit, directory)
1573
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001574 def CMDUpload(self, options, git_diff_args, orig_args):
1575 """Uploads a change to codereview."""
1576 if git_diff_args:
1577 # TODO(ukai): is it ok for gerrit case?
1578 base_branch = git_diff_args[0]
1579 else:
1580 if self.GetBranch() is None:
1581 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1582
1583 # Default to diffing against common ancestor of upstream branch
1584 base_branch = self.GetCommonAncestorWithUpstream()
1585 git_diff_args = [base_branch, 'HEAD']
1586
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001587 # Fast best-effort checks to abort before running potentially
1588 # expensive hooks if uploading is likely to fail anyway. Passing these
1589 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001590 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001591 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001592
1593 # Apply watchlists on upload.
1594 change = self.GetChange(base_branch, None)
1595 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1596 files = [f.LocalPath() for f in change.AffectedFiles()]
1597 if not options.bypass_watchlists:
1598 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1599
1600 if not options.bypass_hooks:
1601 if options.reviewers or options.tbr_owners:
1602 # Set the reviewer list now so that presubmit checks can access it.
1603 change_description = ChangeDescription(change.FullDescriptionText())
1604 change_description.update_reviewers(options.reviewers,
1605 options.tbr_owners,
1606 change)
1607 change.SetDescriptionText(change_description.description)
1608 hook_results = self.RunHook(committing=False,
1609 may_prompt=not options.force,
1610 verbose=options.verbose,
1611 change=change)
1612 if not hook_results.should_continue():
1613 return 1
1614 if not options.reviewers and hook_results.reviewers:
1615 options.reviewers = hook_results.reviewers.split(',')
1616
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001617 # TODO(tandrii): Checking local patchset against remote patchset is only
1618 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1619 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001620 latest_patchset = self.GetMostRecentPatchset()
1621 local_patchset = self.GetPatchset()
1622 if (latest_patchset and local_patchset and
1623 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001624 print('The last upload made from this repository was patchset #%d but '
1625 'the most recent patchset on the server is #%d.'
1626 % (local_patchset, latest_patchset))
1627 print('Uploading will still work, but if you\'ve uploaded to this '
1628 'issue from another machine or branch the patch you\'re '
1629 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001630 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001631
1632 print_stats(options.similarity, options.find_copies, git_diff_args)
1633 ret = self.CMDUploadChange(options, git_diff_args, change)
1634 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001635 if options.use_commit_queue:
1636 self.SetCQState(_CQState.COMMIT)
1637 elif options.cq_dry_run:
1638 self.SetCQState(_CQState.DRY_RUN)
1639
tandrii5d48c322016-08-18 16:19:37 -07001640 _git_set_branch_config_value('last-upload-hash',
1641 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001642 # Run post upload hooks, if specified.
1643 if settings.GetRunPostUploadHook():
1644 presubmit_support.DoPostUploadExecuter(
1645 change,
1646 self,
1647 settings.GetRoot(),
1648 options.verbose,
1649 sys.stdout)
1650
1651 # Upload all dependencies if specified.
1652 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001653 print()
1654 print('--dependencies has been specified.')
1655 print('All dependent local branches will be re-uploaded.')
1656 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001657 # Remove the dependencies flag from args so that we do not end up in a
1658 # loop.
1659 orig_args.remove('--dependencies')
1660 ret = upload_branch_deps(self, orig_args)
1661 return ret
1662
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001663 def SetCQState(self, new_state):
1664 """Update the CQ state for latest patchset.
1665
1666 Issue must have been already uploaded and known.
1667 """
1668 assert new_state in _CQState.ALL_STATES
1669 assert self.GetIssue()
1670 return self._codereview_impl.SetCQState(new_state)
1671
qyearsley1fdfcb62016-10-24 13:22:03 -07001672 def TriggerDryRun(self):
1673 """Triggers a dry run and prints a warning on failure."""
1674 # TODO(qyearsley): Either re-use this method in CMDset_commit
1675 # and CMDupload, or change CMDtry to trigger dry runs with
1676 # just SetCQState, and catch keyboard interrupt and other
1677 # errors in that method.
1678 try:
1679 self.SetCQState(_CQState.DRY_RUN)
1680 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1681 return 0
1682 except KeyboardInterrupt:
1683 raise
1684 except:
1685 print('WARNING: failed to trigger CQ Dry Run.\n'
1686 'Either:\n'
1687 ' * your project has no CQ\n'
1688 ' * you don\'t have permission to trigger Dry Run\n'
1689 ' * bug in this code (see stack trace below).\n'
1690 'Consider specifying which bots to trigger manually '
1691 'or asking your project owners for permissions '
1692 'or contacting Chrome Infrastructure team at '
1693 'https://www.chromium.org/infra\n\n')
1694 # Still raise exception so that stack trace is printed.
1695 raise
1696
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001697 # Forward methods to codereview specific implementation.
1698
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001699 def AddComment(self, message):
1700 return self._codereview_impl.AddComment(message)
1701
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001702 def GetCommentsSummary(self):
1703 """Returns list of _CommentSummary for each comment.
1704
1705 Note: comments per file or per line are not included,
1706 only top-level comments are returned.
1707 """
1708 return self._codereview_impl.GetCommentsSummary()
1709
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001710 def CloseIssue(self):
1711 return self._codereview_impl.CloseIssue()
1712
1713 def GetStatus(self):
1714 return self._codereview_impl.GetStatus()
1715
1716 def GetCodereviewServer(self):
1717 return self._codereview_impl.GetCodereviewServer()
1718
tandriide281ae2016-10-12 06:02:30 -07001719 def GetIssueOwner(self):
1720 """Get owner from codereview, which may differ from this checkout."""
1721 return self._codereview_impl.GetIssueOwner()
1722
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001723 def GetApprovingReviewers(self):
1724 return self._codereview_impl.GetApprovingReviewers()
1725
1726 def GetMostRecentPatchset(self):
1727 return self._codereview_impl.GetMostRecentPatchset()
1728
tandriide281ae2016-10-12 06:02:30 -07001729 def CannotTriggerTryJobReason(self):
1730 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1731 return self._codereview_impl.CannotTriggerTryJobReason()
1732
tandrii8c5a3532016-11-04 07:52:02 -07001733 def GetTryjobProperties(self, patchset=None):
1734 """Returns dictionary of properties to launch tryjob."""
1735 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1736
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737 def __getattr__(self, attr):
1738 # This is because lots of untested code accesses Rietveld-specific stuff
1739 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001740 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001741 # Note that child method defines __getattr__ as well, and forwards it here,
1742 # because _RietveldChangelistImpl is not cleaned up yet, and given
1743 # deprecation of Rietveld, it should probably be just removed.
1744 # Until that time, avoid infinite recursion by bypassing __getattr__
1745 # of implementation class.
1746 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001747
1748
1749class _ChangelistCodereviewBase(object):
1750 """Abstract base class encapsulating codereview specifics of a changelist."""
1751 def __init__(self, changelist):
1752 self._changelist = changelist # instance of Changelist
1753
1754 def __getattr__(self, attr):
1755 # Forward methods to changelist.
1756 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1757 # _RietveldChangelistImpl to avoid this hack?
1758 return getattr(self._changelist, attr)
1759
1760 def GetStatus(self):
1761 """Apply a rough heuristic to give a simple summary of an issue's review
1762 or CQ status, assuming adherence to a common workflow.
1763
1764 Returns None if no issue for this branch, or specific string keywords.
1765 """
1766 raise NotImplementedError()
1767
1768 def GetCodereviewServer(self):
1769 """Returns server URL without end slash, like "https://codereview.com"."""
1770 raise NotImplementedError()
1771
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001772 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001773 """Fetches and returns description from the codereview server."""
1774 raise NotImplementedError()
1775
tandrii5d48c322016-08-18 16:19:37 -07001776 @classmethod
1777 def IssueConfigKey(cls):
1778 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001779 raise NotImplementedError()
1780
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001781 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001782 def PatchsetConfigKey(cls):
1783 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001784 raise NotImplementedError()
1785
tandrii5d48c322016-08-18 16:19:37 -07001786 @classmethod
1787 def CodereviewServerConfigKey(cls):
1788 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001789 raise NotImplementedError()
1790
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001791 def _PostUnsetIssueProperties(self):
1792 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001793 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001794
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001795 def GetRieveldObjForPresubmit(self):
1796 # This is an unfortunate Rietveld-embeddedness in presubmit.
1797 # For non-Rietveld codereviews, this probably should return a dummy object.
1798 raise NotImplementedError()
1799
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001800 def GetGerritObjForPresubmit(self):
1801 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1802 return None
1803
dsansomee2d6fd92016-09-08 00:10:47 -07001804 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001805 """Update the description on codereview site."""
1806 raise NotImplementedError()
1807
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001808 def AddComment(self, message):
1809 """Posts a comment to the codereview site."""
1810 raise NotImplementedError()
1811
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001812 def GetCommentsSummary(self):
1813 raise NotImplementedError()
1814
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001815 def CloseIssue(self):
1816 """Closes the issue."""
1817 raise NotImplementedError()
1818
1819 def GetApprovingReviewers(self):
1820 """Returns a list of reviewers approving the change.
1821
1822 Note: not necessarily committers.
1823 """
1824 raise NotImplementedError()
1825
1826 def GetMostRecentPatchset(self):
1827 """Returns the most recent patchset number from the codereview site."""
1828 raise NotImplementedError()
1829
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001830 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1831 directory):
1832 """Fetches and applies the issue.
1833
1834 Arguments:
1835 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1836 reject: if True, reject the failed patch instead of switching to 3-way
1837 merge. Rietveld only.
1838 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1839 only.
1840 directory: switch to directory before applying the patch. Rietveld only.
1841 """
1842 raise NotImplementedError()
1843
1844 @staticmethod
1845 def ParseIssueURL(parsed_url):
1846 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1847 failed."""
1848 raise NotImplementedError()
1849
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001850 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001851 """Best effort check that user is authenticated with codereview server.
1852
1853 Arguments:
1854 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001855 refresh: whether to attempt to refresh credentials. Ignored if not
1856 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001857 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001858 raise NotImplementedError()
1859
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001860 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001861 """Best effort check that uploading isn't supposed to fail for predictable
1862 reasons.
1863
1864 This method should raise informative exception if uploading shouldn't
1865 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001866
1867 Arguments:
1868 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001869 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001870 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001871
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001872 def CMDUploadChange(self, options, args, change):
1873 """Uploads a change to codereview."""
1874 raise NotImplementedError()
1875
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001876 def SetCQState(self, new_state):
1877 """Update the CQ state for latest patchset.
1878
1879 Issue must have been already uploaded and known.
1880 """
1881 raise NotImplementedError()
1882
tandriie113dfd2016-10-11 10:20:12 -07001883 def CannotTriggerTryJobReason(self):
1884 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1885 raise NotImplementedError()
1886
tandriide281ae2016-10-12 06:02:30 -07001887 def GetIssueOwner(self):
1888 raise NotImplementedError()
1889
tandrii8c5a3532016-11-04 07:52:02 -07001890 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001891 raise NotImplementedError()
1892
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001893
1894class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001895 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001896 super(_RietveldChangelistImpl, self).__init__(changelist)
1897 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001898 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001899 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001901 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001902 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903 self._props = None
1904 self._rpc_server = None
1905
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001906 def GetCodereviewServer(self):
1907 if not self._rietveld_server:
1908 # If we're on a branch then get the server potentially associated
1909 # with that branch.
1910 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001911 self._rietveld_server = gclient_utils.UpgradeToHttps(
1912 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913 if not self._rietveld_server:
1914 self._rietveld_server = settings.GetDefaultServerUrl()
1915 return self._rietveld_server
1916
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001917 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001918 """Best effort check that user is authenticated with Rietveld server."""
1919 if self._auth_config.use_oauth2:
1920 authenticator = auth.get_authenticator_for_host(
1921 self.GetCodereviewServer(), self._auth_config)
1922 if not authenticator.has_cached_credentials():
1923 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001924 if refresh:
1925 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001926
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001927 def EnsureCanUploadPatchset(self, force):
1928 # No checks for Rietveld because we are deprecating Rietveld.
1929 pass
1930
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001931 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001932 issue = self.GetIssue()
1933 assert issue
1934 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001935 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 except urllib2.HTTPError as e:
1937 if e.code == 404:
1938 DieWithError(
1939 ('\nWhile fetching the description for issue %d, received a '
1940 '404 (not found)\n'
1941 'error. It is likely that you deleted this '
1942 'issue on the server. If this is the\n'
1943 'case, please run\n\n'
1944 ' git cl issue 0\n\n'
1945 'to clear the association with the deleted issue. Then run '
1946 'this command again.') % issue)
1947 else:
1948 DieWithError(
1949 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1950 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001951 print('Warning: Failed to retrieve CL description due to network '
1952 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001953 return ''
1954
1955 def GetMostRecentPatchset(self):
1956 return self.GetIssueProperties()['patchsets'][-1]
1957
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001958 def GetIssueProperties(self):
1959 if self._props is None:
1960 issue = self.GetIssue()
1961 if not issue:
1962 self._props = {}
1963 else:
1964 self._props = self.RpcServer().get_issue_properties(issue, True)
1965 return self._props
1966
tandriie113dfd2016-10-11 10:20:12 -07001967 def CannotTriggerTryJobReason(self):
1968 props = self.GetIssueProperties()
1969 if not props:
1970 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1971 if props.get('closed'):
1972 return 'CL %s is closed' % self.GetIssue()
1973 if props.get('private'):
1974 return 'CL %s is private' % self.GetIssue()
1975 return None
1976
tandrii8c5a3532016-11-04 07:52:02 -07001977 def GetTryjobProperties(self, patchset=None):
1978 """Returns dictionary of properties to launch tryjob."""
1979 project = (self.GetIssueProperties() or {}).get('project')
1980 return {
1981 'issue': self.GetIssue(),
1982 'patch_project': project,
1983 'patch_storage': 'rietveld',
1984 'patchset': patchset or self.GetPatchset(),
1985 'rietveld': self.GetCodereviewServer(),
1986 }
1987
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001988 def GetApprovingReviewers(self):
1989 return get_approving_reviewers(self.GetIssueProperties())
1990
tandriide281ae2016-10-12 06:02:30 -07001991 def GetIssueOwner(self):
1992 return (self.GetIssueProperties() or {}).get('owner_email')
1993
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001994 def AddComment(self, message):
1995 return self.RpcServer().add_comment(self.GetIssue(), message)
1996
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001997 def GetCommentsSummary(self):
1998 summary = []
1999 for message in self.GetIssueProperties().get('messages', []):
2000 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2001 summary.append(_CommentSummary(
2002 date=date,
2003 disapproval=bool(message['disapproval']),
2004 approval=bool(message['approval']),
2005 sender=message['sender'],
2006 message=message['text'],
2007 ))
2008 return summary
2009
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002010 def GetStatus(self):
2011 """Apply a rough heuristic to give a simple summary of an issue's review
2012 or CQ status, assuming adherence to a common workflow.
2013
2014 Returns None if no issue for this branch, or one of the following keywords:
2015 * 'error' - error from review tool (including deleted issues)
2016 * 'unsent' - not sent for review
2017 * 'waiting' - waiting for review
2018 * 'reply' - waiting for owner to reply to review
2019 * 'lgtm' - LGTM from at least one approved reviewer
2020 * 'commit' - in the commit queue
2021 * 'closed' - closed
2022 """
2023 if not self.GetIssue():
2024 return None
2025
2026 try:
2027 props = self.GetIssueProperties()
2028 except urllib2.HTTPError:
2029 return 'error'
2030
2031 if props.get('closed'):
2032 # Issue is closed.
2033 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002034 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002035 # Issue is in the commit queue.
2036 return 'commit'
2037
2038 try:
2039 reviewers = self.GetApprovingReviewers()
2040 except urllib2.HTTPError:
2041 return 'error'
2042
2043 if reviewers:
2044 # Was LGTM'ed.
2045 return 'lgtm'
2046
2047 messages = props.get('messages') or []
2048
tandrii9d2c7a32016-06-22 03:42:45 -07002049 # Skip CQ messages that don't require owner's action.
2050 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2051 if 'Dry run:' in messages[-1]['text']:
2052 messages.pop()
2053 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2054 # This message always follows prior messages from CQ,
2055 # so skip this too.
2056 messages.pop()
2057 else:
2058 # This is probably a CQ messages warranting user attention.
2059 break
2060
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002061 if not messages:
2062 # No message was sent.
2063 return 'unsent'
2064 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002065 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002066 return 'reply'
2067 return 'waiting'
2068
dsansomee2d6fd92016-09-08 00:10:47 -07002069 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002070 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002071
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002072 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002073 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002074
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002075 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002076 return self.SetFlags({flag: value})
2077
2078 def SetFlags(self, flags):
2079 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002080 """
phajdan.jr68598232016-08-10 03:28:28 -07002081 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002082 try:
tandrii4b233bd2016-07-06 03:50:29 -07002083 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002084 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002085 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002086 if e.code == 404:
2087 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2088 if e.code == 403:
2089 DieWithError(
2090 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002091 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002092 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002093
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002094 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002095 """Returns an upload.RpcServer() to access this review's rietveld instance.
2096 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002097 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002098 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002099 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002100 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002101 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002102
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002103 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002104 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002105 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002106
tandrii5d48c322016-08-18 16:19:37 -07002107 @classmethod
2108 def PatchsetConfigKey(cls):
2109 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002110
tandrii5d48c322016-08-18 16:19:37 -07002111 @classmethod
2112 def CodereviewServerConfigKey(cls):
2113 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002114
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002115 def GetRieveldObjForPresubmit(self):
2116 return self.RpcServer()
2117
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002118 def SetCQState(self, new_state):
2119 props = self.GetIssueProperties()
2120 if props.get('private'):
2121 DieWithError('Cannot set-commit on private issue')
2122
2123 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002124 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002125 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002126 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002127 else:
tandrii4b233bd2016-07-06 03:50:29 -07002128 assert new_state == _CQState.DRY_RUN
2129 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002130
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002131 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2132 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 # PatchIssue should never be called with a dirty tree. It is up to the
2134 # caller to check this, but just in case we assert here since the
2135 # consequences of the caller not checking this could be dire.
2136 assert(not git_common.is_dirty_git_tree('apply'))
2137 assert(parsed_issue_arg.valid)
2138 self._changelist.issue = parsed_issue_arg.issue
2139 if parsed_issue_arg.hostname:
2140 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2141
skobes6468b902016-10-24 08:45:10 -07002142 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2143 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2144 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002145 try:
skobes6468b902016-10-24 08:45:10 -07002146 scm_obj.apply_patch(patchset_object)
2147 except Exception as e:
2148 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002149 return 1
2150
2151 # If we had an issue, commit the current state and register the issue.
2152 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002153 self.SetIssue(self.GetIssue())
2154 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2156 'patch from issue %(i)s at patchset '
2157 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2158 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002159 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002160 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002161 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 return 0
2163
2164 @staticmethod
2165 def ParseIssueURL(parsed_url):
2166 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2167 return None
wychen3c1c1722016-08-04 11:46:36 -07002168 # Rietveld patch: https://domain/<number>/#ps<patchset>
2169 match = re.match(r'/(\d+)/$', parsed_url.path)
2170 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2171 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002172 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002173 issue=int(match.group(1)),
2174 patchset=int(match2.group(1)),
2175 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 # Typical url: https://domain/<issue_number>[/[other]]
2177 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2178 if match:
skobes6468b902016-10-24 08:45:10 -07002179 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180 issue=int(match.group(1)),
2181 hostname=parsed_url.netloc)
2182 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2183 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2184 if match:
skobes6468b902016-10-24 08:45:10 -07002185 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 issue=int(match.group(1)),
2187 patchset=int(match.group(2)),
skobes6468b902016-10-24 08:45:10 -07002188 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002189 return None
2190
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002191 def CMDUploadChange(self, options, args, change):
2192 """Upload the patch to Rietveld."""
2193 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2194 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002195 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2196 if options.emulate_svn_auto_props:
2197 upload_args.append('--emulate_svn_auto_props')
2198
2199 change_desc = None
2200
2201 if options.email is not None:
2202 upload_args.extend(['--email', options.email])
2203
2204 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002205 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002206 upload_args.extend(['--title', options.title])
2207 if options.message:
2208 upload_args.extend(['--message', options.message])
2209 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002210 print('This branch is associated with issue %s. '
2211 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002212 else:
nodirca166002016-06-27 10:59:51 -07002213 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002214 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002215 if options.message:
2216 message = options.message
2217 else:
2218 message = CreateDescriptionFromLog(args)
2219 if options.title:
2220 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002221 change_desc = ChangeDescription(message)
2222 if options.reviewers or options.tbr_owners:
2223 change_desc.update_reviewers(options.reviewers,
2224 options.tbr_owners,
2225 change)
2226 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002227 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002228
2229 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002230 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002231 return 1
2232
2233 upload_args.extend(['--message', change_desc.description])
2234 if change_desc.get_reviewers():
2235 upload_args.append('--reviewers=%s' % ','.join(
2236 change_desc.get_reviewers()))
2237 if options.send_mail:
2238 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002239 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002240 upload_args.append('--send_mail')
2241
2242 # We check this before applying rietveld.private assuming that in
2243 # rietveld.cc only addresses which we can send private CLs to are listed
2244 # if rietveld.private is set, and so we should ignore rietveld.cc only
2245 # when --private is specified explicitly on the command line.
2246 if options.private:
2247 logging.warn('rietveld.cc is ignored since private flag is specified. '
2248 'You need to review and add them manually if necessary.')
2249 cc = self.GetCCListWithoutDefault()
2250 else:
2251 cc = self.GetCCList()
2252 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002253 if change_desc.get_cced():
2254 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002255 if cc:
2256 upload_args.extend(['--cc', cc])
2257
2258 if options.private or settings.GetDefaultPrivateFlag() == "True":
2259 upload_args.append('--private')
2260
2261 upload_args.extend(['--git_similarity', str(options.similarity)])
2262 if not options.find_copies:
2263 upload_args.extend(['--git_no_find_copies'])
2264
2265 # Include the upstream repo's URL in the change -- this is useful for
2266 # projects that have their source spread across multiple repos.
2267 remote_url = self.GetGitBaseUrlFromConfig()
2268 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002269 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2270 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2271 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002272 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002273 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002274 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002275 if target_ref:
2276 upload_args.extend(['--target_ref', target_ref])
2277
2278 # Look for dependent patchsets. See crbug.com/480453 for more details.
2279 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2280 upstream_branch = ShortBranchName(upstream_branch)
2281 if remote is '.':
2282 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002283 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002285 print()
2286 print('Skipping dependency patchset upload because git config '
2287 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2288 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002289 else:
2290 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002291 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002292 auth_config=auth_config)
2293 branch_cl_issue_url = branch_cl.GetIssueURL()
2294 branch_cl_issue = branch_cl.GetIssue()
2295 branch_cl_patchset = branch_cl.GetPatchset()
2296 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2297 upload_args.extend(
2298 ['--depends_on_patchset', '%s:%s' % (
2299 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002300 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002301 '\n'
2302 'The current branch (%s) is tracking a local branch (%s) with '
2303 'an associated CL.\n'
2304 'Adding %s/#ps%s as a dependency patchset.\n'
2305 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2306 branch_cl_patchset))
2307
2308 project = settings.GetProject()
2309 if project:
2310 upload_args.extend(['--project', project])
2311
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 try:
2313 upload_args = ['upload'] + upload_args + args
2314 logging.info('upload.RealMain(%s)', upload_args)
2315 issue, patchset = upload.RealMain(upload_args)
2316 issue = int(issue)
2317 patchset = int(patchset)
2318 except KeyboardInterrupt:
2319 sys.exit(1)
2320 except:
2321 # If we got an exception after the user typed a description for their
2322 # change, back up the description before re-raising.
2323 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002324 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325 raise
2326
2327 if not self.GetIssue():
2328 self.SetIssue(issue)
2329 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002330 return 0
2331
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002332
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002333class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002334 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002335 # auth_config is Rietveld thing, kept here to preserve interface only.
2336 super(_GerritChangelistImpl, self).__init__(changelist)
2337 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002338 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002339 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002340 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002341 # Map from change number (issue) to its detail cache.
2342 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002343
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002344 if codereview_host is not None:
2345 assert not codereview_host.startswith('https://'), codereview_host
2346 self._gerrit_host = codereview_host
2347 self._gerrit_server = 'https://%s' % codereview_host
2348
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002349 def _GetGerritHost(self):
2350 # Lazy load of configs.
2351 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002352 if self._gerrit_host and '.' not in self._gerrit_host:
2353 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2354 # This happens for internal stuff http://crbug.com/614312.
2355 parsed = urlparse.urlparse(self.GetRemoteUrl())
2356 if parsed.scheme == 'sso':
2357 print('WARNING: using non https URLs for remote is likely broken\n'
2358 ' Your current remote is: %s' % self.GetRemoteUrl())
2359 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2360 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002361 return self._gerrit_host
2362
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002363 def _GetGitHost(self):
2364 """Returns git host to be used when uploading change to Gerrit."""
2365 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2366
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002367 def GetCodereviewServer(self):
2368 if not self._gerrit_server:
2369 # If we're on a branch then get the server potentially associated
2370 # with that branch.
2371 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002372 self._gerrit_server = self._GitGetBranchConfigValue(
2373 self.CodereviewServerConfigKey())
2374 if self._gerrit_server:
2375 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002376 if not self._gerrit_server:
2377 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2378 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002379 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002380 parts[0] = parts[0] + '-review'
2381 self._gerrit_host = '.'.join(parts)
2382 self._gerrit_server = 'https://%s' % self._gerrit_host
2383 return self._gerrit_server
2384
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002385 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002386 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002387 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002388
tandrii5d48c322016-08-18 16:19:37 -07002389 @classmethod
2390 def PatchsetConfigKey(cls):
2391 return 'gerritpatchset'
2392
2393 @classmethod
2394 def CodereviewServerConfigKey(cls):
2395 return 'gerritserver'
2396
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002397 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002398 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002399 if settings.GetGerritSkipEnsureAuthenticated():
2400 # For projects with unusual authentication schemes.
2401 # See http://crbug.com/603378.
2402 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002403 # Lazy-loader to identify Gerrit and Git hosts.
2404 if gerrit_util.GceAuthenticator.is_gce():
2405 return
2406 self.GetCodereviewServer()
2407 git_host = self._GetGitHost()
2408 assert self._gerrit_server and self._gerrit_host
2409 cookie_auth = gerrit_util.CookiesAuthenticator()
2410
2411 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2412 git_auth = cookie_auth.get_auth_header(git_host)
2413 if gerrit_auth and git_auth:
2414 if gerrit_auth == git_auth:
2415 return
2416 print((
2417 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2418 ' Check your %s or %s file for credentials of hosts:\n'
2419 ' %s\n'
2420 ' %s\n'
2421 ' %s') %
2422 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2423 git_host, self._gerrit_host,
2424 cookie_auth.get_new_password_message(git_host)))
2425 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002426 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002427 return
2428 else:
2429 missing = (
2430 [] if gerrit_auth else [self._gerrit_host] +
2431 [] if git_auth else [git_host])
2432 DieWithError('Credentials for the following hosts are required:\n'
2433 ' %s\n'
2434 'These are read from %s (or legacy %s)\n'
2435 '%s' % (
2436 '\n '.join(missing),
2437 cookie_auth.get_gitcookies_path(),
2438 cookie_auth.get_netrc_path(),
2439 cookie_auth.get_new_password_message(git_host)))
2440
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002441 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002442 if not self.GetIssue():
2443 return
2444
2445 # Warm change details cache now to avoid RPCs later, reducing latency for
2446 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002447 self._GetChangeDetail(
2448 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002449
2450 status = self._GetChangeDetail()['status']
2451 if status in ('MERGED', 'ABANDONED'):
2452 DieWithError('Change %s has been %s, new uploads are not allowed' %
2453 (self.GetIssueURL(),
2454 'submitted' if status == 'MERGED' else 'abandoned'))
2455
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002456 if gerrit_util.GceAuthenticator.is_gce():
2457 return
2458 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2459 self._GetGerritHost())
2460 if self.GetIssueOwner() == cookies_user:
2461 return
2462 logging.debug('change %s owner is %s, cookies user is %s',
2463 self.GetIssue(), self.GetIssueOwner(), cookies_user)
2464 # Maybe user has linked accounts or smth like that,
2465 # so ask what Gerrit thinks of this user.
2466 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2467 if details['email'] == self.GetIssueOwner():
2468 return
2469 if not force:
2470 print('WARNING: change %s is owned by %s, but you authenticate to Gerrit '
2471 'as %s.\n'
2472 'Uploading may fail due to lack of permissions.' %
2473 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2474 confirm_or_exit(action='upload')
2475
2476
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002477 def _PostUnsetIssueProperties(self):
2478 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002479 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002480
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002481 def GetRieveldObjForPresubmit(self):
2482 class ThisIsNotRietveldIssue(object):
2483 def __nonzero__(self):
2484 # This is a hack to make presubmit_support think that rietveld is not
2485 # defined, yet still ensure that calls directly result in a decent
2486 # exception message below.
2487 return False
2488
2489 def __getattr__(self, attr):
2490 print(
2491 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2492 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2493 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2494 'or use Rietveld for codereview.\n'
2495 'See also http://crbug.com/579160.' % attr)
2496 raise NotImplementedError()
2497 return ThisIsNotRietveldIssue()
2498
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002499 def GetGerritObjForPresubmit(self):
2500 return presubmit_support.GerritAccessor(self._GetGerritHost())
2501
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002502 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002503 """Apply a rough heuristic to give a simple summary of an issue's review
2504 or CQ status, assuming adherence to a common workflow.
2505
2506 Returns None if no issue for this branch, or one of the following keywords:
2507 * 'error' - error from review tool (including deleted issues)
2508 * 'unsent' - no reviewers added
2509 * 'waiting' - waiting for review
2510 * 'reply' - waiting for owner to reply to review
Quinten Yearsley442fb642016-12-15 15:38:27 -08002511 * 'not lgtm' - Code-Review disapproval from at least one valid reviewer
tandriic2405f52016-10-10 08:13:15 -07002512 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002513 * 'commit' - in the commit queue
2514 * 'closed' - abandoned
2515 """
2516 if not self.GetIssue():
2517 return None
2518
2519 try:
2520 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002521 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002522 return 'error'
2523
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002524 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002525 return 'closed'
2526
2527 cq_label = data['labels'].get('Commit-Queue', {})
2528 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002529 votes = cq_label.get('all', [])
2530 highest_vote = 0
2531 for v in votes:
2532 highest_vote = max(highest_vote, v.get('value', 0))
2533 vote_value = str(highest_vote)
2534 if vote_value != '0':
2535 # Add a '+' if the value is not 0 to match the values in the label.
2536 # The cq_label does not have negatives.
2537 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002538 vote_text = cq_label.get('values', {}).get(vote_value, '')
2539 if vote_text.lower() == 'commit':
2540 return 'commit'
2541
2542 lgtm_label = data['labels'].get('Code-Review', {})
2543 if lgtm_label:
2544 if 'rejected' in lgtm_label:
2545 return 'not lgtm'
2546 if 'approved' in lgtm_label:
2547 return 'lgtm'
2548
2549 if not data.get('reviewers', {}).get('REVIEWER', []):
2550 return 'unsent'
2551
2552 messages = data.get('messages', [])
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002553 owner = data['owner'].get('_account_id')
2554 while messages:
2555 last_message_author = messages.pop().get('author', {})
2556 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2557 # Ignore replies from CQ.
2558 continue
Andrii Shyshkalov7afd1642017-01-29 16:07:15 +01002559 if last_message_author.get('_account_id') != owner:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002560 # Some reply from non-owner.
2561 return 'reply'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002562 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002563
2564 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002565 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002566 return data['revisions'][data['current_revision']]['_number']
2567
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002568 def FetchDescription(self, force=False):
2569 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2570 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002571 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002572 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002573
dsansomee2d6fd92016-09-08 00:10:47 -07002574 def UpdateDescriptionRemote(self, description, force=False):
2575 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2576 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002577 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002578 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002579 'unpublished edit. Either publish the edit in the Gerrit web UI '
2580 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002581
2582 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2583 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002584 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002585 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002586
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002587 def AddComment(self, message):
2588 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2589 msg=message)
2590
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002591 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002592 # DETAILED_ACCOUNTS is to get emails in accounts.
2593 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2594 summary = []
2595 for msg in data.get('messages', []):
2596 # Gerrit spits out nanoseconds.
2597 assert len(msg['date'].split('.')[-1]) == 9
2598 date = datetime.datetime.strptime(msg['date'][:-3],
2599 '%Y-%m-%d %H:%M:%S.%f')
2600 summary.append(_CommentSummary(
2601 date=date,
2602 message=msg['message'],
2603 sender=msg['author']['email'],
2604 # These could be inferred from the text messages and correlated with
2605 # Code-Review label maximum, however this is not reliable.
2606 # Leaving as is until the need arises.
2607 approval=False,
2608 disapproval=False,
2609 ))
2610 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002611
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002612 def CloseIssue(self):
2613 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2614
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002615 def GetApprovingReviewers(self):
2616 """Returns a list of reviewers approving the change.
2617
2618 Note: not necessarily committers.
2619 """
2620 raise NotImplementedError()
2621
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002622 def SubmitIssue(self, wait_for_merge=True):
2623 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2624 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002625
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002626 def _GetChangeDetail(self, options=None, issue=None,
2627 no_cache=False):
2628 """Returns details of the issue by querying Gerrit and caching results.
2629
2630 If fresh data is needed, set no_cache=True which will clear cache and
2631 thus new data will be fetched from Gerrit.
2632 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002633 options = options or []
2634 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002635 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002636
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002637 # Optimization to avoid multiple RPCs:
2638 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2639 'CURRENT_COMMIT' not in options):
2640 options.append('CURRENT_COMMIT')
2641
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002642 # Normalize issue and options for consistent keys in cache.
2643 issue = str(issue)
2644 options = [o.upper() for o in options]
2645
2646 # Check in cache first unless no_cache is True.
2647 if no_cache:
2648 self._detail_cache.pop(issue, None)
2649 else:
2650 options_set = frozenset(options)
2651 for cached_options_set, data in self._detail_cache.get(issue, []):
2652 # Assumption: data fetched before with extra options is suitable
2653 # for return for a smaller set of options.
2654 # For example, if we cached data for
2655 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2656 # and request is for options=[CURRENT_REVISION],
2657 # THEN we can return prior cached data.
2658 if options_set.issubset(cached_options_set):
2659 return data
2660
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002661 try:
2662 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2663 options, ignore_404=False)
2664 except gerrit_util.GerritError as e:
2665 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002666 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002667 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002668
2669 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002670 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002671
agable32978d92016-11-01 12:55:02 -07002672 def _GetChangeCommit(self, issue=None):
2673 issue = issue or self.GetIssue()
2674 assert issue, 'issue is required to query Gerrit'
2675 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2676 if not data:
Aaron Gablea45ee112016-11-22 15:14:38 -08002677 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
agable32978d92016-11-01 12:55:02 -07002678 return data
2679
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002680 def CMDLand(self, force, bypass_hooks, verbose):
2681 if git_common.is_dirty_git_tree('land'):
2682 return 1
tandriid60367b2016-06-22 05:25:12 -07002683 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2684 if u'Commit-Queue' in detail.get('labels', {}):
2685 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002686 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2687 'which can test and land changes for you. '
2688 'Are you sure you wish to bypass it?\n',
2689 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002690
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002691 differs = True
tandriic4344b52016-08-29 06:04:54 -07002692 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002693 # Note: git diff outputs nothing if there is no diff.
2694 if not last_upload or RunGit(['diff', last_upload]).strip():
2695 print('WARNING: some changes from local branch haven\'t been uploaded')
2696 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002697 if detail['current_revision'] == last_upload:
2698 differs = False
2699 else:
2700 print('WARNING: local branch contents differ from latest uploaded '
2701 'patchset')
2702 if differs:
2703 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002704 confirm_or_exit(
2705 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2706 action='submit')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002707 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2708 elif not bypass_hooks:
2709 hook_results = self.RunHook(
2710 committing=True,
2711 may_prompt=not force,
2712 verbose=verbose,
2713 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2714 if not hook_results.should_continue():
2715 return 1
2716
2717 self.SubmitIssue(wait_for_merge=True)
2718 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002719 links = self._GetChangeCommit().get('web_links', [])
2720 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002721 if link.get('name') == 'gitiles' and link.get('url'):
agable32978d92016-11-01 12:55:02 -07002722 print('Landed as %s' % link.get('url'))
2723 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002724 return 0
2725
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002726 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2727 directory):
2728 assert not reject
2729 assert not nocommit
2730 assert not directory
2731 assert parsed_issue_arg.valid
2732
2733 self._changelist.issue = parsed_issue_arg.issue
2734
2735 if parsed_issue_arg.hostname:
2736 self._gerrit_host = parsed_issue_arg.hostname
2737 self._gerrit_server = 'https://%s' % self._gerrit_host
2738
tandriic2405f52016-10-10 08:13:15 -07002739 try:
2740 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002741 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002742 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002743
2744 if not parsed_issue_arg.patchset:
2745 # Use current revision by default.
2746 revision_info = detail['revisions'][detail['current_revision']]
2747 patchset = int(revision_info['_number'])
2748 else:
2749 patchset = parsed_issue_arg.patchset
2750 for revision_info in detail['revisions'].itervalues():
2751 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2752 break
2753 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002754 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002755 (parsed_issue_arg.patchset, self.GetIssue()))
2756
2757 fetch_info = revision_info['fetch']['http']
2758 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002759 self.SetIssue(self.GetIssue())
2760 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002761 RunGit(['cherry-pick', 'FETCH_HEAD'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002762 print('Committed patch for change %i patchset %i locally' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002763 (self.GetIssue(), self.GetPatchset()))
2764 return 0
2765
2766 @staticmethod
2767 def ParseIssueURL(parsed_url):
2768 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2769 return None
2770 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2771 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2772 # Short urls like https://domain/<issue_number> can be used, but don't allow
2773 # specifying the patchset (you'd 404), but we allow that here.
2774 if parsed_url.path == '/':
2775 part = parsed_url.fragment
2776 else:
2777 part = parsed_url.path
2778 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2779 if match:
2780 return _ParsedIssueNumberArgument(
2781 issue=int(match.group(2)),
2782 patchset=int(match.group(4)) if match.group(4) else None,
2783 hostname=parsed_url.netloc)
2784 return None
2785
tandrii16e0b4e2016-06-07 10:34:28 -07002786 def _GerritCommitMsgHookCheck(self, offer_removal):
2787 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2788 if not os.path.exists(hook):
2789 return
2790 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2791 # custom developer made one.
2792 data = gclient_utils.FileRead(hook)
2793 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2794 return
2795 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002796 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002797 'and may interfere with it in subtle ways.\n'
2798 'We recommend you remove the commit-msg hook.')
2799 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002800 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002801 gclient_utils.rm_file_or_tree(hook)
2802 print('Gerrit commit-msg hook removed.')
2803 else:
2804 print('OK, will keep Gerrit commit-msg hook in place.')
2805
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002806 def CMDUploadChange(self, options, args, change):
2807 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002808 if options.squash and options.no_squash:
2809 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002810
2811 if not options.squash and not options.no_squash:
2812 # Load default for user, repo, squash=true, in this order.
2813 options.squash = settings.GetSquashGerritUploads()
2814 elif options.no_squash:
2815 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002816
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002817 # We assume the remote called "origin" is the one we want.
2818 # It is probably not worthwhile to support different workflows.
2819 gerrit_remote = 'origin'
2820
2821 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002822 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002823
Aaron Gableb56ad332017-01-06 15:24:31 -08002824 # This may be None; default fallback value is determined in logic below.
2825 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002826 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002827
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002828 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002829 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002830 if self.GetIssue():
2831 # Try to get the message from a previous upload.
2832 message = self.GetDescription()
2833 if not message:
2834 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002835 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002836 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002837 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002838 if options.message:
2839 # For compatibility with Rietveld, if -m|--message is given on
2840 # command line, title should be the first line of that message,
2841 # which shouldn't be confused with CL description.
2842 default_title = options.message.strip().split()[0]
2843 else:
2844 default_title = RunGit(
2845 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002846 if options.force:
2847 title = default_title
2848 else:
2849 title = ask_for_data(
2850 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002851 if title == default_title:
2852 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002853 change_id = self._GetChangeDetail()['change_id']
2854 while True:
2855 footer_change_ids = git_footers.get_footer_change_id(message)
2856 if footer_change_ids == [change_id]:
2857 break
2858 if not footer_change_ids:
2859 message = git_footers.add_footer_change_id(message, change_id)
Aaron Gablea45ee112016-11-22 15:14:38 -08002860 print('WARNING: appended missing Change-Id to change description')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002861 continue
2862 # There is already a valid footer but with different or several ids.
2863 # Doing this automatically is non-trivial as we don't want to lose
2864 # existing other footers, yet we want to append just 1 desired
2865 # Change-Id. Thus, just create a new footer, but let user verify the
2866 # new description.
2867 message = '%s\n\nChange-Id: %s' % (message, change_id)
2868 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002869 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002870 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002871 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002872 'Please, check the proposed correction to the description, '
2873 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2874 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2875 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002876 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002877 if not options.force:
2878 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002879 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880 message = change_desc.description
2881 if not message:
2882 DieWithError("Description is empty. Aborting...")
2883 # Continue the while loop.
2884 # Sanity check of this code - we should end up with proper message
2885 # footer.
2886 assert [change_id] == git_footers.get_footer_change_id(message)
2887 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002888 else: # if not self.GetIssue()
2889 if options.message:
2890 message = options.message
2891 else:
2892 message = CreateDescriptionFromLog(args)
2893 if options.title:
2894 message = options.title + '\n\n' + message
2895 change_desc = ChangeDescription(message)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002896 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002897 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002898 # On first upload, patchset title is always this string, while
2899 # --title flag gets converted to first line of message.
2900 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002901 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002902 if not change_desc.description:
2903 DieWithError("Description is empty. Aborting...")
2904 message = change_desc.description
2905 change_ids = git_footers.get_footer_change_id(message)
2906 if len(change_ids) > 1:
2907 DieWithError('too many Change-Id footers, at most 1 allowed.')
2908 if not change_ids:
2909 # Generate the Change-Id automatically.
2910 message = git_footers.add_footer_change_id(
2911 message, GenerateGerritChangeId(message))
2912 change_desc.set_description(message)
2913 change_ids = git_footers.get_footer_change_id(message)
2914 assert len(change_ids) == 1
2915 change_id = change_ids[0]
2916
2917 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Aaron Gablef97e33d2017-03-30 15:44:27 -07002918 parent = self._ComputeParent(remote, upstream_branch, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002919 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2920 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2921 '-m', message]).strip()
2922 else:
2923 change_desc = ChangeDescription(
2924 options.message or CreateDescriptionFromLog(args))
2925 if not change_desc.description:
2926 DieWithError("Description is empty. Aborting...")
2927
2928 if not git_footers.get_footer_change_id(change_desc.description):
2929 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002930 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2931 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002932 ref_to_push = 'HEAD'
2933 parent = '%s/%s' % (gerrit_remote, branch)
2934 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2935
2936 assert change_desc
2937 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2938 ref_to_push)]).splitlines()
2939 if len(commits) > 1:
2940 print('WARNING: This will upload %d commits. Run the following command '
2941 'to see which commits will be uploaded: ' % len(commits))
2942 print('git log %s..%s' % (parent, ref_to_push))
2943 print('You can also use `git squash-branch` to squash these into a '
2944 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002945 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002946
2947 if options.reviewers or options.tbr_owners:
2948 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2949 change)
2950
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002951 # Extra options that can be specified at push time. Doc:
2952 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002953 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002954 if change_desc.get_reviewers(tbr_only=True):
2955 print('Adding self-LGTM (Code-Review +1) because of TBRs')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002956 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002957
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002958
2959 # TODO(tandrii): options.message should be posted as a comment
2960 # if --send-email is set on non-initial upload as Rietveld used to do it.
2961
Aaron Gable9b713dd2016-12-14 16:04:21 -08002962 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002963 if not re.match(r'^[\w ]+$', title):
2964 title = re.sub(r'[^\w ]', '', title)
2965 if not automatic_title:
2966 print('WARNING: Patchset title may only contain alphanumeric chars '
2967 'and spaces. You can edit it in the UI. '
2968 'See https://crbug.com/663787.\n'
2969 'Cleaned up title: %s' % title)
2970 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2971 # reverse on its side.
2972 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002973
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002974 if options.send_mail:
2975 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002976 DieWithError('Must specify reviewers to send email.', change_desc)
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002977 refspec_opts.append('notify=ALL')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002978 else:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002979 refspec_opts.append('notify=NONE')
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002980
tandrii99a72f22016-08-17 14:33:24 -07002981 reviewers = change_desc.get_reviewers()
2982 if reviewers:
Andrii Shyshkalovfbee1652017-04-10 14:00:51 +02002983 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002984
agablec6787972016-09-09 16:13:34 -07002985 if options.private:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002986 refspec_opts.append('draft')
agablec6787972016-09-09 16:13:34 -07002987
rmistry9eadede2016-09-19 11:22:43 -07002988 if options.topic:
2989 # Documentation on Gerrit topics is here:
2990 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002991 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002992
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002993 refspec_suffix = ''
2994 if refspec_opts:
2995 refspec_suffix = '%' + ','.join(refspec_opts)
2996 assert ' ' not in refspec_suffix, (
2997 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2998 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2999
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003000 try:
3001 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003002 ['git', 'push', self.GetRemoteUrl(), refspec],
3003 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003004 # Flush after every line: useful for seeing progress when running as
3005 # recipe.
3006 filter_fn=lambda _: sys.stdout.flush())
3007 except subprocess2.CalledProcessError:
3008 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003009 'for the reason of the failure.\n'
3010 'Hint: run command below to diangose common Git/Gerrit '
3011 'credential problems:\n'
3012 ' git cl creds-check\n',
3013 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003014
3015 if options.squash:
3016 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3017 change_numbers = [m.group(1)
3018 for m in map(regex.match, push_stdout.splitlines())
3019 if m]
3020 if len(change_numbers) != 1:
3021 DieWithError(
3022 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003023 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003024 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003025 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003026
3027 # Add cc's from the CC_LIST and --cc flag (if any).
3028 cc = self.GetCCList().split(',')
3029 if options.cc:
3030 cc.extend(options.cc)
3031 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003032 if change_desc.get_cced():
3033 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07003034 if cc:
Aaron Gable5db82092016-11-17 10:52:08 -08003035 gerrit_util.AddReviewers(
Aaron Gable59f48512017-01-12 10:54:46 -08003036 self._GetGerritHost(), self.GetIssue(), cc,
3037 is_reviewer=False, notify=bool(options.send_mail))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003038 return 0
3039
Aaron Gablef97e33d2017-03-30 15:44:27 -07003040 def _ComputeParent(self, remote, upstream_branch, change_desc):
3041 if remote != '.':
3042 return self.GetCommonAncestorWithUpstream()
3043
3044 # If our upstream branch is local, we base our squashed commit on its
3045 # squashed version.
3046 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3047
3048 # TODO(tandrii): Remove this master-specific hack
3049 # Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=682104
3050 if upstream_branch_name == 'master':
3051 return RunGitSilent(['rev-parse', 'origin/master']).strip()
3052
3053 # Check the squashed hash of the parent.
3054 parent = RunGit(['config',
3055 'branch.%s.gerritsquashhash' % upstream_branch_name],
3056 error_ok=True).strip()
3057 # Verify that the upstream branch has been uploaded too, otherwise
3058 # Gerrit will create additional CLs when uploading.
3059 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3060 RunGitSilent(['rev-parse', parent + ':'])):
3061 DieWithError(
3062 '\nUpload upstream branch %s first.\n'
3063 'It is likely that this branch has been rebased since its last '
3064 'upload, so you just need to upload it again.\n'
3065 '(If you uploaded it with --no-squash, then branch dependencies '
3066 'are not supported, and you should reupload with --squash.)'
3067 % upstream_branch_name,
3068 change_desc)
3069 return parent
3070
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003071 def _AddChangeIdToCommitMessage(self, options, args):
3072 """Re-commits using the current message, assumes the commit hook is in
3073 place.
3074 """
3075 log_desc = options.message or CreateDescriptionFromLog(args)
3076 git_command = ['commit', '--amend', '-m', log_desc]
3077 RunGit(git_command)
3078 new_log_desc = CreateDescriptionFromLog(args)
3079 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003080 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003081 return new_log_desc
3082 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003083 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003084
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003085 def SetCQState(self, new_state):
3086 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003087 vote_map = {
3088 _CQState.NONE: 0,
3089 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003090 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003091 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003092 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3093 if new_state == _CQState.DRY_RUN:
3094 # Don't spam everybody reviewer/owner.
3095 kwargs['notify'] = 'NONE'
3096 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003097
tandriie113dfd2016-10-11 10:20:12 -07003098 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003099 try:
3100 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003101 except GerritChangeNotExists:
3102 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003103
3104 if data['status'] in ('ABANDONED', 'MERGED'):
3105 return 'CL %s is closed' % self.GetIssue()
3106
3107 def GetTryjobProperties(self, patchset=None):
3108 """Returns dictionary of properties to launch tryjob."""
3109 data = self._GetChangeDetail(['ALL_REVISIONS'])
3110 patchset = int(patchset or self.GetPatchset())
3111 assert patchset
3112 revision_data = None # Pylint wants it to be defined.
3113 for revision_data in data['revisions'].itervalues():
3114 if int(revision_data['_number']) == patchset:
3115 break
3116 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003117 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003118 (patchset, self.GetIssue()))
3119 return {
3120 'patch_issue': self.GetIssue(),
3121 'patch_set': patchset or self.GetPatchset(),
3122 'patch_project': data['project'],
3123 'patch_storage': 'gerrit',
3124 'patch_ref': revision_data['fetch']['http']['ref'],
3125 'patch_repository_url': revision_data['fetch']['http']['url'],
3126 'patch_gerrit_url': self.GetCodereviewServer(),
3127 }
tandriie113dfd2016-10-11 10:20:12 -07003128
tandriide281ae2016-10-12 06:02:30 -07003129 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003130 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003131
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003132
3133_CODEREVIEW_IMPLEMENTATIONS = {
3134 'rietveld': _RietveldChangelistImpl,
3135 'gerrit': _GerritChangelistImpl,
3136}
3137
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003138
iannuccie53c9352016-08-17 14:40:40 -07003139def _add_codereview_issue_select_options(parser, extra=""):
3140 _add_codereview_select_options(parser)
3141
3142 text = ('Operate on this issue number instead of the current branch\'s '
3143 'implicit issue.')
3144 if extra:
3145 text += ' '+extra
3146 parser.add_option('-i', '--issue', type=int, help=text)
3147
3148
3149def _process_codereview_issue_select_options(parser, options):
3150 _process_codereview_select_options(parser, options)
3151 if options.issue is not None and not options.forced_codereview:
3152 parser.error('--issue must be specified with either --rietveld or --gerrit')
3153
3154
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003155def _add_codereview_select_options(parser):
3156 """Appends --gerrit and --rietveld options to force specific codereview."""
3157 parser.codereview_group = optparse.OptionGroup(
3158 parser, 'EXPERIMENTAL! Codereview override options')
3159 parser.add_option_group(parser.codereview_group)
3160 parser.codereview_group.add_option(
3161 '--gerrit', action='store_true',
3162 help='Force the use of Gerrit for codereview')
3163 parser.codereview_group.add_option(
3164 '--rietveld', action='store_true',
3165 help='Force the use of Rietveld for codereview')
3166
3167
3168def _process_codereview_select_options(parser, options):
3169 if options.gerrit and options.rietveld:
3170 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3171 options.forced_codereview = None
3172 if options.gerrit:
3173 options.forced_codereview = 'gerrit'
3174 elif options.rietveld:
3175 options.forced_codereview = 'rietveld'
3176
3177
tandriif9aefb72016-07-01 09:06:51 -07003178def _get_bug_line_values(default_project, bugs):
3179 """Given default_project and comma separated list of bugs, yields bug line
3180 values.
3181
3182 Each bug can be either:
3183 * a number, which is combined with default_project
3184 * string, which is left as is.
3185
3186 This function may produce more than one line, because bugdroid expects one
3187 project per line.
3188
3189 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3190 ['v8:123', 'chromium:789']
3191 """
3192 default_bugs = []
3193 others = []
3194 for bug in bugs.split(','):
3195 bug = bug.strip()
3196 if bug:
3197 try:
3198 default_bugs.append(int(bug))
3199 except ValueError:
3200 others.append(bug)
3201
3202 if default_bugs:
3203 default_bugs = ','.join(map(str, default_bugs))
3204 if default_project:
3205 yield '%s:%s' % (default_project, default_bugs)
3206 else:
3207 yield default_bugs
3208 for other in sorted(others):
3209 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3210 yield other
3211
3212
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003213class ChangeDescription(object):
3214 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003215 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003216 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003217 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003218 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003219
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003220 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003221 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003222
agable@chromium.org42c20792013-09-12 17:34:49 +00003223 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003224 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003225 return '\n'.join(self._description_lines)
3226
3227 def set_description(self, desc):
3228 if isinstance(desc, basestring):
3229 lines = desc.splitlines()
3230 else:
3231 lines = [line.rstrip() for line in desc]
3232 while lines and not lines[0]:
3233 lines.pop(0)
3234 while lines and not lines[-1]:
3235 lines.pop(-1)
3236 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003237
piman@chromium.org336f9122014-09-04 02:16:55 +00003238 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003239 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003240 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003241 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003242 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003243 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003244
agable@chromium.org42c20792013-09-12 17:34:49 +00003245 # Get the set of R= and TBR= lines and remove them from the desciption.
3246 regexp = re.compile(self.R_LINE)
3247 matches = [regexp.match(line) for line in self._description_lines]
3248 new_desc = [l for i, l in enumerate(self._description_lines)
3249 if not matches[i]]
3250 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003251
agable@chromium.org42c20792013-09-12 17:34:49 +00003252 # Construct new unified R= and TBR= lines.
3253 r_names = []
3254 tbr_names = []
3255 for match in matches:
3256 if not match:
3257 continue
3258 people = cleanup_list([match.group(2).strip()])
3259 if match.group(1) == 'TBR':
3260 tbr_names.extend(people)
3261 else:
3262 r_names.extend(people)
3263 for name in r_names:
3264 if name not in reviewers:
3265 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003266 if add_owners_tbr:
3267 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003268 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003269 all_reviewers = set(tbr_names + reviewers)
3270 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3271 all_reviewers)
3272 tbr_names.extend(owners_db.reviewers_for(missing_files,
3273 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003274 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3275 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3276
3277 # Put the new lines in the description where the old first R= line was.
3278 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3279 if 0 <= line_loc < len(self._description_lines):
3280 if new_tbr_line:
3281 self._description_lines.insert(line_loc, new_tbr_line)
3282 if new_r_line:
3283 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003284 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003285 if new_r_line:
3286 self.append_footer(new_r_line)
3287 if new_tbr_line:
3288 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003289
Aaron Gable3a16ed12017-03-23 10:51:55 -07003290 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003291 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003292 self.set_description([
3293 '# Enter a description of the change.',
3294 '# This will be displayed on the codereview site.',
3295 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003296 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003297 '--------------------',
3298 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003299
agable@chromium.org42c20792013-09-12 17:34:49 +00003300 regexp = re.compile(self.BUG_LINE)
3301 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003302 prefix = settings.GetBugPrefix()
3303 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003304 if git_footer:
3305 self.append_footer('Bug: %s' % ', '.join(values))
3306 else:
3307 for value in values:
3308 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003309
agable@chromium.org42c20792013-09-12 17:34:49 +00003310 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003311 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003312 if not content:
3313 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003314 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003315
3316 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003317 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3318 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003319 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003320 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003321
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003322 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003323 """Adds a footer line to the description.
3324
3325 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3326 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3327 that Gerrit footers are always at the end.
3328 """
3329 parsed_footer_line = git_footers.parse_footer(line)
3330 if parsed_footer_line:
3331 # Line is a gerrit footer in the form: Footer-Key: any value.
3332 # Thus, must be appended observing Gerrit footer rules.
3333 self.set_description(
3334 git_footers.add_footer(self.description,
3335 key=parsed_footer_line[0],
3336 value=parsed_footer_line[1]))
3337 return
3338
3339 if not self._description_lines:
3340 self._description_lines.append(line)
3341 return
3342
3343 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3344 if gerrit_footers:
3345 # git_footers.split_footers ensures that there is an empty line before
3346 # actual (gerrit) footers, if any. We have to keep it that way.
3347 assert top_lines and top_lines[-1] == ''
3348 top_lines, separator = top_lines[:-1], top_lines[-1:]
3349 else:
3350 separator = [] # No need for separator if there are no gerrit_footers.
3351
3352 prev_line = top_lines[-1] if top_lines else ''
3353 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3354 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3355 top_lines.append('')
3356 top_lines.append(line)
3357 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003358
tandrii99a72f22016-08-17 14:33:24 -07003359 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003360 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003361 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003362 reviewers = [match.group(2).strip()
3363 for match in matches
3364 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003365 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003366
bradnelsond975b302016-10-23 12:20:23 -07003367 def get_cced(self):
3368 """Retrieves the list of reviewers."""
3369 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3370 cced = [match.group(2).strip() for match in matches if match]
3371 return cleanup_list(cced)
3372
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003373 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3374 """Updates this commit description given the parent.
3375
3376 This is essentially what Gnumbd used to do.
3377 Consult https://goo.gl/WMmpDe for more details.
3378 """
3379 assert parent_msg # No, orphan branch creation isn't supported.
3380 assert parent_hash
3381 assert dest_ref
3382 parent_footer_map = git_footers.parse_footers(parent_msg)
3383 # This will also happily parse svn-position, which GnumbD is no longer
3384 # supporting. While we'd generate correct footers, the verifier plugin
3385 # installed in Gerrit will block such commit (ie git push below will fail).
3386 parent_position = git_footers.get_position(parent_footer_map)
3387
3388 # Cherry-picks may have last line obscuring their prior footers,
3389 # from git_footers perspective. This is also what Gnumbd did.
3390 cp_line = None
3391 if (self._description_lines and
3392 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3393 cp_line = self._description_lines.pop()
3394
3395 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3396
3397 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3398 # user interference with actual footers we'd insert below.
3399 for i, (k, v) in enumerate(parsed_footers):
3400 if k.startswith('Cr-'):
3401 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3402
3403 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003404 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003405 if parent_position[0] == dest_ref:
3406 # Same branch as parent.
3407 number = int(parent_position[1]) + 1
3408 else:
3409 number = 1 # New branch, and extra lineage.
3410 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3411 int(parent_position[1])))
3412
3413 parsed_footers.append(('Cr-Commit-Position',
3414 '%s@{#%d}' % (dest_ref, number)))
3415 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3416
3417 self._description_lines = top_lines
3418 if cp_line:
3419 self._description_lines.append(cp_line)
3420 if self._description_lines[-1] != '':
3421 self._description_lines.append('') # Ensure footer separator.
3422 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3423
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003424
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003425def get_approving_reviewers(props):
3426 """Retrieves the reviewers that approved a CL from the issue properties with
3427 messages.
3428
3429 Note that the list may contain reviewers that are not committer, thus are not
3430 considered by the CQ.
3431 """
3432 return sorted(
3433 set(
3434 message['sender']
3435 for message in props['messages']
3436 if message['approval'] and message['sender'] in props['reviewers']
3437 )
3438 )
3439
3440
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003441def FindCodereviewSettingsFile(filename='codereview.settings'):
3442 """Finds the given file starting in the cwd and going up.
3443
3444 Only looks up to the top of the repository unless an
3445 'inherit-review-settings-ok' file exists in the root of the repository.
3446 """
3447 inherit_ok_file = 'inherit-review-settings-ok'
3448 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003449 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003450 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3451 root = '/'
3452 while True:
3453 if filename in os.listdir(cwd):
3454 if os.path.isfile(os.path.join(cwd, filename)):
3455 return open(os.path.join(cwd, filename))
3456 if cwd == root:
3457 break
3458 cwd = os.path.dirname(cwd)
3459
3460
3461def LoadCodereviewSettingsFromFile(fileobj):
3462 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003463 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003464
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003465 def SetProperty(name, setting, unset_error_ok=False):
3466 fullname = 'rietveld.' + name
3467 if setting in keyvals:
3468 RunGit(['config', fullname, keyvals[setting]])
3469 else:
3470 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3471
tandrii48df5812016-10-17 03:55:37 -07003472 if not keyvals.get('GERRIT_HOST', False):
3473 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003474 # Only server setting is required. Other settings can be absent.
3475 # In that case, we ignore errors raised during option deletion attempt.
3476 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003477 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003478 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3479 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003480 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003481 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3482 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003483 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003484 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3485 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003486
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003487 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003488 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003489
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003490 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003491 RunGit(['config', 'gerrit.squash-uploads',
3492 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003493
tandrii@chromium.org28253532016-04-14 13:46:56 +00003494 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003495 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003496 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3497
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003498 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003499 # should be of the form
3500 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3501 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003502 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3503 keyvals['ORIGIN_URL_CONFIG']])
3504
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003505
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003506def urlretrieve(source, destination):
3507 """urllib is broken for SSL connections via a proxy therefore we
3508 can't use urllib.urlretrieve()."""
3509 with open(destination, 'w') as f:
3510 f.write(urllib2.urlopen(source).read())
3511
3512
ukai@chromium.org712d6102013-11-27 00:52:58 +00003513def hasSheBang(fname):
3514 """Checks fname is a #! script."""
3515 with open(fname) as f:
3516 return f.read(2).startswith('#!')
3517
3518
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003519# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3520def DownloadHooks(*args, **kwargs):
3521 pass
3522
3523
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003524def DownloadGerritHook(force):
3525 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003526
3527 Args:
3528 force: True to update hooks. False to install hooks if not present.
3529 """
3530 if not settings.GetIsGerrit():
3531 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003532 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003533 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3534 if not os.access(dst, os.X_OK):
3535 if os.path.exists(dst):
3536 if not force:
3537 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003538 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003539 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003540 if not hasSheBang(dst):
3541 DieWithError('Not a script: %s\n'
3542 'You need to download from\n%s\n'
3543 'into .git/hooks/commit-msg and '
3544 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003545 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3546 except Exception:
3547 if os.path.exists(dst):
3548 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003549 DieWithError('\nFailed to download hooks.\n'
3550 'You need to download from\n%s\n'
3551 'into .git/hooks/commit-msg and '
3552 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003553
3554
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003555def GetRietveldCodereviewSettingsInteractively():
3556 """Prompt the user for settings."""
3557 server = settings.GetDefaultServerUrl(error_ok=True)
3558 prompt = 'Rietveld server (host[:port])'
3559 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3560 newserver = ask_for_data(prompt + ':')
3561 if not server and not newserver:
3562 newserver = DEFAULT_SERVER
3563 if newserver:
3564 newserver = gclient_utils.UpgradeToHttps(newserver)
3565 if newserver != server:
3566 RunGit(['config', 'rietveld.server', newserver])
3567
3568 def SetProperty(initial, caption, name, is_url):
3569 prompt = caption
3570 if initial:
3571 prompt += ' ("x" to clear) [%s]' % initial
3572 new_val = ask_for_data(prompt + ':')
3573 if new_val == 'x':
3574 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3575 elif new_val:
3576 if is_url:
3577 new_val = gclient_utils.UpgradeToHttps(new_val)
3578 if new_val != initial:
3579 RunGit(['config', 'rietveld.' + name, new_val])
3580
3581 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3582 SetProperty(settings.GetDefaultPrivateFlag(),
3583 'Private flag (rietveld only)', 'private', False)
3584 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3585 'tree-status-url', False)
3586 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3587 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3588 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3589 'run-post-upload-hook', False)
3590
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003591
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003592class _GitCookiesChecker(object):
3593 """Provides facilties for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003594
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003595 _GOOGLESOURCE = 'googlesource.com'
3596
3597 def __init__(self):
3598 # Cached list of [host, identity, source], where source is either
3599 # .gitcookies or .netrc.
3600 self._all_hosts = None
3601
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003602 def ensure_configured_gitcookies(self):
3603 """Runs checks and suggests fixes to make git use .gitcookies from default
3604 path."""
3605 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3606 configured_path = RunGitSilent(
3607 ['config', '--global', 'http.cookiefile']).strip()
3608 if configured_path:
3609 self._ensure_default_gitcookies_path(configured_path, default)
3610 else:
3611 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003612
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003613 @staticmethod
3614 def _ensure_default_gitcookies_path(configured_path, default_path):
3615 assert configured_path
3616 if configured_path == default_path:
3617 print('git is already configured to use your .gitcookies from %s' %
3618 configured_path)
3619 return
3620
3621 print('WARNING: you have configured custom path to .gitcookies: %s\n'
3622 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3623 (configured_path, default_path))
3624
3625 if not os.path.exists(configured_path):
3626 print('However, your configured .gitcookies file is missing.')
3627 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3628 action='reconfigure')
3629 RunGit(['config', '--global', 'http.cookiefile', default_path])
3630 return
3631
3632 if os.path.exists(default_path):
3633 print('WARNING: default .gitcookies file already exists %s' %
3634 default_path)
3635 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3636 default_path)
3637
3638 confirm_or_exit('Move existing .gitcookies to default location?',
3639 action='move')
3640 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003641 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003642 print('Moved and reconfigured git to use .gitcookies from %s' %
3643 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003644
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003645 @staticmethod
3646 def _configure_gitcookies_path(default_path):
3647 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3648 if os.path.exists(netrc_path):
3649 print('You seem to be using outdated .netrc for git credentials: %s' %
3650 netrc_path)
3651 print('This tool will guide you through setting up recommended '
3652 '.gitcookies store for git credentials.\n'
3653 '\n'
3654 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3655 ' git config --global --unset http.cookiefile\n'
3656 ' mv %s %s.backup\n\n' % (default_path, default_path))
3657 confirm_or_exit(action='setup .gitcookies')
3658 RunGit(['config', '--global', 'http.cookiefile', default_path])
3659 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003660
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003661 def get_hosts_with_creds(self, include_netrc=False):
3662 if self._all_hosts is None:
3663 a = gerrit_util.CookiesAuthenticator()
3664 self._all_hosts = [
3665 (h, u, s)
3666 for h, u, s in itertools.chain(
3667 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3668 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3669 )
3670 if h.endswith(self._GOOGLESOURCE)
3671 ]
3672
3673 if include_netrc:
3674 return self._all_hosts
3675 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3676
3677 def print_current_creds(self, include_netrc=False):
3678 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3679 if not hosts:
3680 print('No Git/Gerrit credentials found')
3681 return
3682 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3683 header = [('Host', 'User', 'Which file'),
3684 ['=' * l for l in lengths]]
3685 for row in (header + hosts):
3686 print('\t'.join((('%%+%ds' % l) % s)
3687 for l, s in zip(lengths, row)))
3688
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003689 @staticmethod
3690 def _parse_identity(identity):
3691 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3692 username, domain = identity.split('.', 1)
3693 if username.startswith('git-'):
3694 username = username[len('git-'):]
3695 return username, domain
3696
3697 def _get_usernames_of_domain(self, domain):
3698 """Returns list of usernames referenced by .gitcookies in a given domain."""
3699 identities_by_domain = {}
3700 for _, identity, _ in self.get_hosts_with_creds():
3701 username, domain = self._parse_identity(identity)
3702 identities_by_domain.setdefault(domain, []).append(username)
3703 return identities_by_domain.get(domain)
3704
3705 def _canonical_git_googlesource_host(self, host):
3706 """Normalizes Gerrit hosts (with '-review') to Git host."""
3707 assert host.endswith(self._GOOGLESOURCE)
3708 # Prefix doesn't include '.' at the end.
3709 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3710 if prefix.endswith('-review'):
3711 prefix = prefix[:-len('-review')]
3712 return prefix + '.' + self._GOOGLESOURCE
3713
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003714 def _canonical_gerrit_googlesource_host(self, host):
3715 git_host = self._canonical_git_googlesource_host(host)
3716 prefix = git_host.split('.', 1)[0]
3717 return prefix + '-review.' + self._GOOGLESOURCE
3718
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003719 def has_generic_host(self):
3720 """Returns whether generic .googlesource.com has been configured.
3721
3722 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3723 """
3724 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3725 if host == '.' + self._GOOGLESOURCE:
3726 return True
3727 return False
3728
3729 def _get_git_gerrit_identity_pairs(self):
3730 """Returns map from canonic host to pair of identities (Git, Gerrit).
3731
3732 One of identities might be None, meaning not configured.
3733 """
3734 host_to_identity_pairs = {}
3735 for host, identity, _ in self.get_hosts_with_creds():
3736 canonical = self._canonical_git_googlesource_host(host)
3737 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3738 idx = 0 if canonical == host else 1
3739 pair[idx] = identity
3740 return host_to_identity_pairs
3741
3742 def get_partially_configured_hosts(self):
3743 return set(
3744 host for host, identities_pair in
3745 self._get_git_gerrit_identity_pairs().iteritems()
3746 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3747
3748 def get_conflicting_hosts(self):
3749 return set(
3750 host for host, (i1, i2) in
3751 self._get_git_gerrit_identity_pairs().iteritems()
3752 if None not in (i1, i2) and i1 != i2)
3753
3754 def get_duplicated_hosts(self):
3755 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3756 return set(host for host, count in counters.iteritems() if count > 1)
3757
3758 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3759 'chromium.googlesource.com': 'chromium.org',
3760 'chrome-internal.googlesource.com': 'google.com',
3761 }
3762
3763 def get_hosts_with_wrong_identities(self):
3764 """Finds hosts which **likely** reference wrong identities.
3765
3766 Note: skips hosts which have conflicting identities for Git and Gerrit.
3767 """
3768 hosts = set()
3769 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3770 pair = self._get_git_gerrit_identity_pairs().get(host)
3771 if pair and pair[0] == pair[1]:
3772 _, domain = self._parse_identity(pair[0])
3773 if domain != expected:
3774 hosts.add(host)
3775 return hosts
3776
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003777 @staticmethod
3778 def print_hosts(hosts, extra_column_func=None):
3779 hosts = sorted(hosts)
3780 assert hosts
3781 if extra_column_func is None:
3782 extras = [''] * len(hosts)
3783 else:
3784 extras = [extra_column_func(host) for host in hosts]
3785 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3786 for he in zip(hosts, extras):
3787 print(tmpl % he)
3788 print()
3789
3790 def find_and_report_problems(self):
3791 """Returns True if there was at least one problem, else False."""
3792 problems = [False]
3793 def add_problem():
3794 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003795 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003796 problems[0] = True
3797
3798 if self.has_generic_host():
3799 add_problem()
3800 print(' .googlesource.com record detected\n'
3801 ' Chrome Infrastructure team recommends to list full host names '
3802 'explicitly.\n')
3803
3804 dups = self.get_duplicated_hosts()
3805 if dups:
3806 add_problem()
3807 print(' The following hosts were defined twice:\n')
3808 self.print_hosts(dups)
3809
3810 partial = self.get_partially_configured_hosts()
3811 if partial:
3812 add_problem()
3813 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3814 'These hosts are missing:')
3815 self.print_hosts(partial)
3816
3817 conflicting = self.get_conflicting_hosts()
3818 if conflicting:
3819 add_problem()
3820 print(' The following Git hosts have differing credentials from their '
3821 'Gerrit counterparts:\n')
3822 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3823 tuple(self._get_git_gerrit_identity_pairs()[host]))
3824
3825 wrong = self.get_hosts_with_wrong_identities()
3826 if wrong:
3827 add_problem()
3828 print(' These hosts likely use wrong identity:\n')
3829 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3830 (self._get_git_gerrit_identity_pairs()[host][0],
3831 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3832 return problems[0]
3833
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003834
3835def CMDcreds_check(parser, args):
3836 """Checks credentials and suggests changes."""
3837 _, _ = parser.parse_args(args)
3838
3839 if gerrit_util.GceAuthenticator.is_gce():
3840 DieWithError('this command is not designed for GCE, are you on a bot?')
3841
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003842 checker = _GitCookiesChecker()
3843 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003844
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003845 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003846 checker.print_current_creds(include_netrc=True)
3847
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003848 if not checker.find_and_report_problems():
3849 print('\nNo problems detected in your .gitcookies')
3850 return 0
3851 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003852
3853
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003854@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003855def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003856 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003857
tandrii5d0a0422016-09-14 06:24:35 -07003858 print('WARNING: git cl config works for Rietveld only')
3859 # TODO(tandrii): remove this once we switch to Gerrit.
3860 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003861 parser.add_option('--activate-update', action='store_true',
3862 help='activate auto-updating [rietveld] section in '
3863 '.git/config')
3864 parser.add_option('--deactivate-update', action='store_true',
3865 help='deactivate auto-updating [rietveld] section in '
3866 '.git/config')
3867 options, args = parser.parse_args(args)
3868
3869 if options.deactivate_update:
3870 RunGit(['config', 'rietveld.autoupdate', 'false'])
3871 return
3872
3873 if options.activate_update:
3874 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3875 return
3876
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003877 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003878 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003879 return 0
3880
3881 url = args[0]
3882 if not url.endswith('codereview.settings'):
3883 url = os.path.join(url, 'codereview.settings')
3884
3885 # Load code review settings and download hooks (if available).
3886 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3887 return 0
3888
3889
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003890def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003891 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003892 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3893 branch = ShortBranchName(branchref)
3894 _, args = parser.parse_args(args)
3895 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003896 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003897 return RunGit(['config', 'branch.%s.base-url' % branch],
3898 error_ok=False).strip()
3899 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003901 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3902 error_ok=False).strip()
3903
3904
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003905def color_for_status(status):
3906 """Maps a Changelist status to color, for CMDstatus and other tools."""
3907 return {
3908 'unsent': Fore.RED,
3909 'waiting': Fore.BLUE,
3910 'reply': Fore.YELLOW,
3911 'lgtm': Fore.GREEN,
3912 'commit': Fore.MAGENTA,
3913 'closed': Fore.CYAN,
3914 'error': Fore.WHITE,
3915 }.get(status, Fore.WHITE)
3916
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003917
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003918def get_cl_statuses(changes, fine_grained, max_processes=None):
3919 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003920
3921 If fine_grained is true, this will fetch CL statuses from the server.
3922 Otherwise, simply indicate if there's a matching url for the given branches.
3923
3924 If max_processes is specified, it is used as the maximum number of processes
3925 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3926 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003927
3928 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003929 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003930 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003931 upload.verbosity = 0
3932
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003933 if not changes:
3934 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003935
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003936 if not fine_grained:
3937 # Fast path which doesn't involve querying codereview servers.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003938 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003939 for cl in changes:
3940 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003941 return
3942
3943 # First, sort out authentication issues.
3944 logging.debug('ensuring credentials exist')
3945 for cl in changes:
3946 cl.EnsureAuthenticated(force=False, refresh=True)
3947
3948 def fetch(cl):
3949 try:
3950 return (cl, cl.GetStatus())
3951 except:
3952 # See http://crbug.com/629863.
3953 logging.exception('failed to fetch status for %s:', cl)
3954 raise
3955
3956 threads_count = len(changes)
3957 if max_processes:
3958 threads_count = max(1, min(threads_count, max_processes))
3959 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
3960
3961 pool = ThreadPool(threads_count)
3962 fetched_cls = set()
3963 try:
3964 it = pool.imap_unordered(fetch, changes).__iter__()
3965 while True:
3966 try:
3967 cl, status = it.next(timeout=5)
3968 except multiprocessing.TimeoutError:
3969 break
3970 fetched_cls.add(cl)
3971 yield cl, status
3972 finally:
3973 pool.close()
3974
3975 # Add any branches that failed to fetch.
3976 for cl in set(changes) - fetched_cls:
3977 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003978
rmistry@google.com2dd99862015-06-22 12:22:18 +00003979
3980def upload_branch_deps(cl, args):
3981 """Uploads CLs of local branches that are dependents of the current branch.
3982
3983 If the local branch dependency tree looks like:
3984 test1 -> test2.1 -> test3.1
3985 -> test3.2
3986 -> test2.2 -> test3.3
3987
3988 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3989 run on the dependent branches in this order:
3990 test2.1, test3.1, test3.2, test2.2, test3.3
3991
3992 Note: This function does not rebase your local dependent branches. Use it when
3993 you make a change to the parent branch that will not conflict with its
3994 dependent branches, and you would like their dependencies updated in
3995 Rietveld.
3996 """
3997 if git_common.is_dirty_git_tree('upload-branch-deps'):
3998 return 1
3999
4000 root_branch = cl.GetBranch()
4001 if root_branch is None:
4002 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4003 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004004 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004005 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4006 'patchset dependencies without an uploaded CL.')
4007
4008 branches = RunGit(['for-each-ref',
4009 '--format=%(refname:short) %(upstream:short)',
4010 'refs/heads'])
4011 if not branches:
4012 print('No local branches found.')
4013 return 0
4014
4015 # Create a dictionary of all local branches to the branches that are dependent
4016 # on it.
4017 tracked_to_dependents = collections.defaultdict(list)
4018 for b in branches.splitlines():
4019 tokens = b.split()
4020 if len(tokens) == 2:
4021 branch_name, tracked = tokens
4022 tracked_to_dependents[tracked].append(branch_name)
4023
vapiera7fbd5a2016-06-16 09:17:49 -07004024 print()
4025 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004026 dependents = []
4027 def traverse_dependents_preorder(branch, padding=''):
4028 dependents_to_process = tracked_to_dependents.get(branch, [])
4029 padding += ' '
4030 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004031 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004032 dependents.append(dependent)
4033 traverse_dependents_preorder(dependent, padding)
4034 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004035 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004036
4037 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004038 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004039 return 0
4040
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004041 confirm_or_exit('This command will checkout all dependent branches and run '
4042 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004043
andybons@chromium.org962f9462016-02-03 20:00:42 +00004044 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004045 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004046 args.extend(['-t', 'Updated patchset dependency'])
4047
rmistry@google.com2dd99862015-06-22 12:22:18 +00004048 # Record all dependents that failed to upload.
4049 failures = {}
4050 # Go through all dependents, checkout the branch and upload.
4051 try:
4052 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004053 print()
4054 print('--------------------------------------')
4055 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004056 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004057 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004058 try:
4059 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004060 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004061 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004062 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004063 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004064 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004065 finally:
4066 # Swap back to the original root branch.
4067 RunGit(['checkout', '-q', root_branch])
4068
vapiera7fbd5a2016-06-16 09:17:49 -07004069 print()
4070 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004071 for dependent_branch in dependents:
4072 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004073 print(' %s : %s' % (dependent_branch, upload_status))
4074 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004075
4076 return 0
4077
4078
kmarshall3bff56b2016-06-06 18:31:47 -07004079def CMDarchive(parser, args):
4080 """Archives and deletes branches associated with closed changelists."""
4081 parser.add_option(
4082 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004083 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004084 parser.add_option(
4085 '-f', '--force', action='store_true',
4086 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004087 parser.add_option(
4088 '-d', '--dry-run', action='store_true',
4089 help='Skip the branch tagging and removal steps.')
4090 parser.add_option(
4091 '-t', '--notags', action='store_true',
4092 help='Do not tag archived branches. '
4093 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004094
4095 auth.add_auth_options(parser)
4096 options, args = parser.parse_args(args)
4097 if args:
4098 parser.error('Unsupported args: %s' % ' '.join(args))
4099 auth_config = auth.extract_auth_config_from_options(options)
4100
4101 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4102 if not branches:
4103 return 0
4104
vapiera7fbd5a2016-06-16 09:17:49 -07004105 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004106 changes = [Changelist(branchref=b, auth_config=auth_config)
4107 for b in branches.splitlines()]
4108 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4109 statuses = get_cl_statuses(changes,
4110 fine_grained=True,
4111 max_processes=options.maxjobs)
4112 proposal = [(cl.GetBranch(),
4113 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4114 for cl, status in statuses
4115 if status == 'closed']
4116 proposal.sort()
4117
4118 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004119 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004120 return 0
4121
4122 current_branch = GetCurrentBranch()
4123
vapiera7fbd5a2016-06-16 09:17:49 -07004124 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004125 if options.notags:
4126 for next_item in proposal:
4127 print(' ' + next_item[0])
4128 else:
4129 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4130 for next_item in proposal:
4131 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004132
kmarshall9249e012016-08-23 12:02:16 -07004133 # Quit now on precondition failure or if instructed by the user, either
4134 # via an interactive prompt or by command line flags.
4135 if options.dry_run:
4136 print('\nNo changes were made (dry run).\n')
4137 return 0
4138 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004139 print('You are currently on a branch \'%s\' which is associated with a '
4140 'closed codereview issue, so archive cannot proceed. Please '
4141 'checkout another branch and run this command again.' %
4142 current_branch)
4143 return 1
kmarshall9249e012016-08-23 12:02:16 -07004144 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004145 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4146 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004147 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004148 return 1
4149
4150 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004151 if not options.notags:
4152 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004153 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004154
vapiera7fbd5a2016-06-16 09:17:49 -07004155 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004156
4157 return 0
4158
4159
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004160def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004161 """Show status of changelists.
4162
4163 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004164 - Red not sent for review or broken
4165 - Blue waiting for review
4166 - Yellow waiting for you to reply to review
4167 - Green LGTM'ed
4168 - Magenta in the commit queue
4169 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004170
4171 Also see 'git cl comments'.
4172 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004173 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004174 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004175 parser.add_option('-f', '--fast', action='store_true',
4176 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004177 parser.add_option(
4178 '-j', '--maxjobs', action='store', type=int,
4179 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004180
4181 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004182 _add_codereview_issue_select_options(
4183 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004184 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004185 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004186 if args:
4187 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004188 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004189
iannuccie53c9352016-08-17 14:40:40 -07004190 if options.issue is not None and not options.field:
4191 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004192
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004193 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004194 cl = Changelist(auth_config=auth_config, issue=options.issue,
4195 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004197 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004198 elif options.field == 'id':
4199 issueid = cl.GetIssue()
4200 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004201 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004202 elif options.field == 'patch':
4203 patchset = cl.GetPatchset()
4204 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004205 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004206 elif options.field == 'status':
4207 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004208 elif options.field == 'url':
4209 url = cl.GetIssueURL()
4210 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004212 return 0
4213
4214 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4215 if not branches:
4216 print('No local branch found.')
4217 return 0
4218
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004219 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004220 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004221 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004222 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004223 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004224 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004225 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004226
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004227 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004228 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4229 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4230 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004231 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004232 c, status = output.next()
4233 branch_statuses[c.GetBranch()] = status
4234 status = branch_statuses.pop(branch)
4235 url = cl.GetIssueURL()
4236 if url and (not status or status == 'error'):
4237 # The issue probably doesn't exist anymore.
4238 url += ' (broken)'
4239
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004240 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004241 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004242 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004243 color = ''
4244 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004245 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004246 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004247 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004248 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004249
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004250
4251 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004252 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004253 print('Current branch: %s' % branch)
4254 for cl in changes:
4255 if cl.GetBranch() == branch:
4256 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004257 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004258 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004259 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004260 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004261 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004262 print('Issue description:')
4263 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004264 return 0
4265
4266
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004267def colorize_CMDstatus_doc():
4268 """To be called once in main() to add colors to git cl status help."""
4269 colors = [i for i in dir(Fore) if i[0].isupper()]
4270
4271 def colorize_line(line):
4272 for color in colors:
4273 if color in line.upper():
4274 # Extract whitespaces first and the leading '-'.
4275 indent = len(line) - len(line.lstrip(' ')) + 1
4276 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4277 return line
4278
4279 lines = CMDstatus.__doc__.splitlines()
4280 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4281
4282
phajdan.jre328cf92016-08-22 04:12:17 -07004283def write_json(path, contents):
4284 with open(path, 'w') as f:
4285 json.dump(contents, f)
4286
4287
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004288@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004289def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004290 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004291
4292 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004293 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004294 parser.add_option('-r', '--reverse', action='store_true',
4295 help='Lookup the branch(es) for the specified issues. If '
4296 'no issues are specified, all branches with mapped '
4297 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004298 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004299 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004300 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004301 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004302
dnj@chromium.org406c4402015-03-03 17:22:28 +00004303 if options.reverse:
4304 branches = RunGit(['for-each-ref', 'refs/heads',
4305 '--format=%(refname:short)']).splitlines()
4306
4307 # Reverse issue lookup.
4308 issue_branch_map = {}
4309 for branch in branches:
4310 cl = Changelist(branchref=branch)
4311 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4312 if not args:
4313 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004314 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004315 for issue in args:
4316 if not issue:
4317 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004318 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004319 print('Branch for issue number %s: %s' % (
4320 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004321 if options.json:
4322 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004323 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004324 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004325 if len(args) > 0:
4326 try:
4327 issue = int(args[0])
4328 except ValueError:
4329 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004330 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004331 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004332 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004333 if options.json:
4334 write_json(options.json, {
4335 'issue': cl.GetIssue(),
4336 'issue_url': cl.GetIssueURL(),
4337 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004338 return 0
4339
4340
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004341def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004342 """Shows or posts review comments for any changelist."""
4343 parser.add_option('-a', '--add-comment', dest='comment',
4344 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004345 parser.add_option('-i', '--issue', dest='issue',
4346 help='review issue id (defaults to current issue). '
4347 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004348 parser.add_option('-j', '--json-file',
4349 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004350 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004351 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004352 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004353 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004354 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004355
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004356 issue = None
4357 if options.issue:
4358 try:
4359 issue = int(options.issue)
4360 except ValueError:
4361 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004362 if not options.forced_codereview:
4363 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004364
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004365 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004366 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004367 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004368
4369 if options.comment:
4370 cl.AddComment(options.comment)
4371 return 0
4372
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004373 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4374 for comment in summary:
4375 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004376 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004377 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004378 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004379 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004380 color = Fore.MAGENTA
4381 else:
4382 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004383 print('\n%s%s %s%s\n%s' % (
4384 color,
4385 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4386 comment.sender,
4387 Fore.RESET,
4388 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4389
smut@google.comc85ac942015-09-15 16:34:43 +00004390 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004391 def pre_serialize(c):
4392 dct = c.__dict__.copy()
4393 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4394 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004395 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004396 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004397 return 0
4398
4399
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004400@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004401def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004402 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004403 parser.add_option('-d', '--display', action='store_true',
4404 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004405 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004406 help='New description to set for this issue (- for stdin, '
4407 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004408 parser.add_option('-f', '--force', action='store_true',
4409 help='Delete any unpublished Gerrit edits for this issue '
4410 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004411
4412 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004413 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004414 options, args = parser.parse_args(args)
4415 _process_codereview_select_options(parser, options)
4416
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004417 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004418 if len(args) > 0:
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004419 target_issue_arg = ParseIssueNumberArgument(args[0])
4420 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004421 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004422 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004423
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004424 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004425
martiniss6eda05f2016-06-30 10:18:35 -07004426 kwargs = {
4427 'auth_config': auth_config,
4428 'codereview': options.forced_codereview,
4429 }
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004430 if target_issue_arg:
4431 kwargs['issue'] = target_issue_arg.issue
4432 kwargs['codereview_host'] = target_issue_arg.hostname
martiniss6eda05f2016-06-30 10:18:35 -07004433
4434 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004435
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004436 if not cl.GetIssue():
4437 DieWithError('This branch has no associated changelist.')
4438 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004439
smut@google.com34fb6b12015-07-13 20:03:26 +00004440 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004442 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004443
4444 if options.new_description:
4445 text = options.new_description
4446 if text == '-':
4447 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004448 elif text == '+':
4449 base_branch = cl.GetCommonAncestorWithUpstream()
4450 change = cl.GetChange(base_branch, None, local_description=True)
4451 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004452
4453 description.set_description(text)
4454 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004455 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004456
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004457 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004458 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004459 return 0
4460
4461
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004462def CreateDescriptionFromLog(args):
4463 """Pulls out the commit log to use as a base for the CL description."""
4464 log_args = []
4465 if len(args) == 1 and not args[0].endswith('.'):
4466 log_args = [args[0] + '..']
4467 elif len(args) == 1 and args[0].endswith('...'):
4468 log_args = [args[0][:-1]]
4469 elif len(args) == 2:
4470 log_args = [args[0] + '..' + args[1]]
4471 else:
4472 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004473 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004474
4475
thestig@chromium.org44202a22014-03-11 19:22:18 +00004476def CMDlint(parser, args):
4477 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004478 parser.add_option('--filter', action='append', metavar='-x,+y',
4479 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004480 auth.add_auth_options(parser)
4481 options, args = parser.parse_args(args)
4482 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004483
4484 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004485 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004486 try:
4487 import cpplint
4488 import cpplint_chromium
4489 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004490 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004491 return 1
4492
4493 # Change the current working directory before calling lint so that it
4494 # shows the correct base.
4495 previous_cwd = os.getcwd()
4496 os.chdir(settings.GetRoot())
4497 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004498 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004499 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4500 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004501 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004502 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004503 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004504
4505 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004506 command = args + files
4507 if options.filter:
4508 command = ['--filter=' + ','.join(options.filter)] + command
4509 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004510
4511 white_regex = re.compile(settings.GetLintRegex())
4512 black_regex = re.compile(settings.GetLintIgnoreRegex())
4513 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4514 for filename in filenames:
4515 if white_regex.match(filename):
4516 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004517 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004518 else:
4519 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4520 extra_check_functions)
4521 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004522 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004523 finally:
4524 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004525 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004526 if cpplint._cpplint_state.error_count != 0:
4527 return 1
4528 return 0
4529
4530
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004531def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004532 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004533 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004534 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004535 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004536 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004537 auth.add_auth_options(parser)
4538 options, args = parser.parse_args(args)
4539 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004540
sbc@chromium.org71437c02015-04-09 19:29:40 +00004541 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004542 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004543 return 1
4544
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004545 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004546 if args:
4547 base_branch = args[0]
4548 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004549 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004550 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004551
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004552 cl.RunHook(
4553 committing=not options.upload,
4554 may_prompt=False,
4555 verbose=options.verbose,
4556 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004557 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004558
4559
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004560def GenerateGerritChangeId(message):
4561 """Returns Ixxxxxx...xxx change id.
4562
4563 Works the same way as
4564 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4565 but can be called on demand on all platforms.
4566
4567 The basic idea is to generate git hash of a state of the tree, original commit
4568 message, author/committer info and timestamps.
4569 """
4570 lines = []
4571 tree_hash = RunGitSilent(['write-tree'])
4572 lines.append('tree %s' % tree_hash.strip())
4573 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4574 if code == 0:
4575 lines.append('parent %s' % parent.strip())
4576 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4577 lines.append('author %s' % author.strip())
4578 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4579 lines.append('committer %s' % committer.strip())
4580 lines.append('')
4581 # Note: Gerrit's commit-hook actually cleans message of some lines and
4582 # whitespace. This code is not doing this, but it clearly won't decrease
4583 # entropy.
4584 lines.append(message)
4585 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4586 stdin='\n'.join(lines))
4587 return 'I%s' % change_hash.strip()
4588
4589
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004590def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004591 """Computes the remote branch ref to use for the CL.
4592
4593 Args:
4594 remote (str): The git remote for the CL.
4595 remote_branch (str): The git remote branch for the CL.
4596 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004597 """
4598 if not (remote and remote_branch):
4599 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004600
wittman@chromium.org455dc922015-01-26 20:15:50 +00004601 if target_branch:
4602 # Cannonicalize branch references to the equivalent local full symbolic
4603 # refs, which are then translated into the remote full symbolic refs
4604 # below.
4605 if '/' not in target_branch:
4606 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4607 else:
4608 prefix_replacements = (
4609 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4610 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4611 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4612 )
4613 match = None
4614 for regex, replacement in prefix_replacements:
4615 match = re.search(regex, target_branch)
4616 if match:
4617 remote_branch = target_branch.replace(match.group(0), replacement)
4618 break
4619 if not match:
4620 # This is a branch path but not one we recognize; use as-is.
4621 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004622 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4623 # Handle the refs that need to land in different refs.
4624 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004625
wittman@chromium.org455dc922015-01-26 20:15:50 +00004626 # Create the true path to the remote branch.
4627 # Does the following translation:
4628 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4629 # * refs/remotes/origin/master -> refs/heads/master
4630 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4631 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4632 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4633 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4634 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4635 'refs/heads/')
4636 elif remote_branch.startswith('refs/remotes/branch-heads'):
4637 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004638
wittman@chromium.org455dc922015-01-26 20:15:50 +00004639 return remote_branch
4640
4641
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004642def cleanup_list(l):
4643 """Fixes a list so that comma separated items are put as individual items.
4644
4645 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4646 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4647 """
4648 items = sum((i.split(',') for i in l), [])
4649 stripped_items = (i.strip() for i in items)
4650 return sorted(filter(None, stripped_items))
4651
4652
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004653@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004654def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004655 """Uploads the current changelist to codereview.
4656
4657 Can skip dependency patchset uploads for a branch by running:
4658 git config branch.branch_name.skip-deps-uploads True
4659 To unset run:
4660 git config --unset branch.branch_name.skip-deps-uploads
4661 Can also set the above globally by using the --global flag.
4662 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004663 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4664 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004665 parser.add_option('--bypass-watchlists', action='store_true',
4666 dest='bypass_watchlists',
4667 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004668 parser.add_option('-f', action='store_true', dest='force',
4669 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004670 parser.add_option('--message', '-m', dest='message',
4671 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004672 parser.add_option('-b', '--bug',
4673 help='pre-populate the bug number(s) for this issue. '
4674 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004675 parser.add_option('--message-file', dest='message_file',
4676 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004677 parser.add_option('--title', '-t', dest='title',
4678 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004679 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004680 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004681 help='reviewer email addresses')
4682 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004683 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004684 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004685 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004686 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004687 parser.add_option('--emulate_svn_auto_props',
4688 '--emulate-svn-auto-props',
4689 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004690 dest="emulate_svn_auto_props",
4691 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004692 parser.add_option('-c', '--use-commit-queue', action='store_true',
4693 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004694 parser.add_option('--private', action='store_true',
4695 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004696 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004697 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004698 metavar='TARGET',
4699 help='Apply CL to remote ref TARGET. ' +
4700 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004701 parser.add_option('--squash', action='store_true',
4702 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004703 parser.add_option('--no-squash', action='store_true',
4704 help='Don\'t squash multiple commits into one ' +
4705 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004706 parser.add_option('--topic', default=None,
4707 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004708 parser.add_option('--email', default=None,
4709 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004710 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4711 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004712 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4713 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004714 help='Send the patchset to do a CQ dry run right after '
4715 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004716 parser.add_option('--dependencies', action='store_true',
4717 help='Uploads CLs of all the local branches that depend on '
4718 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004719
rmistry@google.com2dd99862015-06-22 12:22:18 +00004720 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004721 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004722 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004723 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004724 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004725 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004726 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004727
sbc@chromium.org71437c02015-04-09 19:29:40 +00004728 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004729 return 1
4730
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004731 options.reviewers = cleanup_list(options.reviewers)
4732 options.cc = cleanup_list(options.cc)
4733
tandriib80458a2016-06-23 12:20:07 -07004734 if options.message_file:
4735 if options.message:
4736 parser.error('only one of --message and --message-file allowed.')
4737 options.message = gclient_utils.FileRead(options.message_file)
4738 options.message_file = None
4739
tandrii4d0545a2016-07-06 03:56:49 -07004740 if options.cq_dry_run and options.use_commit_queue:
4741 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4742
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004743 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4744 settings.GetIsGerrit()
4745
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004746 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004747 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004748
4749
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004750@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004751def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004752 """DEPRECATED: Used to commit the current changelist via git-svn."""
4753 message = ('git-cl no longer supports committing to SVN repositories via '
4754 'git-svn. You probably want to use `git cl land` instead.')
4755 print(message)
4756 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004757
4758
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004759# Two special branches used by git cl land.
4760MERGE_BRANCH = 'git-cl-commit'
4761CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4762
4763
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004764@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004765def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004766 """Commits the current changelist via git.
4767
4768 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4769 upstream and closes the issue automatically and atomically.
4770
4771 Otherwise (in case of Rietveld):
4772 Squashes branch into a single commit.
4773 Updates commit message with metadata (e.g. pointer to review).
4774 Pushes the code upstream.
4775 Updates review and closes.
4776 """
4777 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4778 help='bypass upload presubmit hook')
4779 parser.add_option('-m', dest='message',
4780 help="override review description")
4781 parser.add_option('-f', action='store_true', dest='force',
4782 help="force yes to questions (don't prompt)")
4783 parser.add_option('-c', dest='contributor',
4784 help="external contributor for patch (appended to " +
4785 "description and used as author for git). Should be " +
4786 "formatted as 'First Last <email@example.com>'")
4787 add_git_similarity(parser)
4788 auth.add_auth_options(parser)
4789 (options, args) = parser.parse_args(args)
4790 auth_config = auth.extract_auth_config_from_options(options)
4791
4792 cl = Changelist(auth_config=auth_config)
4793
4794 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4795 if cl.IsGerrit():
4796 if options.message:
4797 # This could be implemented, but it requires sending a new patch to
4798 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4799 # Besides, Gerrit has the ability to change the commit message on submit
4800 # automatically, thus there is no need to support this option (so far?).
4801 parser.error('-m MESSAGE option is not supported for Gerrit.')
4802 if options.contributor:
4803 parser.error(
4804 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4805 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4806 'the contributor\'s "name <email>". If you can\'t upload such a '
4807 'commit for review, contact your repository admin and request'
4808 '"Forge-Author" permission.')
4809 if not cl.GetIssue():
4810 DieWithError('You must upload the change first to Gerrit.\n'
4811 ' If you would rather have `git cl land` upload '
4812 'automatically for you, see http://crbug.com/642759')
4813 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4814 options.verbose)
4815
4816 current = cl.GetBranch()
4817 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4818 if remote == '.':
4819 print()
4820 print('Attempting to push branch %r into another local branch!' % current)
4821 print()
4822 print('Either reparent this branch on top of origin/master:')
4823 print(' git reparent-branch --root')
4824 print()
4825 print('OR run `git rebase-update` if you think the parent branch is ')
4826 print('already committed.')
4827 print()
4828 print(' Current parent: %r' % upstream_branch)
4829 return 1
4830
4831 if not args:
4832 # Default to merging against our best guess of the upstream branch.
4833 args = [cl.GetUpstreamBranch()]
4834
4835 if options.contributor:
4836 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
4837 print("Please provide contibutor as 'First Last <email@example.com>'")
4838 return 1
4839
4840 base_branch = args[0]
4841
4842 if git_common.is_dirty_git_tree('land'):
4843 return 1
4844
4845 # This rev-list syntax means "show all commits not in my branch that
4846 # are in base_branch".
4847 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4848 base_branch]).splitlines()
4849 if upstream_commits:
4850 print('Base branch "%s" has %d commits '
4851 'not in this branch.' % (base_branch, len(upstream_commits)))
4852 print('Run "git merge %s" before attempting to land.' % base_branch)
4853 return 1
4854
4855 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4856 if not options.bypass_hooks:
4857 author = None
4858 if options.contributor:
4859 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4860 hook_results = cl.RunHook(
4861 committing=True,
4862 may_prompt=not options.force,
4863 verbose=options.verbose,
4864 change=cl.GetChange(merge_base, author))
4865 if not hook_results.should_continue():
4866 return 1
4867
4868 # Check the tree status if the tree status URL is set.
4869 status = GetTreeStatus()
4870 if 'closed' == status:
4871 print('The tree is closed. Please wait for it to reopen. Use '
4872 '"git cl land --bypass-hooks" to commit on a closed tree.')
4873 return 1
4874 elif 'unknown' == status:
4875 print('Unable to determine tree status. Please verify manually and '
4876 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4877 return 1
4878
4879 change_desc = ChangeDescription(options.message)
4880 if not change_desc.description and cl.GetIssue():
4881 change_desc = ChangeDescription(cl.GetDescription())
4882
4883 if not change_desc.description:
4884 if not cl.GetIssue() and options.bypass_hooks:
4885 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4886 else:
4887 print('No description set.')
4888 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4889 return 1
4890
4891 # Keep a separate copy for the commit message, because the commit message
4892 # contains the link to the Rietveld issue, while the Rietveld message contains
4893 # the commit viewvc url.
4894 if cl.GetIssue():
4895 change_desc.update_reviewers(cl.GetApprovingReviewers())
4896
4897 commit_desc = ChangeDescription(change_desc.description)
4898 if cl.GetIssue():
4899 # Xcode won't linkify this URL unless there is a non-whitespace character
4900 # after it. Add a period on a new line to circumvent this. Also add a space
4901 # before the period to make sure that Gitiles continues to correctly resolve
4902 # the URL.
4903 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4904 if options.contributor:
4905 commit_desc.append_footer('Patch from %s.' % options.contributor)
4906
4907 print('Description:')
4908 print(commit_desc.description)
4909
4910 branches = [merge_base, cl.GetBranchRef()]
4911 if not options.force:
4912 print_stats(options.similarity, options.find_copies, branches)
4913
4914 # We want to squash all this branch's commits into one commit with the proper
4915 # description. We do this by doing a "reset --soft" to the base branch (which
4916 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004917 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004918 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4919 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4920 result = RunGitWithCode(showref_cmd)
4921 if result[0] == 0:
4922 RunGit(['branch', '-D', branch])
4923
4924 # We might be in a directory that's present in this branch but not in the
4925 # trunk. Move up to the top of the tree so that git commands that expect a
4926 # valid CWD won't fail after we check out the merge branch.
4927 rel_base_path = settings.GetRelativeRoot()
4928 if rel_base_path:
4929 os.chdir(rel_base_path)
4930
4931 # Stuff our change into the merge branch.
4932 # We wrap in a try...finally block so if anything goes wrong,
4933 # we clean up the branches.
4934 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004935 revision = None
4936 try:
4937 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
4938 RunGit(['reset', '--soft', merge_base])
4939 if options.contributor:
4940 RunGit(
4941 [
4942 'commit', '--author', options.contributor,
4943 '-m', commit_desc.description,
4944 ])
4945 else:
4946 RunGit(['commit', '-m', commit_desc.description])
4947
4948 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4949 mirror = settings.GetGitMirror(remote)
4950 if mirror:
4951 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004952 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004953 else:
4954 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004955 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004956 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
4957
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004958 retcode = PushToGitWithAutoRebase(
4959 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004960 if retcode == 0:
4961 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004962 if git_numberer_enabled:
4963 change_desc = ChangeDescription(
4964 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004965 except: # pylint: disable=bare-except
4966 if _IS_BEING_TESTED:
4967 logging.exception('this is likely your ACTUAL cause of test failure.\n'
4968 + '-' * 30 + '8<' + '-' * 30)
4969 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
4970 raise
4971 finally:
4972 # And then swap back to the original branch and clean up.
4973 RunGit(['checkout', '-q', cl.GetBranch()])
4974 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004975 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004976
4977 if not revision:
4978 print('Failed to push. If this persists, please file a bug.')
4979 return 1
4980
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004981 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004982 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004983 if viewvc_url and revision:
4984 change_desc.append_footer(
4985 'Committed: %s%s' % (viewvc_url, revision))
4986 elif revision:
4987 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004988 print('Closing issue '
4989 '(you may be prompted for your codereview password)...')
4990 cl.UpdateDescription(change_desc.description)
4991 cl.CloseIssue()
4992 props = cl.GetIssueProperties()
4993 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004994 comment = "Committed patchset #%d (id:%d) manually as %s" % (
4995 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004996 if options.bypass_hooks:
4997 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4998 else:
4999 comment += ' (presubmit successful).'
5000 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5001
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005002 if os.path.isfile(POSTUPSTREAM_HOOK):
5003 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5004
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005005 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005006
5007
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005008def PushToGitWithAutoRebase(remote, branch, original_description,
5009 git_numberer_enabled, max_attempts=3):
5010 """Pushes current HEAD commit on top of remote's branch.
5011
5012 Attempts to fetch and autorebase on push failures.
5013 Adds git number footers on the fly.
5014
5015 Returns integer code from last command.
5016 """
5017 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5018 code = 0
5019 attempts_left = max_attempts
5020 while attempts_left:
5021 attempts_left -= 1
5022 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5023
5024 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5025 # If fetch fails, retry.
5026 print('Fetching %s/%s...' % (remote, branch))
5027 code, out = RunGitWithCode(
5028 ['retry', 'fetch', remote,
5029 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5030 if code:
5031 print('Fetch failed with exit code %d.' % code)
5032 print(out.strip())
5033 continue
5034
5035 print('Cherry-picking commit on top of latest %s' % branch)
5036 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5037 suppress_stderr=True)
5038 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5039 code, out = RunGitWithCode(['cherry-pick', cherry])
5040 if code:
5041 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5042 'the following files have merge conflicts:' %
5043 (branch, parent_hash))
5044 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5045 print('Please rebase your patch and try again.')
5046 RunGitWithCode(['cherry-pick', '--abort'])
5047 break
5048
5049 commit_desc = ChangeDescription(original_description)
5050 if git_numberer_enabled:
5051 logging.debug('Adding git number footers')
5052 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5053 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5054 branch)
5055 # Ensure timestamps are monotonically increasing.
5056 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5057 _get_committer_timestamp('HEAD'))
5058 _git_amend_head(commit_desc.description, timestamp)
5059
5060 code, out = RunGitWithCode(
5061 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5062 print(out)
5063 if code == 0:
5064 break
5065 if IsFatalPushFailure(out):
5066 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005067 'user.email are correct and you have push access to the repo.\n'
5068 'Hint: run command below to diangose common Git/Gerrit credential '
5069 'problems:\n'
5070 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005071 break
5072 return code
5073
5074
5075def IsFatalPushFailure(push_stdout):
5076 """True if retrying push won't help."""
5077 return '(prohibited by Gerrit)' in push_stdout
5078
5079
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005080@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005081def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005082 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005083 parser.add_option('-b', dest='newbranch',
5084 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005085 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005086 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005087 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5088 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005089 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005090 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005091 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005092 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005093 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005094 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005095
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005096
5097 group = optparse.OptionGroup(
5098 parser,
5099 'Options for continuing work on the current issue uploaded from a '
5100 'different clone (e.g. different machine). Must be used independently '
5101 'from the other options. No issue number should be specified, and the '
5102 'branch must have an issue number associated with it')
5103 group.add_option('--reapply', action='store_true', dest='reapply',
5104 help='Reset the branch and reapply the issue.\n'
5105 'CAUTION: This will undo any local changes in this '
5106 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005107
5108 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005109 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005110 parser.add_option_group(group)
5111
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005112 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005113 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005114 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005115 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005116 auth_config = auth.extract_auth_config_from_options(options)
5117
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005118
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005119 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005120 if options.newbranch:
5121 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005122 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005123 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005124
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005125 cl = Changelist(auth_config=auth_config,
5126 codereview=options.forced_codereview)
5127 if not cl.GetIssue():
5128 parser.error('current branch must have an associated issue')
5129
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005130 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005131 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005132 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005133
5134 RunGit(['reset', '--hard', upstream])
5135 if options.pull:
5136 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005137
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005138 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5139 options.directory)
5140
5141 if len(args) != 1 or not args[0]:
5142 parser.error('Must specify issue number or url')
5143
5144 # We don't want uncommitted changes mixed up with the patch.
5145 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005146 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005147
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005148 if options.newbranch:
5149 if options.force:
5150 RunGit(['branch', '-D', options.newbranch],
5151 stderr=subprocess2.PIPE, error_ok=True)
5152 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005153 elif not GetCurrentBranch():
5154 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005155
5156 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
5157
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005158 if cl.IsGerrit():
5159 if options.reject:
5160 parser.error('--reject is not supported with Gerrit codereview.')
5161 if options.nocommit:
5162 parser.error('--nocommit is not supported with Gerrit codereview.')
5163 if options.directory:
5164 parser.error('--directory is not supported with Gerrit codereview.')
5165
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005166 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005167 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005168
5169
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005170def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005171 """Fetches the tree status and returns either 'open', 'closed',
5172 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005173 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005174 if url:
5175 status = urllib2.urlopen(url).read().lower()
5176 if status.find('closed') != -1 or status == '0':
5177 return 'closed'
5178 elif status.find('open') != -1 or status == '1':
5179 return 'open'
5180 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005181 return 'unset'
5182
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005183
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005184def GetTreeStatusReason():
5185 """Fetches the tree status from a json url and returns the message
5186 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005187 url = settings.GetTreeStatusUrl()
5188 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005189 connection = urllib2.urlopen(json_url)
5190 status = json.loads(connection.read())
5191 connection.close()
5192 return status['message']
5193
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005194
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005195def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005196 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005197 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005198 status = GetTreeStatus()
5199 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005200 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005201 return 2
5202
vapiera7fbd5a2016-06-16 09:17:49 -07005203 print('The tree is %s' % status)
5204 print()
5205 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005206 if status != 'open':
5207 return 1
5208 return 0
5209
5210
maruel@chromium.org15192402012-09-06 12:38:29 +00005211def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005212 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005213 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005214 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005215 '-b', '--bot', action='append',
5216 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5217 'times to specify multiple builders. ex: '
5218 '"-b win_rel -b win_layout". See '
5219 'the try server waterfall for the builders name and the tests '
5220 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005221 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005222 '-B', '--bucket', default='',
5223 help=('Buildbucket bucket to send the try requests.'))
5224 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005225 '-m', '--master', default='',
5226 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005227 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005228 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005229 help='Revision to use for the try job; default: the revision will '
5230 'be determined by the try recipe that builder runs, which usually '
5231 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005232 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005233 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005234 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005235 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005236 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005237 '--project',
5238 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005239 'in recipe to determine to which repository or directory to '
5240 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005241 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005242 '-p', '--property', dest='properties', action='append', default=[],
5243 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005244 'key2=value2 etc. The value will be treated as '
5245 'json if decodable, or as string otherwise. '
5246 'NOTE: using this may make your try job not usable for CQ, '
5247 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005248 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005249 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5250 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005251 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005252 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005253 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005254 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005255
machenbach@chromium.org45453142015-09-15 08:45:22 +00005256 # Make sure that all properties are prop=value pairs.
5257 bad_params = [x for x in options.properties if '=' not in x]
5258 if bad_params:
5259 parser.error('Got properties with missing "=": %s' % bad_params)
5260
maruel@chromium.org15192402012-09-06 12:38:29 +00005261 if args:
5262 parser.error('Unknown arguments: %s' % args)
5263
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005264 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005265 if not cl.GetIssue():
5266 parser.error('Need to upload first')
5267
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005268 if cl.IsGerrit():
5269 # HACK: warm up Gerrit change detail cache to save on RPCs.
5270 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5271
tandriie113dfd2016-10-11 10:20:12 -07005272 error_message = cl.CannotTriggerTryJobReason()
5273 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005274 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005275
borenet6c0efe62016-10-19 08:13:29 -07005276 if options.bucket and options.master:
5277 parser.error('Only one of --bucket and --master may be used.')
5278
qyearsley1fdfcb62016-10-24 13:22:03 -07005279 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005280
qyearsleydd49f942016-10-28 11:57:22 -07005281 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5282 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005283 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005284 if options.verbose:
5285 print('git cl try with no bots now defaults to CQ Dry Run.')
5286 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00005287
borenet6c0efe62016-10-19 08:13:29 -07005288 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005289 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005290 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005291 'of bot requires an initial job from a parent (usually a builder). '
5292 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005293 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005294 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005295
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005296 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005297 # TODO(tandrii): Checking local patchset against remote patchset is only
5298 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5299 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005300 print('Warning: Codereview server has newer patchsets (%s) than most '
5301 'recent upload from local checkout (%s). Did a previous upload '
5302 'fail?\n'
5303 'By default, git cl try uses the latest patchset from '
5304 'codereview, continuing to use patchset %s.\n' %
5305 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005306
tandrii568043b2016-10-11 07:49:18 -07005307 try:
borenet6c0efe62016-10-19 08:13:29 -07005308 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5309 patchset)
tandrii568043b2016-10-11 07:49:18 -07005310 except BuildbucketResponseException as ex:
5311 print('ERROR: %s' % ex)
5312 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005313 return 0
5314
5315
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005316def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005317 """Prints info about try jobs associated with current CL."""
5318 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005319 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005320 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005321 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005322 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005323 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005324 '--color', action='store_true', default=setup_color.IS_TTY,
5325 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005326 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005327 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5328 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005329 group.add_option(
5330 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005331 parser.add_option_group(group)
5332 auth.add_auth_options(parser)
5333 options, args = parser.parse_args(args)
5334 if args:
5335 parser.error('Unrecognized args: %s' % ' '.join(args))
5336
5337 auth_config = auth.extract_auth_config_from_options(options)
5338 cl = Changelist(auth_config=auth_config)
5339 if not cl.GetIssue():
5340 parser.error('Need to upload first')
5341
tandrii221ab252016-10-06 08:12:04 -07005342 patchset = options.patchset
5343 if not patchset:
5344 patchset = cl.GetMostRecentPatchset()
5345 if not patchset:
5346 parser.error('Codereview doesn\'t know about issue %s. '
5347 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005348 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005349 cl.GetIssue())
5350
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005351 # TODO(tandrii): Checking local patchset against remote patchset is only
5352 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5353 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005354 print('Warning: Codereview server has newer patchsets (%s) than most '
5355 'recent upload from local checkout (%s). Did a previous upload '
5356 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005357 'By default, git cl try-results uses the latest patchset from '
5358 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005359 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005360 try:
tandrii221ab252016-10-06 08:12:04 -07005361 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005362 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005363 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005364 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005365 if options.json:
5366 write_try_results_json(options.json, jobs)
5367 else:
5368 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005369 return 0
5370
5371
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005372@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005373def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005374 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005375 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005376 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005377 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005378
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005379 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005380 if args:
5381 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005382 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005383 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005384 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005385 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005386
5387 # Clear configured merge-base, if there is one.
5388 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005389 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005390 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005391 return 0
5392
5393
thestig@chromium.org00858c82013-12-02 23:08:03 +00005394def CMDweb(parser, args):
5395 """Opens the current CL in the web browser."""
5396 _, args = parser.parse_args(args)
5397 if args:
5398 parser.error('Unrecognized args: %s' % ' '.join(args))
5399
5400 issue_url = Changelist().GetIssueURL()
5401 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005402 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005403 return 1
5404
5405 webbrowser.open(issue_url)
5406 return 0
5407
5408
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005409def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005410 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005411 parser.add_option('-d', '--dry-run', action='store_true',
5412 help='trigger in dry run mode')
5413 parser.add_option('-c', '--clear', action='store_true',
5414 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005415 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005416 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005417 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005418 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005419 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005420 if args:
5421 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005422 if options.dry_run and options.clear:
5423 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5424
iannuccie53c9352016-08-17 14:40:40 -07005425 cl = Changelist(auth_config=auth_config, issue=options.issue,
5426 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005427 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005428 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005429 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005430 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005431 state = _CQState.DRY_RUN
5432 else:
5433 state = _CQState.COMMIT
5434 if not cl.GetIssue():
5435 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005436 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005437 return 0
5438
5439
groby@chromium.org411034a2013-02-26 15:12:01 +00005440def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005441 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005442 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005443 auth.add_auth_options(parser)
5444 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005445 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005446 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005447 if args:
5448 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005449 cl = Changelist(auth_config=auth_config, issue=options.issue,
5450 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005451 # Ensure there actually is an issue to close.
5452 cl.GetDescription()
5453 cl.CloseIssue()
5454 return 0
5455
5456
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005457def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005458 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005459 parser.add_option(
5460 '--stat',
5461 action='store_true',
5462 dest='stat',
5463 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005464 auth.add_auth_options(parser)
5465 options, args = parser.parse_args(args)
5466 auth_config = auth.extract_auth_config_from_options(options)
5467 if args:
5468 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005469
5470 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005471 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005472 # Staged changes would be committed along with the patch from last
5473 # upload, hence counted toward the "last upload" side in the final
5474 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005475 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005476 return 1
5477
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005478 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005479 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005480 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005481 if not issue:
5482 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005483 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005484 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005485
5486 # Create a new branch based on the merge-base
5487 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005488 # Clear cached branch in cl object, to avoid overwriting original CL branch
5489 # properties.
5490 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005491 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005492 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005493 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005494 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005495 return rtn
5496
wychen@chromium.org06928532015-02-03 02:11:29 +00005497 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005498 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005499 cmd = ['git', 'diff']
5500 if options.stat:
5501 cmd.append('--stat')
5502 cmd.extend([TMP_BRANCH, branch, '--'])
5503 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005504 finally:
5505 RunGit(['checkout', '-q', branch])
5506 RunGit(['branch', '-D', TMP_BRANCH])
5507
5508 return 0
5509
5510
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005511def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005512 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005513 parser.add_option(
5514 '--no-color',
5515 action='store_true',
5516 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005517 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005518 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005519 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005520
5521 author = RunGit(['config', 'user.email']).strip() or None
5522
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005523 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005524
5525 if args:
5526 if len(args) > 1:
5527 parser.error('Unknown args')
5528 base_branch = args[0]
5529 else:
5530 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005531 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005532
5533 change = cl.GetChange(base_branch, None)
5534 return owners_finder.OwnersFinder(
5535 [f.LocalPath() for f in
5536 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005537 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005538 author, fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005539 disable_color=options.no_color).run()
5540
5541
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005542def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005543 """Generates a diff command."""
5544 # Generate diff for the current branch's changes.
5545 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005546 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005547
5548 if args:
5549 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005550 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005551 diff_cmd.append(arg)
5552 else:
5553 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005554
5555 return diff_cmd
5556
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005557
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005558def MatchingFileType(file_name, extensions):
5559 """Returns true if the file name ends with one of the given extensions."""
5560 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005561
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005562
enne@chromium.org555cfe42014-01-29 18:21:39 +00005563@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005564def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005565 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005566 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005567 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005568 parser.add_option('--full', action='store_true',
5569 help='Reformat the full content of all touched files')
5570 parser.add_option('--dry-run', action='store_true',
5571 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005572 parser.add_option('--python', action='store_true',
5573 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005574 parser.add_option('--js', action='store_true',
5575 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005576 parser.add_option('--diff', action='store_true',
5577 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005578 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005579
Daniel Chengc55eecf2016-12-30 03:11:02 -08005580 # Normalize any remaining args against the current path, so paths relative to
5581 # the current directory are still resolved as expected.
5582 args = [os.path.join(os.getcwd(), arg) for arg in args]
5583
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005584 # git diff generates paths against the root of the repository. Change
5585 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005586 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005587 if rel_base_path:
5588 os.chdir(rel_base_path)
5589
digit@chromium.org29e47272013-05-17 17:01:46 +00005590 # Grab the merge-base commit, i.e. the upstream commit of the current
5591 # branch when it was created or the last time it was rebased. This is
5592 # to cover the case where the user may have called "git fetch origin",
5593 # moving the origin branch to a newer commit, but hasn't rebased yet.
5594 upstream_commit = None
5595 cl = Changelist()
5596 upstream_branch = cl.GetUpstreamBranch()
5597 if upstream_branch:
5598 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5599 upstream_commit = upstream_commit.strip()
5600
5601 if not upstream_commit:
5602 DieWithError('Could not find base commit for this branch. '
5603 'Are you in detached state?')
5604
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005605 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5606 diff_output = RunGit(changed_files_cmd)
5607 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005608 # Filter out files deleted by this CL
5609 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005610
Christopher Lamc5ba6922017-01-24 11:19:14 +11005611 if opts.js:
5612 CLANG_EXTS.append('.js')
5613
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005614 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5615 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5616 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005617 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005618
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005619 top_dir = os.path.normpath(
5620 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5621
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005622 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5623 # formatted. This is used to block during the presubmit.
5624 return_value = 0
5625
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005626 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005627 # Locate the clang-format binary in the checkout
5628 try:
5629 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005630 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005631 DieWithError(e)
5632
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005633 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005634 cmd = [clang_format_tool]
5635 if not opts.dry_run and not opts.diff:
5636 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005637 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005638 if opts.diff:
5639 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005640 else:
5641 env = os.environ.copy()
5642 env['PATH'] = str(os.path.dirname(clang_format_tool))
5643 try:
5644 script = clang_format.FindClangFormatScriptInChromiumTree(
5645 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005646 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005647 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005648
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005649 cmd = [sys.executable, script, '-p0']
5650 if not opts.dry_run and not opts.diff:
5651 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005652
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005653 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5654 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005655
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005656 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5657 if opts.diff:
5658 sys.stdout.write(stdout)
5659 if opts.dry_run and len(stdout) > 0:
5660 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005661
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005662 # Similar code to above, but using yapf on .py files rather than clang-format
5663 # on C/C++ files
5664 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005665 yapf_tool = gclient_utils.FindExecutable('yapf')
5666 if yapf_tool is None:
5667 DieWithError('yapf not found in PATH')
5668
5669 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005670 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005671 cmd = [yapf_tool]
5672 if not opts.dry_run and not opts.diff:
5673 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005674 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005675 if opts.diff:
5676 sys.stdout.write(stdout)
5677 else:
5678 # TODO(sbc): yapf --lines mode still has some issues.
5679 # https://github.com/google/yapf/issues/154
5680 DieWithError('--python currently only works with --full')
5681
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005682 # Dart's formatter does not have the nice property of only operating on
5683 # modified chunks, so hard code full.
5684 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005685 try:
5686 command = [dart_format.FindDartFmtToolInChromiumTree()]
5687 if not opts.dry_run and not opts.diff:
5688 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005689 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005690
ppi@chromium.org6593d932016-03-03 15:41:15 +00005691 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005692 if opts.dry_run and stdout:
5693 return_value = 2
5694 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005695 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5696 'found in this checkout. Files in other languages are still '
5697 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005698
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005699 # Format GN build files. Always run on full build files for canonical form.
5700 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005701 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005702 if opts.dry_run or opts.diff:
5703 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005704 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005705 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5706 shell=sys.platform == 'win32',
5707 cwd=top_dir)
5708 if opts.dry_run and gn_ret == 2:
5709 return_value = 2 # Not formatted.
5710 elif opts.diff and gn_ret == 2:
5711 # TODO this should compute and print the actual diff.
5712 print("This change has GN build file diff for " + gn_diff_file)
5713 elif gn_ret != 0:
5714 # For non-dry run cases (and non-2 return values for dry-run), a
5715 # nonzero error code indicates a failure, probably because the file
5716 # doesn't parse.
5717 DieWithError("gn format failed on " + gn_diff_file +
5718 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005719
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005720 metrics_xml_files = [
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005721 os.path.join('tools', 'metrics', 'actions', 'actions.xml'),
5722 os.path.join('tools', 'metrics', 'histograms', 'histograms.xml'),
5723 os.path.join('tools', 'metrics', 'rappor', 'rappor.xml')]
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005724 for xml_file in metrics_xml_files:
5725 if xml_file in diff_files:
Pierre-Antoine Manzagold5bc73d2017-03-22 15:40:40 -04005726 tool_dir = os.path.join(top_dir, os.path.dirname(xml_file))
5727 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005728 if opts.dry_run or opts.diff:
5729 cmd.append('--diff')
5730 stdout = RunCommand(cmd, cwd=top_dir)
5731 if opts.diff:
5732 sys.stdout.write(stdout)
5733 if opts.dry_run and stdout:
5734 return_value = 2 # Not formatted.
5735
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005736 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005737
5738
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005739@subcommand.usage('<codereview url or issue id>')
5740def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005741 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005742 _, args = parser.parse_args(args)
5743
5744 if len(args) != 1:
5745 parser.print_help()
5746 return 1
5747
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005748 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005749 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005750 parser.error('invalid codereview url or CL id')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005751 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005752 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005753
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005754 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005755 output = RunGit(['config', '--local', '--get-regexp',
5756 r'branch\..*\.%s' % issueprefix],
5757 error_ok=True)
5758 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005759 if issue == target_issue:
5760 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005761
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005762 branches = []
5763 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005764 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005765 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005766 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005767 return 1
5768 if len(branches) == 1:
5769 RunGit(['checkout', branches[0]])
5770 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005771 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005772 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005773 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005774 which = raw_input('Choose by index: ')
5775 try:
5776 RunGit(['checkout', branches[int(which)]])
5777 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005778 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005779 return 1
5780
5781 return 0
5782
5783
maruel@chromium.org29404b52014-09-08 22:58:00 +00005784def CMDlol(parser, args):
5785 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005786 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005787 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5788 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5789 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005790 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005791 return 0
5792
5793
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005794class OptionParser(optparse.OptionParser):
5795 """Creates the option parse and add --verbose support."""
5796 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005797 optparse.OptionParser.__init__(
5798 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005799 self.add_option(
5800 '-v', '--verbose', action='count', default=0,
5801 help='Use 2 times for more debugging info')
5802
5803 def parse_args(self, args=None, values=None):
5804 options, args = optparse.OptionParser.parse_args(self, args, values)
5805 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005806 logging.basicConfig(
5807 level=levels[min(options.verbose, len(levels) - 1)],
5808 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5809 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005810 return options, args
5811
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005812
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005813def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005814 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005815 print('\nYour python version %s is unsupported, please upgrade.\n' %
5816 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005817 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005818
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005819 # Reload settings.
5820 global settings
5821 settings = Settings()
5822
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005823 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005824 dispatcher = subcommand.CommandDispatcher(__name__)
5825 try:
5826 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005827 except auth.AuthenticationError as e:
5828 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005829 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005830 if e.code != 500:
5831 raise
5832 DieWithError(
5833 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5834 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005835 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005836
5837
5838if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005839 # These affect sys.stdout so do it outside of main() to simplify mocks in
5840 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005841 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005842 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005843 try:
5844 sys.exit(main(sys.argv[1:]))
5845 except KeyboardInterrupt:
5846 sys.stderr.write('interrupted\n')
5847 sys.exit(1)