blob: 7c993bb28f06b35c6fa3c600393da392e5e25b34 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 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
Francois Dorayd42c6812017-05-30 15:10:20 -040062import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000063import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000064import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065import watchlists
66
tandrii7400cf02016-06-21 08:48:07 -070067__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068
tandrii9d2c7a32016-06-22 03:42:45 -070069COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070070DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080071POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000072DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000073REFS_THAT_ALIAS_TO_OTHER_REFS = {
74 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
75 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
76}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000077
thestig@chromium.org44202a22014-03-11 19:22:18 +000078# Valid extensions for files we want to lint.
79DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
80DEFAULT_LINT_IGNORE_REGEX = r"$^"
81
borenet6c0efe62016-10-19 08:13:29 -070082# Buildbucket master name prefix.
83MASTER_PREFIX = 'master.'
84
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000085# Shortcut since it quickly becomes redundant.
86Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000087
maruel@chromium.orgddd59412011-11-30 14:20:38 +000088# Initialized in main()
89settings = None
90
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010091# Used by tests/git_cl_test.py to add extra logging.
92# Inside the weirdly failing test, add this:
93# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -070094# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010095_IS_BEING_TESTED = False
96
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097
Christopher Lamf732cd52017-01-24 12:40:11 +110098def DieWithError(message, change_desc=None):
99 if change_desc:
100 SaveDescriptionBackup(change_desc)
101
vapiera7fbd5a2016-06-16 09:17:49 -0700102 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000103 sys.exit(1)
104
105
Christopher Lamf732cd52017-01-24 12:40:11 +1100106def SaveDescriptionBackup(change_desc):
107 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
108 print('\nError after CL description prompt -- saving description to %s\n' %
109 backup_path)
110 backup_file = open(backup_path, 'w')
111 backup_file.write(change_desc.description)
112 backup_file.close()
113
114
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000115def GetNoGitPagerEnv():
116 env = os.environ.copy()
117 # 'cat' is a magical git string that disables pagers on all platforms.
118 env['GIT_PAGER'] = 'cat'
119 return env
120
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000121
bsep@chromium.org627d9002016-04-29 00:00:52 +0000122def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000123 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000124 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000125 except subprocess2.CalledProcessError as e:
126 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000127 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000128 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000129 'Command "%s" failed.\n%s' % (
130 ' '.join(args), error_message or e.stdout or ''))
131 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132
133
134def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000135 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000136 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137
138
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000139def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000140 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700141 if suppress_stderr:
142 stderr = subprocess2.VOID
143 else:
144 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000145 try:
tandrii5d48c322016-08-18 16:19:37 -0700146 (out, _), code = subprocess2.communicate(['git'] + args,
147 env=GetNoGitPagerEnv(),
148 stdout=subprocess2.PIPE,
149 stderr=stderr)
150 return code, out
151 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900152 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700153 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000154
155
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000156def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000157 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000158 return RunGitWithCode(args, suppress_stderr=True)[1]
159
160
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000161def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000162 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000163 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000164 return (version.startswith(prefix) and
165 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000166
167
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000168def BranchExists(branch):
169 """Return True if specified branch exists."""
170 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
171 suppress_stderr=True)
172 return not code
173
174
tandrii2a16b952016-10-19 07:09:44 -0700175def time_sleep(seconds):
176 # Use this so that it can be mocked in tests without interfering with python
177 # system machinery.
178 import time # Local import to discourage others from importing time globally.
179 return time.sleep(seconds)
180
181
maruel@chromium.org90541732011-04-01 17:54:18 +0000182def ask_for_data(prompt):
183 try:
184 return raw_input(prompt)
185 except KeyboardInterrupt:
186 # Hide the exception.
187 sys.exit(1)
188
189
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100190def confirm_or_exit(prefix='', action='confirm'):
191 """Asks user to press enter to continue or press Ctrl+C to abort."""
192 if not prefix or prefix.endswith('\n'):
193 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100194 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100195 mid = ' Press'
196 elif prefix.endswith(' '):
197 mid = 'press'
198 else:
199 mid = ' press'
200 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
201
202
203def ask_for_explicit_yes(prompt):
204 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
205 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
206 while True:
207 if 'yes'.startswith(result):
208 return True
209 if 'no'.startswith(result):
210 return False
211 result = ask_for_data('Please, type yes or no: ').lower()
212
213
tandrii5d48c322016-08-18 16:19:37 -0700214def _git_branch_config_key(branch, key):
215 """Helper method to return Git config key for a branch."""
216 assert branch, 'branch name is required to set git config for it'
217 return 'branch.%s.%s' % (branch, key)
218
219
220def _git_get_branch_config_value(key, default=None, value_type=str,
221 branch=False):
222 """Returns git config value of given or current branch if any.
223
224 Returns default in all other cases.
225 """
226 assert value_type in (int, str, bool)
227 if branch is False: # Distinguishing default arg value from None.
228 branch = GetCurrentBranch()
229
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000230 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700231 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000232
tandrii5d48c322016-08-18 16:19:37 -0700233 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700234 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700235 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700236 # git config also has --int, but apparently git config suffers from integer
237 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700238 args.append(_git_branch_config_key(branch, key))
239 code, out = RunGitWithCode(args)
240 if code == 0:
241 value = out.strip()
242 if value_type == int:
243 return int(value)
244 if value_type == bool:
245 return bool(value.lower() == 'true')
246 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000247 return default
248
249
tandrii5d48c322016-08-18 16:19:37 -0700250def _git_set_branch_config_value(key, value, branch=None, **kwargs):
251 """Sets the value or unsets if it's None of a git branch config.
252
253 Valid, though not necessarily existing, branch must be provided,
254 otherwise currently checked out branch is used.
255 """
256 if not branch:
257 branch = GetCurrentBranch()
258 assert branch, 'a branch name OR currently checked out branch is required'
259 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700260 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700261 if value is None:
262 args.append('--unset')
263 elif isinstance(value, bool):
264 args.append('--bool')
265 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700266 else:
tandrii33a46ff2016-08-23 05:53:40 -0700267 # git config also has --int, but apparently git config suffers from integer
268 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700269 value = str(value)
270 args.append(_git_branch_config_key(branch, key))
271 if value is not None:
272 args.append(value)
273 RunGit(args, **kwargs)
274
275
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100276def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700277 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100278
279 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
280 """
281 # Git also stores timezone offset, but it only affects visual display,
282 # actual point in time is defined by this timestamp only.
283 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
284
285
286def _git_amend_head(message, committer_timestamp):
287 """Amends commit with new message and desired committer_timestamp.
288
289 Sets committer timezone to UTC.
290 """
291 env = os.environ.copy()
292 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
293 return RunGit(['commit', '--amend', '-m', message], env=env)
294
295
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000296def add_git_similarity(parser):
297 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700298 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000299 help='Sets the percentage that a pair of files need to match in order to'
300 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000301 parser.add_option(
302 '--find-copies', action='store_true',
303 help='Allows git to look for copies.')
304 parser.add_option(
305 '--no-find-copies', action='store_false', dest='find_copies',
306 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000307
308 old_parser_args = parser.parse_args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700309
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000310 def Parse(args):
311 options, args = old_parser_args(args)
312
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000313 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700314 options.similarity = _git_get_branch_config_value(
315 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000316 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000317 print('Note: Saving similarity of %d%% in git config.'
318 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700319 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000320
iannucci@chromium.org79540052012-10-19 23:15:26 +0000321 options.similarity = max(0, min(options.similarity, 100))
322
323 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700324 options.find_copies = _git_get_branch_config_value(
325 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000326 else:
tandrii5d48c322016-08-18 16:19:37 -0700327 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000328
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000329 return options, args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700330
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000331 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
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700502 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700503 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:
Quinten Yearsley0c62da92017-05-31 13:39:42 -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:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700629 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700630 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):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700861 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000862 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700863 self.is_gerrit = (
864 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000865 return self.is_gerrit
866
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000867 def GetSquashGerritUploads(self):
868 """Return true if uploads to Gerrit should be squashed by default."""
869 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700870 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
871 if self.squash_gerrit_uploads is None:
872 # Default is squash now (http://crbug.com/611892#c23).
873 self.squash_gerrit_uploads = not (
874 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
875 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000876 return self.squash_gerrit_uploads
877
tandriia60502f2016-06-20 02:01:53 -0700878 def GetSquashGerritUploadsOverride(self):
879 """Return True or False if codereview.settings should be overridden.
880
881 Returns None if no override has been defined.
882 """
883 # See also http://crbug.com/611892#c23
884 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
885 error_ok=True).strip()
886 if result == 'true':
887 return True
888 if result == 'false':
889 return False
890 return None
891
tandrii@chromium.org28253532016-04-14 13:46:56 +0000892 def GetGerritSkipEnsureAuthenticated(self):
893 """Return True if EnsureAuthenticated should not be done for Gerrit
894 uploads."""
895 if self.gerrit_skip_ensure_authenticated is None:
896 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000897 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000898 error_ok=True).strip() == 'true')
899 return self.gerrit_skip_ensure_authenticated
900
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000901 def GetGitEditor(self):
902 """Return the editor specified in the git config, or None if none is."""
903 if self.git_editor is None:
904 self.git_editor = self._GetConfig('core.editor', error_ok=True)
905 return self.git_editor or None
906
thestig@chromium.org44202a22014-03-11 19:22:18 +0000907 def GetLintRegex(self):
908 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
909 DEFAULT_LINT_REGEX)
910
911 def GetLintIgnoreRegex(self):
912 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
913 DEFAULT_LINT_IGNORE_REGEX)
914
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000915 def GetProject(self):
916 if not self.project:
917 self.project = self._GetRietveldConfig('project', error_ok=True)
918 return self.project
919
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000920 def _GetRietveldConfig(self, param, **kwargs):
921 return self._GetConfig('rietveld.' + param, **kwargs)
922
rmistry@google.com78948ed2015-07-08 23:09:57 +0000923 def _GetBranchConfig(self, branch_name, param, **kwargs):
924 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
925
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000926 def _GetConfig(self, param, **kwargs):
927 self.LazyUpdateIfNeeded()
928 return RunGit(['config', param], **kwargs).strip()
929
930
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100931@contextlib.contextmanager
932def _get_gerrit_project_config_file(remote_url):
933 """Context manager to fetch and store Gerrit's project.config from
934 refs/meta/config branch and store it in temp file.
935
936 Provides a temporary filename or None if there was error.
937 """
938 error, _ = RunGitWithCode([
939 'fetch', remote_url,
940 '+refs/meta/config:refs/git_cl/meta/config'])
941 if error:
942 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700943 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100944 (remote_url, error))
945 yield None
946 return
947
948 error, project_config_data = RunGitWithCode(
949 ['show', 'refs/git_cl/meta/config:project.config'])
950 if error:
951 print('WARNING: project.config file not found')
952 yield None
953 return
954
955 with gclient_utils.temporary_directory() as tempdir:
956 project_config_file = os.path.join(tempdir, 'project.config')
957 gclient_utils.FileWrite(project_config_file, project_config_data)
958 yield project_config_file
959
960
961def _is_git_numberer_enabled(remote_url, remote_ref):
962 """Returns True if Git Numberer is enabled on this ref."""
963 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100964 KNOWN_PROJECTS_WHITELIST = [
965 'chromium/src',
966 'external/webrtc',
967 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100968 'infra/experimental',
Edward Lemur32357d32017-09-11 20:22:45 +0200969 # For webrtc.googlesource.com/src.
970 'src',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100971 ]
972
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100973 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
974 url_parts = urlparse.urlparse(remote_url)
975 project_name = url_parts.path.lstrip('/').rstrip('git./')
976 for known in KNOWN_PROJECTS_WHITELIST:
977 if project_name.endswith(known):
978 break
979 else:
980 # Early exit to avoid extra fetches for repos that aren't using Git
981 # Numberer.
982 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100983
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100984 with _get_gerrit_project_config_file(remote_url) as project_config_file:
985 if project_config_file is None:
986 # Failed to fetch project.config, which shouldn't happen on open source
987 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100988 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100989 def get_opts(x):
990 code, out = RunGitWithCode(
991 ['config', '-f', project_config_file, '--get-all',
992 'plugin.git-numberer.validate-%s-refglob' % x])
993 if code == 0:
994 return out.strip().splitlines()
995 return []
996 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100997
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100998 logging.info('validator config enabled %s disabled %s refglobs for '
999 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001000
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001001 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001002 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001003 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001004 return True
1005 return False
1006
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001007 if match_refglobs(disabled):
1008 return False
1009 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001010
1011
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001012def ShortBranchName(branch):
1013 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001014 return branch.replace('refs/heads/', '', 1)
1015
1016
1017def GetCurrentBranchRef():
1018 """Returns branch ref (e.g., refs/heads/master) or None."""
1019 return RunGit(['symbolic-ref', 'HEAD'],
1020 stderr=subprocess2.VOID, error_ok=True).strip() or None
1021
1022
1023def GetCurrentBranch():
1024 """Returns current branch or None.
1025
1026 For refs/heads/* branches, returns just last part. For others, full ref.
1027 """
1028 branchref = GetCurrentBranchRef()
1029 if branchref:
1030 return ShortBranchName(branchref)
1031 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001032
1033
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001034class _CQState(object):
1035 """Enum for states of CL with respect to Commit Queue."""
1036 NONE = 'none'
1037 DRY_RUN = 'dry_run'
1038 COMMIT = 'commit'
1039
1040 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1041
1042
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001043class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001044 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001045 self.issue = issue
1046 self.patchset = patchset
1047 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001048 assert codereview in (None, 'rietveld', 'gerrit')
1049 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001050
1051 @property
1052 def valid(self):
1053 return self.issue is not None
1054
1055
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001056def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001057 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1058 fail_result = _ParsedIssueNumberArgument()
1059
1060 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001061 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001062 if not arg.startswith('http'):
1063 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001064
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001065 url = gclient_utils.UpgradeToHttps(arg)
1066 try:
1067 parsed_url = urlparse.urlparse(url)
1068 except ValueError:
1069 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001070
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001071 if codereview is not None:
1072 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1073 return parsed or fail_result
1074
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001075 results = {}
1076 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1077 parsed = cls.ParseIssueURL(parsed_url)
1078 if parsed is not None:
1079 results[name] = parsed
1080
1081 if not results:
1082 return fail_result
1083 if len(results) == 1:
1084 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001085
1086 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1087 # This is likely Gerrit.
1088 return results['gerrit']
1089 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001090 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001091
1092
Aaron Gablea45ee112016-11-22 15:14:38 -08001093class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001094 def __init__(self, issue, url):
1095 self.issue = issue
1096 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001097 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001098
1099 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001100 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001101 self.issue, self.url)
1102
1103
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001104_CommentSummary = collections.namedtuple(
1105 '_CommentSummary', ['date', 'message', 'sender',
1106 # TODO(tandrii): these two aren't known in Gerrit.
1107 'approval', 'disapproval'])
1108
1109
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001110class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001111 """Changelist works with one changelist in local branch.
1112
1113 Supports two codereview backends: Rietveld or Gerrit, selected at object
1114 creation.
1115
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001116 Notes:
1117 * Not safe for concurrent multi-{thread,process} use.
1118 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001119 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001120 """
1121
1122 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1123 """Create a new ChangeList instance.
1124
1125 If issue is given, the codereview must be given too.
1126
1127 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1128 Otherwise, it's decided based on current configuration of the local branch,
1129 with default being 'rietveld' for backwards compatibility.
1130 See _load_codereview_impl for more details.
1131
1132 **kwargs will be passed directly to codereview implementation.
1133 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001135 global settings
1136 if not settings:
1137 # Happens when git_cl.py is used as a utility library.
1138 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001139
1140 if issue:
1141 assert codereview, 'codereview must be known, if issue is known'
1142
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143 self.branchref = branchref
1144 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001145 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001146 self.branch = ShortBranchName(self.branchref)
1147 else:
1148 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001150 self.lookedup_issue = False
1151 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001152 self.has_description = False
1153 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001154 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001155 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001156 self.cc = None
1157 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001158 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001159
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001160 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001161 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001163 assert self._codereview_impl
1164 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001165
1166 def _load_codereview_impl(self, codereview=None, **kwargs):
1167 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001168 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1169 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1170 self._codereview = codereview
1171 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001172 return
1173
1174 # Automatic selection based on issue number set for a current branch.
1175 # Rietveld takes precedence over Gerrit.
1176 assert not self.issue
1177 # Whether we find issue or not, we are doing the lookup.
1178 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001179 if self.GetBranch():
1180 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1181 issue = _git_get_branch_config_value(
1182 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1183 if issue:
1184 self._codereview = codereview
1185 self._codereview_impl = cls(self, **kwargs)
1186 self.issue = int(issue)
1187 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001188
1189 # No issue is set for this branch, so decide based on repo-wide settings.
1190 return self._load_codereview_impl(
1191 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1192 **kwargs)
1193
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001194 def IsGerrit(self):
1195 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001196
1197 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001198 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001199
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001200 The return value is a string suitable for passing to git cl with the --cc
1201 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001202 """
1203 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001204 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001205 more_cc = ','.join(self.watchers)
1206 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1207 return self.cc
1208
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001209 def GetCCListWithoutDefault(self):
1210 """Return the users cc'd on this CL excluding default ones."""
1211 if self.cc is None:
1212 self.cc = ','.join(self.watchers)
1213 return self.cc
1214
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001215 def SetWatchers(self, watchers):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001216 """Sets the list of email addresses that should be cc'd based on the changed
1217 files in this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001218 """
1219 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001220
1221 def GetBranch(self):
1222 """Returns the short branch name, e.g. 'master'."""
1223 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001224 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001225 if not branchref:
1226 return None
1227 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001228 self.branch = ShortBranchName(self.branchref)
1229 return self.branch
1230
1231 def GetBranchRef(self):
1232 """Returns the full branch name, e.g. 'refs/heads/master'."""
1233 self.GetBranch() # Poke the lazy loader.
1234 return self.branchref
1235
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001236 def ClearBranch(self):
1237 """Clears cached branch data of this object."""
1238 self.branch = self.branchref = None
1239
tandrii5d48c322016-08-18 16:19:37 -07001240 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1241 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1242 kwargs['branch'] = self.GetBranch()
1243 return _git_get_branch_config_value(key, default, **kwargs)
1244
1245 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1246 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1247 assert self.GetBranch(), (
1248 'this CL must have an associated branch to %sset %s%s' %
1249 ('un' if value is None else '',
1250 key,
1251 '' if value is None else ' to %r' % value))
1252 kwargs['branch'] = self.GetBranch()
1253 return _git_set_branch_config_value(key, value, **kwargs)
1254
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001255 @staticmethod
1256 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001257 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001258 e.g. 'origin', 'refs/heads/master'
1259 """
1260 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001261 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1262
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001263 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001264 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001265 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001266 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1267 error_ok=True).strip()
1268 if upstream_branch:
1269 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001270 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001271 # Else, try to guess the origin remote.
1272 remote_branches = RunGit(['branch', '-r']).split()
1273 if 'origin/master' in remote_branches:
1274 # Fall back on origin/master if it exits.
1275 remote = 'origin'
1276 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001277 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001278 DieWithError(
1279 'Unable to determine default branch to diff against.\n'
1280 'Either pass complete "git diff"-style arguments, like\n'
1281 ' git cl upload origin/master\n'
1282 'or verify this branch is set up to track another \n'
1283 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001284
1285 return remote, upstream_branch
1286
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001287 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001288 upstream_branch = self.GetUpstreamBranch()
1289 if not BranchExists(upstream_branch):
1290 DieWithError('The upstream for the current branch (%s) does not exist '
1291 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001292 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001293 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001294
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295 def GetUpstreamBranch(self):
1296 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001297 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001298 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001299 upstream_branch = upstream_branch.replace('refs/heads/',
1300 'refs/remotes/%s/' % remote)
1301 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1302 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303 self.upstream_branch = upstream_branch
1304 return self.upstream_branch
1305
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001306 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001307 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001308 remote, branch = None, self.GetBranch()
1309 seen_branches = set()
1310 while branch not in seen_branches:
1311 seen_branches.add(branch)
1312 remote, branch = self.FetchUpstreamTuple(branch)
1313 branch = ShortBranchName(branch)
1314 if remote != '.' or branch.startswith('refs/remotes'):
1315 break
1316 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001317 remotes = RunGit(['remote'], error_ok=True).split()
1318 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001319 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001320 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001321 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001322 logging.warn('Could not determine which remote this change is '
1323 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001324 else:
1325 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001326 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001327 branch = 'HEAD'
1328 if branch.startswith('refs/remotes'):
1329 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001330 elif branch.startswith('refs/branch-heads/'):
1331 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 else:
1333 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001334 return self._remote
1335
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001336 def GitSanityChecks(self, upstream_git_obj):
1337 """Checks git repo status and ensures diff is from local commits."""
1338
sbc@chromium.org79706062015-01-14 21:18:12 +00001339 if upstream_git_obj is None:
1340 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001341 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001342 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001343 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001344 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001345 return False
1346
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001347 # Verify the commit we're diffing against is in our current branch.
1348 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1349 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1350 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001351 print('ERROR: %s is not in the current branch. You may need to rebase '
1352 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001353 return False
1354
1355 # List the commits inside the diff, and verify they are all local.
1356 commits_in_diff = RunGit(
1357 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1358 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1359 remote_branch = remote_branch.strip()
1360 if code != 0:
1361 _, remote_branch = self.GetRemoteBranch()
1362
1363 commits_in_remote = RunGit(
1364 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1365
1366 common_commits = set(commits_in_diff) & set(commits_in_remote)
1367 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001368 print('ERROR: Your diff contains %d commits already in %s.\n'
1369 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1370 'the diff. If you are using a custom git flow, you can override'
1371 ' the reference used for this check with "git config '
1372 'gitcl.remotebranch <git-ref>".' % (
1373 len(common_commits), remote_branch, upstream_git_obj),
1374 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001375 return False
1376 return True
1377
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001378 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001379 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001380
1381 Returns None if it is not set.
1382 """
tandrii5d48c322016-08-18 16:19:37 -07001383 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001384
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001385 def GetRemoteUrl(self):
1386 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1387
1388 Returns None if there is no remote.
1389 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001390 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001391 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1392
1393 # If URL is pointing to a local directory, it is probably a git cache.
1394 if os.path.isdir(url):
1395 url = RunGit(['config', 'remote.%s.url' % remote],
1396 error_ok=True,
1397 cwd=url).strip()
1398 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001399
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001400 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001401 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001402 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001403 self.issue = self._GitGetBranchConfigValue(
1404 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001405 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 return self.issue
1407
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408 def GetIssueURL(self):
1409 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001410 issue = self.GetIssue()
1411 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001412 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001413 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001415 def GetDescription(self, pretty=False, force=False):
1416 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001418 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001419 self.has_description = True
1420 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001421 # Set width to 72 columns + 2 space indent.
1422 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001423 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001424 lines = self.description.splitlines()
1425 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001426 return self.description
1427
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001428 def GetDescriptionFooters(self):
1429 """Returns (non_footer_lines, footers) for the commit message.
1430
1431 Returns:
1432 non_footer_lines (list(str)) - Simple list of description lines without
1433 any footer. The lines do not contain newlines, nor does the list contain
1434 the empty line between the message and the footers.
1435 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1436 [("Change-Id", "Ideadbeef...."), ...]
1437 """
1438 raw_description = self.GetDescription()
1439 msg_lines, _, footers = git_footers.split_footers(raw_description)
1440 if footers:
1441 msg_lines = msg_lines[:len(msg_lines)-1]
1442 return msg_lines, footers
1443
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001444 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001445 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001447 self.patchset = self._GitGetBranchConfigValue(
1448 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001449 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001450 return self.patchset
1451
1452 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001453 """Set this branch's patchset. If patchset=0, clears the patchset."""
1454 assert self.GetBranch()
1455 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001456 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001457 else:
1458 self.patchset = int(patchset)
1459 self._GitSetBranchConfigValue(
1460 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001461
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001462 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001463 """Set this branch's issue. If issue isn't given, clears the issue."""
1464 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001465 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001466 issue = int(issue)
1467 self._GitSetBranchConfigValue(
1468 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001469 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001470 codereview_server = self._codereview_impl.GetCodereviewServer()
1471 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001472 self._GitSetBranchConfigValue(
1473 self._codereview_impl.CodereviewServerConfigKey(),
1474 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001475 else:
tandrii5d48c322016-08-18 16:19:37 -07001476 # Reset all of these just to be clean.
1477 reset_suffixes = [
1478 'last-upload-hash',
1479 self._codereview_impl.IssueConfigKey(),
1480 self._codereview_impl.PatchsetConfigKey(),
1481 self._codereview_impl.CodereviewServerConfigKey(),
1482 ] + self._PostUnsetIssueProperties()
1483 for prop in reset_suffixes:
1484 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001485 msg = RunGit(['log', '-1', '--format=%B']).strip()
1486 if msg and git_footers.get_footer_change_id(msg):
1487 print('WARNING: The change patched into this branch has a Change-Id. '
1488 'Removing it.')
1489 RunGit(['commit', '--amend', '-m',
1490 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001491 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001492 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001493
dnjba1b0f32016-09-02 12:37:42 -07001494 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001495 if not self.GitSanityChecks(upstream_branch):
1496 DieWithError('\nGit sanity check failure')
1497
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001498 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001499 if not root:
1500 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001501 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001502
1503 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001504 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001505 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001506 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001507 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001508 except subprocess2.CalledProcessError:
1509 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001510 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001511 'This branch probably doesn\'t exist anymore. To reset the\n'
1512 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001513 ' git branch --set-upstream-to origin/master %s\n'
1514 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001515 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001516
maruel@chromium.org52424302012-08-29 15:14:30 +00001517 issue = self.GetIssue()
1518 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001519 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001520 description = self.GetDescription()
1521 else:
1522 # If the change was never uploaded, use the log messages of all commits
1523 # up to the branch point, as git cl upload will prefill the description
1524 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001525 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1526 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001527
1528 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001529 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001530 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001531 name,
1532 description,
1533 absroot,
1534 files,
1535 issue,
1536 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001537 author,
1538 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001539
dsansomee2d6fd92016-09-08 00:10:47 -07001540 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001541 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001542 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001543 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001544
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001545 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1546 """Sets the description for this CL remotely.
1547
1548 You can get description_lines and footers with GetDescriptionFooters.
1549
1550 Args:
1551 description_lines (list(str)) - List of CL description lines without
1552 newline characters.
1553 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1554 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1555 `List-Of-Tokens`). It will be case-normalized so that each token is
1556 title-cased.
1557 """
1558 new_description = '\n'.join(description_lines)
1559 if footers:
1560 new_description += '\n'
1561 for k, v in footers:
1562 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1563 if not git_footers.FOOTER_PATTERN.match(foot):
1564 raise ValueError('Invalid footer %r' % foot)
1565 new_description += foot + '\n'
1566 self.UpdateDescription(new_description, force)
1567
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001568 def RunHook(self, committing, may_prompt, verbose, change):
1569 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1570 try:
1571 return presubmit_support.DoPresubmitChecks(change, committing,
1572 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1573 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001574 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001575 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001576 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001577 DieWithError(
1578 ('%s\nMaybe your depot_tools is out of date?\n'
1579 'If all fails, contact maruel@') % e)
1580
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001581 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1582 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001583 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1584 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001585 else:
1586 # Assume url.
1587 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1588 urlparse.urlparse(issue_arg))
1589 if not parsed_issue_arg or not parsed_issue_arg.valid:
1590 DieWithError('Failed to parse issue argument "%s". '
1591 'Must be an issue number or a valid URL.' % issue_arg)
1592 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001593 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001594
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001595 def CMDUpload(self, options, git_diff_args, orig_args):
1596 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001597 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001599 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001600 else:
1601 if self.GetBranch() is None:
1602 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1603
1604 # Default to diffing against common ancestor of upstream branch
1605 base_branch = self.GetCommonAncestorWithUpstream()
1606 git_diff_args = [base_branch, 'HEAD']
1607
Aaron Gablec4c40d12017-05-22 11:49:53 -07001608 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1609 if not self.IsGerrit() and not self.GetIssue():
1610 print('=====================================')
1611 print('NOTICE: Rietveld is being deprecated. '
1612 'You can upload changes to Gerrit with')
1613 print(' git cl upload --gerrit')
1614 print('or set Gerrit to be your default code review tool with')
1615 print(' git config gerrit.host true')
1616 print('=====================================')
1617
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001618 # Fast best-effort checks to abort before running potentially
1619 # expensive hooks if uploading is likely to fail anyway. Passing these
1620 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001621 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001622 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001623
1624 # Apply watchlists on upload.
1625 change = self.GetChange(base_branch, None)
1626 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1627 files = [f.LocalPath() for f in change.AffectedFiles()]
1628 if not options.bypass_watchlists:
1629 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1630
1631 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001632 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001633 # Set the reviewer list now so that presubmit checks can access it.
1634 change_description = ChangeDescription(change.FullDescriptionText())
1635 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001636 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001637 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001638 change)
1639 change.SetDescriptionText(change_description.description)
1640 hook_results = self.RunHook(committing=False,
1641 may_prompt=not options.force,
1642 verbose=options.verbose,
1643 change=change)
1644 if not hook_results.should_continue():
1645 return 1
1646 if not options.reviewers and hook_results.reviewers:
1647 options.reviewers = hook_results.reviewers.split(',')
1648
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001649 # TODO(tandrii): Checking local patchset against remote patchset is only
1650 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1651 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001652 latest_patchset = self.GetMostRecentPatchset()
1653 local_patchset = self.GetPatchset()
1654 if (latest_patchset and local_patchset and
1655 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001656 print('The last upload made from this repository was patchset #%d but '
1657 'the most recent patchset on the server is #%d.'
1658 % (local_patchset, latest_patchset))
1659 print('Uploading will still work, but if you\'ve uploaded to this '
1660 'issue from another machine or branch the patch you\'re '
1661 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001662 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001663
1664 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001665 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001666 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001667 if options.use_commit_queue:
1668 self.SetCQState(_CQState.COMMIT)
1669 elif options.cq_dry_run:
1670 self.SetCQState(_CQState.DRY_RUN)
1671
tandrii5d48c322016-08-18 16:19:37 -07001672 _git_set_branch_config_value('last-upload-hash',
1673 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001674 # Run post upload hooks, if specified.
1675 if settings.GetRunPostUploadHook():
1676 presubmit_support.DoPostUploadExecuter(
1677 change,
1678 self,
1679 settings.GetRoot(),
1680 options.verbose,
1681 sys.stdout)
1682
1683 # Upload all dependencies if specified.
1684 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001685 print()
1686 print('--dependencies has been specified.')
1687 print('All dependent local branches will be re-uploaded.')
1688 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001689 # Remove the dependencies flag from args so that we do not end up in a
1690 # loop.
1691 orig_args.remove('--dependencies')
1692 ret = upload_branch_deps(self, orig_args)
1693 return ret
1694
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001695 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001696 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001697
1698 Issue must have been already uploaded and known.
1699 """
1700 assert new_state in _CQState.ALL_STATES
1701 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001702 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001703 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001704 return 0
1705 except KeyboardInterrupt:
1706 raise
1707 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001708 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001709 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001710 ' * Your project has no CQ,\n'
1711 ' * You don\'t have permission to change the CQ state,\n'
1712 ' * There\'s a bug in this code (see stack trace below).\n'
1713 'Consider specifying which bots to trigger manually or asking your '
1714 'project owners for permissions or contacting Chrome Infra at:\n'
1715 'https://www.chromium.org/infra\n\n' %
1716 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001717 # Still raise exception so that stack trace is printed.
1718 raise
1719
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001720 # Forward methods to codereview specific implementation.
1721
Aaron Gable636b13f2017-07-14 10:42:48 -07001722 def AddComment(self, message, publish=None):
1723 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001724
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001725 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001726 """Returns list of _CommentSummary for each comment.
1727
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001728 args:
1729 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001730 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001731 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001732
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001733 def CloseIssue(self):
1734 return self._codereview_impl.CloseIssue()
1735
1736 def GetStatus(self):
1737 return self._codereview_impl.GetStatus()
1738
1739 def GetCodereviewServer(self):
1740 return self._codereview_impl.GetCodereviewServer()
1741
tandriide281ae2016-10-12 06:02:30 -07001742 def GetIssueOwner(self):
1743 """Get owner from codereview, which may differ from this checkout."""
1744 return self._codereview_impl.GetIssueOwner()
1745
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001746 def GetMostRecentPatchset(self):
1747 return self._codereview_impl.GetMostRecentPatchset()
1748
tandriide281ae2016-10-12 06:02:30 -07001749 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001750 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001751 return self._codereview_impl.CannotTriggerTryJobReason()
1752
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001753 def GetTryJobProperties(self, patchset=None):
1754 """Returns dictionary of properties to launch try job."""
1755 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001756
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001757 def __getattr__(self, attr):
1758 # This is because lots of untested code accesses Rietveld-specific stuff
1759 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001760 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001761 # Note that child method defines __getattr__ as well, and forwards it here,
1762 # because _RietveldChangelistImpl is not cleaned up yet, and given
1763 # deprecation of Rietveld, it should probably be just removed.
1764 # Until that time, avoid infinite recursion by bypassing __getattr__
1765 # of implementation class.
1766 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001767
1768
1769class _ChangelistCodereviewBase(object):
1770 """Abstract base class encapsulating codereview specifics of a changelist."""
1771 def __init__(self, changelist):
1772 self._changelist = changelist # instance of Changelist
1773
1774 def __getattr__(self, attr):
1775 # Forward methods to changelist.
1776 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1777 # _RietveldChangelistImpl to avoid this hack?
1778 return getattr(self._changelist, attr)
1779
1780 def GetStatus(self):
1781 """Apply a rough heuristic to give a simple summary of an issue's review
1782 or CQ status, assuming adherence to a common workflow.
1783
1784 Returns None if no issue for this branch, or specific string keywords.
1785 """
1786 raise NotImplementedError()
1787
1788 def GetCodereviewServer(self):
1789 """Returns server URL without end slash, like "https://codereview.com"."""
1790 raise NotImplementedError()
1791
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001792 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001793 """Fetches and returns description from the codereview server."""
1794 raise NotImplementedError()
1795
tandrii5d48c322016-08-18 16:19:37 -07001796 @classmethod
1797 def IssueConfigKey(cls):
1798 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001799 raise NotImplementedError()
1800
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001801 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001802 def PatchsetConfigKey(cls):
1803 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001804 raise NotImplementedError()
1805
tandrii5d48c322016-08-18 16:19:37 -07001806 @classmethod
1807 def CodereviewServerConfigKey(cls):
1808 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001809 raise NotImplementedError()
1810
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001811 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001812 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001813 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001814
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001815 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001817 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001818 raise NotImplementedError()
1819
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001820 def GetGerritObjForPresubmit(self):
1821 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1822 return None
1823
dsansomee2d6fd92016-09-08 00:10:47 -07001824 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001825 """Update the description on codereview site."""
1826 raise NotImplementedError()
1827
Aaron Gable636b13f2017-07-14 10:42:48 -07001828 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001829 """Posts a comment to the codereview site."""
1830 raise NotImplementedError()
1831
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001832 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001833 raise NotImplementedError()
1834
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001835 def CloseIssue(self):
1836 """Closes the issue."""
1837 raise NotImplementedError()
1838
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001839 def GetMostRecentPatchset(self):
1840 """Returns the most recent patchset number from the codereview site."""
1841 raise NotImplementedError()
1842
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001844 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001845 """Fetches and applies the issue.
1846
1847 Arguments:
1848 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1849 reject: if True, reject the failed patch instead of switching to 3-way
1850 merge. Rietveld only.
1851 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1852 only.
1853 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001854 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001855 """
1856 raise NotImplementedError()
1857
1858 @staticmethod
1859 def ParseIssueURL(parsed_url):
1860 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1861 failed."""
1862 raise NotImplementedError()
1863
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001864 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001865 """Best effort check that user is authenticated with codereview server.
1866
1867 Arguments:
1868 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001869 refresh: whether to attempt to refresh credentials. Ignored if not
1870 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001871 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001872 raise NotImplementedError()
1873
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001874 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001875 """Best effort check that uploading isn't supposed to fail for predictable
1876 reasons.
1877
1878 This method should raise informative exception if uploading shouldn't
1879 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001880
1881 Arguments:
1882 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001883 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001884 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001885
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001886 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001887 """Uploads a change to codereview."""
1888 raise NotImplementedError()
1889
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001890 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001891 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001892
1893 Issue must have been already uploaded and known.
1894 """
1895 raise NotImplementedError()
1896
tandriie113dfd2016-10-11 10:20:12 -07001897 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001898 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001899 raise NotImplementedError()
1900
tandriide281ae2016-10-12 06:02:30 -07001901 def GetIssueOwner(self):
1902 raise NotImplementedError()
1903
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001904 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001905 raise NotImplementedError()
1906
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001907
1908class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001909
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001910 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911 super(_RietveldChangelistImpl, self).__init__(changelist)
1912 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001913 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001914 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001915
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001916 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001917 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001918 self._props = None
1919 self._rpc_server = None
1920
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001921 def GetCodereviewServer(self):
1922 if not self._rietveld_server:
1923 # If we're on a branch then get the server potentially associated
1924 # with that branch.
1925 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001926 self._rietveld_server = gclient_utils.UpgradeToHttps(
1927 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001928 if not self._rietveld_server:
1929 self._rietveld_server = settings.GetDefaultServerUrl()
1930 return self._rietveld_server
1931
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001932 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001933 """Best effort check that user is authenticated with Rietveld server."""
1934 if self._auth_config.use_oauth2:
1935 authenticator = auth.get_authenticator_for_host(
1936 self.GetCodereviewServer(), self._auth_config)
1937 if not authenticator.has_cached_credentials():
1938 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001939 if refresh:
1940 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001941
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001942 def EnsureCanUploadPatchset(self, force):
1943 # No checks for Rietveld because we are deprecating Rietveld.
1944 pass
1945
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001946 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001947 issue = self.GetIssue()
1948 assert issue
1949 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001950 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001951 except urllib2.HTTPError as e:
1952 if e.code == 404:
1953 DieWithError(
1954 ('\nWhile fetching the description for issue %d, received a '
1955 '404 (not found)\n'
1956 'error. It is likely that you deleted this '
1957 'issue on the server. If this is the\n'
1958 'case, please run\n\n'
1959 ' git cl issue 0\n\n'
1960 'to clear the association with the deleted issue. Then run '
1961 'this command again.') % issue)
1962 else:
1963 DieWithError(
1964 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1965 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001966 print('Warning: Failed to retrieve CL description due to network '
1967 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001968 return ''
1969
1970 def GetMostRecentPatchset(self):
1971 return self.GetIssueProperties()['patchsets'][-1]
1972
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001973 def GetIssueProperties(self):
1974 if self._props is None:
1975 issue = self.GetIssue()
1976 if not issue:
1977 self._props = {}
1978 else:
1979 self._props = self.RpcServer().get_issue_properties(issue, True)
1980 return self._props
1981
tandriie113dfd2016-10-11 10:20:12 -07001982 def CannotTriggerTryJobReason(self):
1983 props = self.GetIssueProperties()
1984 if not props:
1985 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1986 if props.get('closed'):
1987 return 'CL %s is closed' % self.GetIssue()
1988 if props.get('private'):
1989 return 'CL %s is private' % self.GetIssue()
1990 return None
1991
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001992 def GetTryJobProperties(self, patchset=None):
1993 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001994 project = (self.GetIssueProperties() or {}).get('project')
1995 return {
1996 'issue': self.GetIssue(),
1997 'patch_project': project,
1998 'patch_storage': 'rietveld',
1999 'patchset': patchset or self.GetPatchset(),
2000 'rietveld': self.GetCodereviewServer(),
2001 }
2002
tandriide281ae2016-10-12 06:02:30 -07002003 def GetIssueOwner(self):
2004 return (self.GetIssueProperties() or {}).get('owner_email')
2005
Aaron Gable636b13f2017-07-14 10:42:48 -07002006 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002007 return self.RpcServer().add_comment(self.GetIssue(), message)
2008
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002009 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002010 summary = []
2011 for message in self.GetIssueProperties().get('messages', []):
2012 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2013 summary.append(_CommentSummary(
2014 date=date,
2015 disapproval=bool(message['disapproval']),
2016 approval=bool(message['approval']),
2017 sender=message['sender'],
2018 message=message['text'],
2019 ))
2020 return summary
2021
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002022 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002023 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002024 or CQ status, assuming adherence to a common workflow.
2025
2026 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002027 * 'error' - error from review tool (including deleted issues)
2028 * 'unsent' - not sent for review
2029 * 'waiting' - waiting for review
2030 * 'reply' - waiting for owner to reply to review
2031 * 'not lgtm' - Code-Review label has been set negatively
2032 * 'lgtm' - LGTM from at least one approved reviewer
2033 * 'commit' - in the commit queue
2034 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002035 """
2036 if not self.GetIssue():
2037 return None
2038
2039 try:
2040 props = self.GetIssueProperties()
2041 except urllib2.HTTPError:
2042 return 'error'
2043
2044 if props.get('closed'):
2045 # Issue is closed.
2046 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002047 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002048 # Issue is in the commit queue.
2049 return 'commit'
2050
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002051 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002052 if not messages:
2053 # No message was sent.
2054 return 'unsent'
2055
2056 if get_approving_reviewers(props):
2057 return 'lgtm'
2058 elif get_approving_reviewers(props, disapproval=True):
2059 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002060
tandrii9d2c7a32016-06-22 03:42:45 -07002061 # Skip CQ messages that don't require owner's action.
2062 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2063 if 'Dry run:' in messages[-1]['text']:
2064 messages.pop()
2065 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2066 # This message always follows prior messages from CQ,
2067 # so skip this too.
2068 messages.pop()
2069 else:
2070 # This is probably a CQ messages warranting user attention.
2071 break
2072
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002073 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002074 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002075 return 'reply'
2076 return 'waiting'
2077
dsansomee2d6fd92016-09-08 00:10:47 -07002078 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002079 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002080
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002081 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002082 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002083
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002084 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002085 return self.SetFlags({flag: value})
2086
2087 def SetFlags(self, flags):
2088 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002089 """
phajdan.jr68598232016-08-10 03:28:28 -07002090 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002091 try:
tandrii4b233bd2016-07-06 03:50:29 -07002092 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002093 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002094 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002095 if e.code == 404:
2096 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2097 if e.code == 403:
2098 DieWithError(
2099 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002100 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002101 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002102
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002103 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002104 """Returns an upload.RpcServer() to access this review's rietveld instance.
2105 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002106 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002107 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002108 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002109 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002110 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002111
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002112 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002113 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002114 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002115
tandrii5d48c322016-08-18 16:19:37 -07002116 @classmethod
2117 def PatchsetConfigKey(cls):
2118 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002119
tandrii5d48c322016-08-18 16:19:37 -07002120 @classmethod
2121 def CodereviewServerConfigKey(cls):
2122 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002123
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002124 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002125 return self.RpcServer()
2126
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002127 def SetCQState(self, new_state):
2128 props = self.GetIssueProperties()
2129 if props.get('private'):
2130 DieWithError('Cannot set-commit on private issue')
2131
2132 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002133 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002135 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002136 else:
tandrii4b233bd2016-07-06 03:50:29 -07002137 assert new_state == _CQState.DRY_RUN
2138 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002139
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002140 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002141 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002142 # PatchIssue should never be called with a dirty tree. It is up to the
2143 # caller to check this, but just in case we assert here since the
2144 # consequences of the caller not checking this could be dire.
2145 assert(not git_common.is_dirty_git_tree('apply'))
2146 assert(parsed_issue_arg.valid)
2147 self._changelist.issue = parsed_issue_arg.issue
2148 if parsed_issue_arg.hostname:
2149 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2150
skobes6468b902016-10-24 08:45:10 -07002151 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2152 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2153 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 try:
skobes6468b902016-10-24 08:45:10 -07002155 scm_obj.apply_patch(patchset_object)
2156 except Exception as e:
2157 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002158 return 1
2159
2160 # If we had an issue, commit the current state and register the issue.
2161 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002162 self.SetIssue(self.GetIssue())
2163 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2165 'patch from issue %(i)s at patchset '
2166 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2167 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002168 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002170 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002171 return 0
2172
2173 @staticmethod
2174 def ParseIssueURL(parsed_url):
2175 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2176 return None
wychen3c1c1722016-08-04 11:46:36 -07002177 # Rietveld patch: https://domain/<number>/#ps<patchset>
2178 match = re.match(r'/(\d+)/$', parsed_url.path)
2179 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2180 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002181 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002182 issue=int(match.group(1)),
2183 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002184 hostname=parsed_url.netloc,
2185 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002186 # Typical url: https://domain/<issue_number>[/[other]]
2187 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2188 if match:
skobes6468b902016-10-24 08:45:10 -07002189 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002190 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002191 hostname=parsed_url.netloc,
2192 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002193 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2194 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2195 if match:
skobes6468b902016-10-24 08:45:10 -07002196 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002197 issue=int(match.group(1)),
2198 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002199 hostname=parsed_url.netloc,
2200 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002201 return None
2202
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002203 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002204 """Upload the patch to Rietveld."""
2205 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2206 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002207 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2208 if options.emulate_svn_auto_props:
2209 upload_args.append('--emulate_svn_auto_props')
2210
2211 change_desc = None
2212
2213 if options.email is not None:
2214 upload_args.extend(['--email', options.email])
2215
2216 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002217 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 upload_args.extend(['--title', options.title])
2219 if options.message:
2220 upload_args.extend(['--message', options.message])
2221 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002222 print('This branch is associated with issue %s. '
2223 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002224 else:
nodirca166002016-06-27 10:59:51 -07002225 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002226 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002227 if options.message:
2228 message = options.message
2229 else:
2230 message = CreateDescriptionFromLog(args)
2231 if options.title:
2232 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002233 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002234 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002235 change_desc.update_reviewers(options.reviewers, options.tbrs,
2236 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002238 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002239
2240 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002241 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002242 return 1
2243
2244 upload_args.extend(['--message', change_desc.description])
2245 if change_desc.get_reviewers():
2246 upload_args.append('--reviewers=%s' % ','.join(
2247 change_desc.get_reviewers()))
2248 if options.send_mail:
2249 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002250 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002251 upload_args.append('--send_mail')
2252
2253 # We check this before applying rietveld.private assuming that in
2254 # rietveld.cc only addresses which we can send private CLs to are listed
2255 # if rietveld.private is set, and so we should ignore rietveld.cc only
2256 # when --private is specified explicitly on the command line.
2257 if options.private:
2258 logging.warn('rietveld.cc is ignored since private flag is specified. '
2259 'You need to review and add them manually if necessary.')
2260 cc = self.GetCCListWithoutDefault()
2261 else:
2262 cc = self.GetCCList()
2263 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002264 if change_desc.get_cced():
2265 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002266 if cc:
2267 upload_args.extend(['--cc', cc])
2268
2269 if options.private or settings.GetDefaultPrivateFlag() == "True":
2270 upload_args.append('--private')
2271
2272 upload_args.extend(['--git_similarity', str(options.similarity)])
2273 if not options.find_copies:
2274 upload_args.extend(['--git_no_find_copies'])
2275
2276 # Include the upstream repo's URL in the change -- this is useful for
2277 # projects that have their source spread across multiple repos.
2278 remote_url = self.GetGitBaseUrlFromConfig()
2279 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002280 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2281 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2282 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002283 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002285 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002286 if target_ref:
2287 upload_args.extend(['--target_ref', target_ref])
2288
2289 # Look for dependent patchsets. See crbug.com/480453 for more details.
2290 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2291 upstream_branch = ShortBranchName(upstream_branch)
2292 if remote is '.':
2293 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002294 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002296 print()
2297 print('Skipping dependency patchset upload because git config '
2298 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2299 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002300 else:
2301 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002302 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002303 auth_config=auth_config)
2304 branch_cl_issue_url = branch_cl.GetIssueURL()
2305 branch_cl_issue = branch_cl.GetIssue()
2306 branch_cl_patchset = branch_cl.GetPatchset()
2307 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2308 upload_args.extend(
2309 ['--depends_on_patchset', '%s:%s' % (
2310 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002311 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002312 '\n'
2313 'The current branch (%s) is tracking a local branch (%s) with '
2314 'an associated CL.\n'
2315 'Adding %s/#ps%s as a dependency patchset.\n'
2316 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2317 branch_cl_patchset))
2318
2319 project = settings.GetProject()
2320 if project:
2321 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002322 else:
2323 print()
2324 print('WARNING: Uploading without a project specified. Please ensure '
2325 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2326 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002327
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328 try:
2329 upload_args = ['upload'] + upload_args + args
2330 logging.info('upload.RealMain(%s)', upload_args)
2331 issue, patchset = upload.RealMain(upload_args)
2332 issue = int(issue)
2333 patchset = int(patchset)
2334 except KeyboardInterrupt:
2335 sys.exit(1)
2336 except:
2337 # If we got an exception after the user typed a description for their
2338 # change, back up the description before re-raising.
2339 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002340 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002341 raise
2342
2343 if not self.GetIssue():
2344 self.SetIssue(issue)
2345 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002346 return 0
2347
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002348
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002349class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002350 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002351 # auth_config is Rietveld thing, kept here to preserve interface only.
2352 super(_GerritChangelistImpl, self).__init__(changelist)
2353 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002354 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002355 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002356 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002357 # Map from change number (issue) to its detail cache.
2358 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002359
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002360 if codereview_host is not None:
2361 assert not codereview_host.startswith('https://'), codereview_host
2362 self._gerrit_host = codereview_host
2363 self._gerrit_server = 'https://%s' % codereview_host
2364
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002365 def _GetGerritHost(self):
2366 # Lazy load of configs.
2367 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002368 if self._gerrit_host and '.' not in self._gerrit_host:
2369 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2370 # This happens for internal stuff http://crbug.com/614312.
2371 parsed = urlparse.urlparse(self.GetRemoteUrl())
2372 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002373 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002374 ' Your current remote is: %s' % self.GetRemoteUrl())
2375 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2376 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002377 return self._gerrit_host
2378
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002379 def _GetGitHost(self):
2380 """Returns git host to be used when uploading change to Gerrit."""
2381 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2382
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002383 def GetCodereviewServer(self):
2384 if not self._gerrit_server:
2385 # If we're on a branch then get the server potentially associated
2386 # with that branch.
2387 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002388 self._gerrit_server = self._GitGetBranchConfigValue(
2389 self.CodereviewServerConfigKey())
2390 if self._gerrit_server:
2391 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002392 if not self._gerrit_server:
2393 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2394 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002395 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002396 parts[0] = parts[0] + '-review'
2397 self._gerrit_host = '.'.join(parts)
2398 self._gerrit_server = 'https://%s' % self._gerrit_host
2399 return self._gerrit_server
2400
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002401 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002402 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002403 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002404
tandrii5d48c322016-08-18 16:19:37 -07002405 @classmethod
2406 def PatchsetConfigKey(cls):
2407 return 'gerritpatchset'
2408
2409 @classmethod
2410 def CodereviewServerConfigKey(cls):
2411 return 'gerritserver'
2412
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002413 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002414 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002415 if settings.GetGerritSkipEnsureAuthenticated():
2416 # For projects with unusual authentication schemes.
2417 # See http://crbug.com/603378.
2418 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002419 # Lazy-loader to identify Gerrit and Git hosts.
2420 if gerrit_util.GceAuthenticator.is_gce():
2421 return
2422 self.GetCodereviewServer()
2423 git_host = self._GetGitHost()
2424 assert self._gerrit_server and self._gerrit_host
2425 cookie_auth = gerrit_util.CookiesAuthenticator()
2426
2427 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2428 git_auth = cookie_auth.get_auth_header(git_host)
2429 if gerrit_auth and git_auth:
2430 if gerrit_auth == git_auth:
2431 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002432 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002433 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002434 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002435 ' %s\n'
2436 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002437 ' Consider running the following command:\n'
2438 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002439 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002440 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002441 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002442 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002443 cookie_auth.get_new_password_message(git_host)))
2444 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002445 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002446 return
2447 else:
2448 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002449 ([] if gerrit_auth else [self._gerrit_host]) +
2450 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002451 DieWithError('Credentials for the following hosts are required:\n'
2452 ' %s\n'
2453 'These are read from %s (or legacy %s)\n'
2454 '%s' % (
2455 '\n '.join(missing),
2456 cookie_auth.get_gitcookies_path(),
2457 cookie_auth.get_netrc_path(),
2458 cookie_auth.get_new_password_message(git_host)))
2459
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002460 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002461 if not self.GetIssue():
2462 return
2463
2464 # Warm change details cache now to avoid RPCs later, reducing latency for
2465 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002466 self._GetChangeDetail(
2467 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002468
2469 status = self._GetChangeDetail()['status']
2470 if status in ('MERGED', 'ABANDONED'):
2471 DieWithError('Change %s has been %s, new uploads are not allowed' %
2472 (self.GetIssueURL(),
2473 'submitted' if status == 'MERGED' else 'abandoned'))
2474
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002475 if gerrit_util.GceAuthenticator.is_gce():
2476 return
2477 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2478 self._GetGerritHost())
2479 if self.GetIssueOwner() == cookies_user:
2480 return
2481 logging.debug('change %s owner is %s, cookies user is %s',
2482 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002483 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002484 # so ask what Gerrit thinks of this user.
2485 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2486 if details['email'] == self.GetIssueOwner():
2487 return
2488 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002489 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002490 'as %s.\n'
2491 'Uploading may fail due to lack of permissions.' %
2492 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2493 confirm_or_exit(action='upload')
2494
2495
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002496 def _PostUnsetIssueProperties(self):
2497 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002498 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002499
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002500 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002501 class ThisIsNotRietveldIssue(object):
2502 def __nonzero__(self):
2503 # This is a hack to make presubmit_support think that rietveld is not
2504 # defined, yet still ensure that calls directly result in a decent
2505 # exception message below.
2506 return False
2507
2508 def __getattr__(self, attr):
2509 print(
2510 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2511 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002512 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002513 'or use Rietveld for codereview.\n'
2514 'See also http://crbug.com/579160.' % attr)
2515 raise NotImplementedError()
2516 return ThisIsNotRietveldIssue()
2517
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002518 def GetGerritObjForPresubmit(self):
2519 return presubmit_support.GerritAccessor(self._GetGerritHost())
2520
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002521 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002522 """Apply a rough heuristic to give a simple summary of an issue's review
2523 or CQ status, assuming adherence to a common workflow.
2524
2525 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002526 * 'error' - error from review tool (including deleted issues)
2527 * 'unsent' - no reviewers added
2528 * 'waiting' - waiting for review
2529 * 'reply' - waiting for uploader to reply to review
2530 * 'lgtm' - Code-Review label has been set
2531 * 'commit' - in the commit queue
2532 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002533 """
2534 if not self.GetIssue():
2535 return None
2536
2537 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002538 data = self._GetChangeDetail([
2539 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002540 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002541 return 'error'
2542
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002543 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002544 return 'closed'
2545
Aaron Gable9ab38c62017-04-06 14:36:33 -07002546 if data['labels'].get('Commit-Queue', {}).get('approved'):
2547 # The section will have an "approved" subsection if anyone has voted
2548 # the maximum value on the label.
2549 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002550
Aaron Gable9ab38c62017-04-06 14:36:33 -07002551 if data['labels'].get('Code-Review', {}).get('approved'):
2552 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002553
2554 if not data.get('reviewers', {}).get('REVIEWER', []):
2555 return 'unsent'
2556
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002557 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002558 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2559 last_message_author = messages.pop().get('author', {})
2560 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002561 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2562 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002563 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002564 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002565 if last_message_author.get('_account_id') == owner:
2566 # Most recent message was by owner.
2567 return 'waiting'
2568 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002569 # Some reply from non-owner.
2570 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002571
2572 # Somehow there are no messages even though there are reviewers.
2573 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002574
2575 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002576 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002577 return data['revisions'][data['current_revision']]['_number']
2578
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002579 def FetchDescription(self, force=False):
2580 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2581 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002582 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002583 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002584
dsansomee2d6fd92016-09-08 00:10:47 -07002585 def UpdateDescriptionRemote(self, description, force=False):
2586 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2587 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002588 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002589 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002590 'unpublished edit. Either publish the edit in the Gerrit web UI '
2591 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002592
2593 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2594 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002595 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002596 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002597
Aaron Gable636b13f2017-07-14 10:42:48 -07002598 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002599 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002600 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002601
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002602 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002603 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002604 messages = self._GetChangeDetail(
2605 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2606 file_comments = gerrit_util.GetChangeComments(
2607 self._GetGerritHost(), self.GetIssue())
2608
2609 # Build dictionary of file comments for easy access and sorting later.
2610 # {author+date: {path: {patchset: {line: url+message}}}}
2611 comments = collections.defaultdict(
2612 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2613 for path, line_comments in file_comments.iteritems():
2614 for comment in line_comments:
2615 if comment.get('tag', '').startswith('autogenerated'):
2616 continue
2617 key = (comment['author']['email'], comment['updated'])
2618 if comment.get('side', 'REVISION') == 'PARENT':
2619 patchset = 'Base'
2620 else:
2621 patchset = 'PS%d' % comment['patch_set']
2622 line = comment.get('line', 0)
2623 url = ('https://%s/c/%s/%s/%s#%s%s' %
2624 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2625 'b' if comment.get('side') == 'PARENT' else '',
2626 str(line) if line else ''))
2627 comments[key][path][patchset][line] = (url, comment['message'])
2628
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002629 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002630 for msg in messages:
2631 # Don't bother showing autogenerated messages.
2632 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2633 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002634 # Gerrit spits out nanoseconds.
2635 assert len(msg['date'].split('.')[-1]) == 9
2636 date = datetime.datetime.strptime(msg['date'][:-3],
2637 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002638 message = msg['message']
2639 key = (msg['author']['email'], msg['date'])
2640 if key in comments:
2641 message += '\n'
2642 for path, patchsets in sorted(comments.get(key, {}).items()):
2643 if readable:
2644 message += '\n%s' % path
2645 for patchset, lines in sorted(patchsets.items()):
2646 for line, (url, content) in sorted(lines.items()):
2647 if line:
2648 line_str = 'Line %d' % line
2649 path_str = '%s:%d:' % (path, line)
2650 else:
2651 line_str = 'File comment'
2652 path_str = '%s:0:' % path
2653 if readable:
2654 message += '\n %s, %s: %s' % (patchset, line_str, url)
2655 message += '\n %s\n' % content
2656 else:
2657 message += '\n%s ' % path_str
2658 message += '\n%s\n' % content
2659
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002660 summary.append(_CommentSummary(
2661 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002662 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002663 sender=msg['author']['email'],
2664 # These could be inferred from the text messages and correlated with
2665 # Code-Review label maximum, however this is not reliable.
2666 # Leaving as is until the need arises.
2667 approval=False,
2668 disapproval=False,
2669 ))
2670 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002671
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002672 def CloseIssue(self):
2673 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2674
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002675 def SubmitIssue(self, wait_for_merge=True):
2676 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2677 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002678
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002679 def _GetChangeDetail(self, options=None, issue=None,
2680 no_cache=False):
2681 """Returns details of the issue by querying Gerrit and caching results.
2682
2683 If fresh data is needed, set no_cache=True which will clear cache and
2684 thus new data will be fetched from Gerrit.
2685 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002686 options = options or []
2687 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002688 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002689
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002690 # Optimization to avoid multiple RPCs:
2691 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2692 'CURRENT_COMMIT' not in options):
2693 options.append('CURRENT_COMMIT')
2694
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002695 # Normalize issue and options for consistent keys in cache.
2696 issue = str(issue)
2697 options = [o.upper() for o in options]
2698
2699 # Check in cache first unless no_cache is True.
2700 if no_cache:
2701 self._detail_cache.pop(issue, None)
2702 else:
2703 options_set = frozenset(options)
2704 for cached_options_set, data in self._detail_cache.get(issue, []):
2705 # Assumption: data fetched before with extra options is suitable
2706 # for return for a smaller set of options.
2707 # For example, if we cached data for
2708 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2709 # and request is for options=[CURRENT_REVISION],
2710 # THEN we can return prior cached data.
2711 if options_set.issubset(cached_options_set):
2712 return data
2713
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002714 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002715 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002716 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002717 except gerrit_util.GerritError as e:
2718 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002719 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002720 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002721
2722 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002723 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002724
agable32978d92016-11-01 12:55:02 -07002725 def _GetChangeCommit(self, issue=None):
2726 issue = issue or self.GetIssue()
2727 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002728 try:
2729 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2730 except gerrit_util.GerritError as e:
2731 if e.http_status == 404:
2732 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2733 raise
agable32978d92016-11-01 12:55:02 -07002734 return data
2735
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002736 def CMDLand(self, force, bypass_hooks, verbose):
2737 if git_common.is_dirty_git_tree('land'):
2738 return 1
tandriid60367b2016-06-22 05:25:12 -07002739 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2740 if u'Commit-Queue' in detail.get('labels', {}):
2741 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002742 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2743 'which can test and land changes for you. '
2744 'Are you sure you wish to bypass it?\n',
2745 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002746
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002747 differs = True
tandriic4344b52016-08-29 06:04:54 -07002748 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002749 # Note: git diff outputs nothing if there is no diff.
2750 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002751 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002752 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002753 if detail['current_revision'] == last_upload:
2754 differs = False
2755 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002756 print('WARNING: Local branch contents differ from latest uploaded '
2757 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002758 if differs:
2759 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002760 confirm_or_exit(
2761 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2762 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002763 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002764 elif not bypass_hooks:
2765 hook_results = self.RunHook(
2766 committing=True,
2767 may_prompt=not force,
2768 verbose=verbose,
2769 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2770 if not hook_results.should_continue():
2771 return 1
2772
2773 self.SubmitIssue(wait_for_merge=True)
2774 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002775 links = self._GetChangeCommit().get('web_links', [])
2776 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002777 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002778 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002779 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002780 return 0
2781
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002782 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002783 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002784 assert not reject
2785 assert not nocommit
2786 assert not directory
2787 assert parsed_issue_arg.valid
2788
2789 self._changelist.issue = parsed_issue_arg.issue
2790
2791 if parsed_issue_arg.hostname:
2792 self._gerrit_host = parsed_issue_arg.hostname
2793 self._gerrit_server = 'https://%s' % self._gerrit_host
2794
tandriic2405f52016-10-10 08:13:15 -07002795 try:
2796 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002797 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002798 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002799
2800 if not parsed_issue_arg.patchset:
2801 # Use current revision by default.
2802 revision_info = detail['revisions'][detail['current_revision']]
2803 patchset = int(revision_info['_number'])
2804 else:
2805 patchset = parsed_issue_arg.patchset
2806 for revision_info in detail['revisions'].itervalues():
2807 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2808 break
2809 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002810 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002811 (parsed_issue_arg.patchset, self.GetIssue()))
2812
2813 fetch_info = revision_info['fetch']['http']
2814 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002815
Aaron Gable62619a32017-06-16 08:22:09 -07002816 if force:
2817 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2818 print('Checked out commit for change %i patchset %i locally' %
2819 (parsed_issue_arg.issue, patchset))
2820 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002821 RunGit(['cherry-pick', 'FETCH_HEAD'])
2822 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002823 (parsed_issue_arg.issue, patchset))
2824 print('Note: this created a local commit which does not have '
2825 'the same hash as the one uploaded for review. This will make '
2826 'uploading changes based on top of this branch difficult.\n'
2827 'If you want to do that, use "git cl patch --force" instead.')
2828
2829 self.SetIssue(parsed_issue_arg.issue)
2830 self.SetPatchset(patchset)
2831 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2832 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2833 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002834 return 0
2835
2836 @staticmethod
2837 def ParseIssueURL(parsed_url):
2838 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2839 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002840 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2841 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002842 # Short urls like https://domain/<issue_number> can be used, but don't allow
2843 # specifying the patchset (you'd 404), but we allow that here.
2844 if parsed_url.path == '/':
2845 part = parsed_url.fragment
2846 else:
2847 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002848 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002849 if match:
2850 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002851 issue=int(match.group(3)),
2852 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002853 hostname=parsed_url.netloc,
2854 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002855 return None
2856
tandrii16e0b4e2016-06-07 10:34:28 -07002857 def _GerritCommitMsgHookCheck(self, offer_removal):
2858 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2859 if not os.path.exists(hook):
2860 return
2861 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2862 # custom developer made one.
2863 data = gclient_utils.FileRead(hook)
2864 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2865 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002866 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002867 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002868 'and may interfere with it in subtle ways.\n'
2869 'We recommend you remove the commit-msg hook.')
2870 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002871 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002872 gclient_utils.rm_file_or_tree(hook)
2873 print('Gerrit commit-msg hook removed.')
2874 else:
2875 print('OK, will keep Gerrit commit-msg hook in place.')
2876
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002877 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002878 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002879 if options.squash and options.no_squash:
2880 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002881
2882 if not options.squash and not options.no_squash:
2883 # Load default for user, repo, squash=true, in this order.
2884 options.squash = settings.GetSquashGerritUploads()
2885 elif options.no_squash:
2886 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002887
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002889 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002890
Aaron Gableb56ad332017-01-06 15:24:31 -08002891 # This may be None; default fallback value is determined in logic below.
2892 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002893 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002894
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002895 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002896 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002897 if self.GetIssue():
2898 # Try to get the message from a previous upload.
2899 message = self.GetDescription()
2900 if not message:
2901 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002902 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002903 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002904 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002905 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002906 # When uploading a subsequent patchset, -m|--message is taken
2907 # as the patchset title if --title was not provided.
2908 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002909 else:
2910 default_title = RunGit(
2911 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002912 if options.force:
2913 title = default_title
2914 else:
2915 title = ask_for_data(
2916 'Title for patchset [%s]: ' % default_title) or default_title
2917 if title == default_title:
2918 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002919 change_id = self._GetChangeDetail()['change_id']
2920 while True:
2921 footer_change_ids = git_footers.get_footer_change_id(message)
2922 if footer_change_ids == [change_id]:
2923 break
2924 if not footer_change_ids:
2925 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002926 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002927 continue
2928 # There is already a valid footer but with different or several ids.
2929 # Doing this automatically is non-trivial as we don't want to lose
2930 # existing other footers, yet we want to append just 1 desired
2931 # Change-Id. Thus, just create a new footer, but let user verify the
2932 # new description.
2933 message = '%s\n\nChange-Id: %s' % (message, change_id)
2934 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002935 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002936 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002937 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002938 'Please, check the proposed correction to the description, '
2939 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2940 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2941 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002942 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002943 if not options.force:
2944 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002945 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002946 message = change_desc.description
2947 if not message:
2948 DieWithError("Description is empty. Aborting...")
2949 # Continue the while loop.
2950 # Sanity check of this code - we should end up with proper message
2951 # footer.
2952 assert [change_id] == git_footers.get_footer_change_id(message)
2953 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002954 else: # if not self.GetIssue()
2955 if options.message:
2956 message = options.message
2957 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002958 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002959 if options.title:
2960 message = options.title + '\n\n' + message
2961 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002962
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002963 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002964 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002965 # On first upload, patchset title is always this string, while
2966 # --title flag gets converted to first line of message.
2967 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002968 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002969 if not change_desc.description:
2970 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002971 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002972 if len(change_ids) > 1:
2973 DieWithError('too many Change-Id footers, at most 1 allowed.')
2974 if not change_ids:
2975 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002976 change_desc.set_description(git_footers.add_footer_change_id(
2977 change_desc.description,
2978 GenerateGerritChangeId(change_desc.description)))
2979 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002980 assert len(change_ids) == 1
2981 change_id = change_ids[0]
2982
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002983 if options.reviewers or options.tbrs or options.add_owners_to:
2984 change_desc.update_reviewers(options.reviewers, options.tbrs,
2985 options.add_owners_to, change)
2986
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002987 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002988 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2989 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002990 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2991 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002992 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002993 else:
2994 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002995 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002996 if not change_desc.description:
2997 DieWithError("Description is empty. Aborting...")
2998
2999 if not git_footers.get_footer_change_id(change_desc.description):
3000 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003001 change_desc.set_description(
3002 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003003 if options.reviewers or options.tbrs or options.add_owners_to:
3004 change_desc.update_reviewers(options.reviewers, options.tbrs,
3005 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003006 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003007 # For no-squash mode, we assume the remote called "origin" is the one we
3008 # want. It is not worthwhile to support different workflows for
3009 # no-squash mode.
3010 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003011 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3012
3013 assert change_desc
3014 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3015 ref_to_push)]).splitlines()
3016 if len(commits) > 1:
3017 print('WARNING: This will upload %d commits. Run the following command '
3018 'to see which commits will be uploaded: ' % len(commits))
3019 print('git log %s..%s' % (parent, ref_to_push))
3020 print('You can also use `git squash-branch` to squash these into a '
3021 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003022 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003023
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003024 if options.reviewers or options.tbrs or options.add_owners_to:
3025 change_desc.update_reviewers(options.reviewers, options.tbrs,
3026 options.add_owners_to, change)
3027
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003028 # Extra options that can be specified at push time. Doc:
3029 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003030 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003031
Aaron Gable844cf292017-06-28 11:32:59 -07003032 # By default, new changes are started in WIP mode, and subsequent patchsets
3033 # don't send email. At any time, passing --send-mail will mark the change
3034 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003035 if options.send_mail:
3036 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003037 refspec_opts.append('notify=ALL')
Aaron Gableafd52772017-06-27 16:40:10 -07003038 else:
Aaron Gable844cf292017-06-28 11:32:59 -07003039 if not self.GetIssue():
3040 refspec_opts.append('wip')
3041 else:
3042 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003043
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003044 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003045 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003046
Aaron Gable9b713dd2016-12-14 16:04:21 -08003047 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003048 if not re.match(r'^[\w ]+$', title):
3049 title = re.sub(r'[^\w ]', '', title)
3050 if not automatic_title:
3051 print('WARNING: Patchset title may only contain alphanumeric chars '
3052 'and spaces. You can edit it in the UI. '
3053 'See https://crbug.com/663787.\n'
3054 'Cleaned up title: %s' % title)
3055 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3056 # reverse on its side.
3057 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003058
agablec6787972016-09-09 16:13:34 -07003059 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003060 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003061
rmistry9eadede2016-09-19 11:22:43 -07003062 if options.topic:
3063 # Documentation on Gerrit topics is here:
3064 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003065 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003066
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003067 refspec_suffix = ''
3068 if refspec_opts:
3069 refspec_suffix = '%' + ','.join(refspec_opts)
3070 assert ' ' not in refspec_suffix, (
3071 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3072 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3073
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003074 try:
3075 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003076 ['git', 'push', self.GetRemoteUrl(), refspec],
3077 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003078 # Flush after every line: useful for seeing progress when running as
3079 # recipe.
3080 filter_fn=lambda _: sys.stdout.flush())
3081 except subprocess2.CalledProcessError:
3082 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003083 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003084 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003085 'credential problems:\n'
3086 ' git cl creds-check\n',
3087 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003088
3089 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003090 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003091 change_numbers = [m.group(1)
3092 for m in map(regex.match, push_stdout.splitlines())
3093 if m]
3094 if len(change_numbers) != 1:
3095 DieWithError(
3096 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003097 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003098 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003099 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003100
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003101 reviewers = sorted(change_desc.get_reviewers())
3102
tandrii88189772016-09-29 04:29:57 -07003103 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003104 if not options.private:
3105 cc = self.GetCCList().split(',')
3106 else:
3107 cc = []
tandrii88189772016-09-29 04:29:57 -07003108 if options.cc:
3109 cc.extend(options.cc)
3110 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003111 if change_desc.get_cced():
3112 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003113
3114 gerrit_util.AddReviewers(
3115 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3116 notify=bool(options.send_mail))
3117
Aaron Gablefd238082017-06-07 13:42:34 -07003118 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003119 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3120 score = 1
3121 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3122 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3123 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003124 gerrit_util.SetReview(
3125 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003126 msg='Self-approving for TBR',
3127 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003128
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003129 return 0
3130
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003131 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3132 change_desc):
3133 """Computes parent of the generated commit to be uploaded to Gerrit.
3134
3135 Returns revision or a ref name.
3136 """
3137 if custom_cl_base:
3138 # Try to avoid creating additional unintended CLs when uploading, unless
3139 # user wants to take this risk.
3140 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3141 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3142 local_ref_of_target_remote])
3143 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003144 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003145 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3146 'If you proceed with upload, more than 1 CL may be created by '
3147 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3148 'If you are certain that specified base `%s` has already been '
3149 'uploaded to Gerrit as another CL, you may proceed.\n' %
3150 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3151 if not force:
3152 confirm_or_exit(
3153 'Do you take responsibility for cleaning up potential mess '
3154 'resulting from proceeding with upload?',
3155 action='upload')
3156 return custom_cl_base
3157
Aaron Gablef97e33d2017-03-30 15:44:27 -07003158 if remote != '.':
3159 return self.GetCommonAncestorWithUpstream()
3160
3161 # If our upstream branch is local, we base our squashed commit on its
3162 # squashed version.
3163 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3164
Aaron Gablef97e33d2017-03-30 15:44:27 -07003165 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003166 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003167
3168 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003169 # TODO(tandrii): consider checking parent change in Gerrit and using its
3170 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3171 # the tree hash of the parent branch. The upside is less likely bogus
3172 # requests to reupload parent change just because it's uploadhash is
3173 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003174 parent = RunGit(['config',
3175 'branch.%s.gerritsquashhash' % upstream_branch_name],
3176 error_ok=True).strip()
3177 # Verify that the upstream branch has been uploaded too, otherwise
3178 # Gerrit will create additional CLs when uploading.
3179 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3180 RunGitSilent(['rev-parse', parent + ':'])):
3181 DieWithError(
3182 '\nUpload upstream branch %s first.\n'
3183 'It is likely that this branch has been rebased since its last '
3184 'upload, so you just need to upload it again.\n'
3185 '(If you uploaded it with --no-squash, then branch dependencies '
3186 'are not supported, and you should reupload with --squash.)'
3187 % upstream_branch_name,
3188 change_desc)
3189 return parent
3190
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003191 def _AddChangeIdToCommitMessage(self, options, args):
3192 """Re-commits using the current message, assumes the commit hook is in
3193 place.
3194 """
3195 log_desc = options.message or CreateDescriptionFromLog(args)
3196 git_command = ['commit', '--amend', '-m', log_desc]
3197 RunGit(git_command)
3198 new_log_desc = CreateDescriptionFromLog(args)
3199 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003200 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003201 return new_log_desc
3202 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003203 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003204
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003205 def SetCQState(self, new_state):
3206 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003207 vote_map = {
3208 _CQState.NONE: 0,
3209 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003210 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003211 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003212 labels = {'Commit-Queue': vote_map[new_state]}
3213 notify = False if new_state == _CQState.DRY_RUN else None
3214 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3215 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003216
tandriie113dfd2016-10-11 10:20:12 -07003217 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003218 try:
3219 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003220 except GerritChangeNotExists:
3221 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003222
3223 if data['status'] in ('ABANDONED', 'MERGED'):
3224 return 'CL %s is closed' % self.GetIssue()
3225
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003226 def GetTryJobProperties(self, patchset=None):
3227 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003228 data = self._GetChangeDetail(['ALL_REVISIONS'])
3229 patchset = int(patchset or self.GetPatchset())
3230 assert patchset
3231 revision_data = None # Pylint wants it to be defined.
3232 for revision_data in data['revisions'].itervalues():
3233 if int(revision_data['_number']) == patchset:
3234 break
3235 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003236 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003237 (patchset, self.GetIssue()))
3238 return {
3239 'patch_issue': self.GetIssue(),
3240 'patch_set': patchset or self.GetPatchset(),
3241 'patch_project': data['project'],
3242 'patch_storage': 'gerrit',
3243 'patch_ref': revision_data['fetch']['http']['ref'],
3244 'patch_repository_url': revision_data['fetch']['http']['url'],
3245 'patch_gerrit_url': self.GetCodereviewServer(),
3246 }
tandriie113dfd2016-10-11 10:20:12 -07003247
tandriide281ae2016-10-12 06:02:30 -07003248 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003249 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003250
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003251
3252_CODEREVIEW_IMPLEMENTATIONS = {
3253 'rietveld': _RietveldChangelistImpl,
3254 'gerrit': _GerritChangelistImpl,
3255}
3256
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003257
iannuccie53c9352016-08-17 14:40:40 -07003258def _add_codereview_issue_select_options(parser, extra=""):
3259 _add_codereview_select_options(parser)
3260
3261 text = ('Operate on this issue number instead of the current branch\'s '
3262 'implicit issue.')
3263 if extra:
3264 text += ' '+extra
3265 parser.add_option('-i', '--issue', type=int, help=text)
3266
3267
3268def _process_codereview_issue_select_options(parser, options):
3269 _process_codereview_select_options(parser, options)
3270 if options.issue is not None and not options.forced_codereview:
3271 parser.error('--issue must be specified with either --rietveld or --gerrit')
3272
3273
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003274def _add_codereview_select_options(parser):
3275 """Appends --gerrit and --rietveld options to force specific codereview."""
3276 parser.codereview_group = optparse.OptionGroup(
3277 parser, 'EXPERIMENTAL! Codereview override options')
3278 parser.add_option_group(parser.codereview_group)
3279 parser.codereview_group.add_option(
3280 '--gerrit', action='store_true',
3281 help='Force the use of Gerrit for codereview')
3282 parser.codereview_group.add_option(
3283 '--rietveld', action='store_true',
3284 help='Force the use of Rietveld for codereview')
3285
3286
3287def _process_codereview_select_options(parser, options):
3288 if options.gerrit and options.rietveld:
3289 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3290 options.forced_codereview = None
3291 if options.gerrit:
3292 options.forced_codereview = 'gerrit'
3293 elif options.rietveld:
3294 options.forced_codereview = 'rietveld'
3295
3296
tandriif9aefb72016-07-01 09:06:51 -07003297def _get_bug_line_values(default_project, bugs):
3298 """Given default_project and comma separated list of bugs, yields bug line
3299 values.
3300
3301 Each bug can be either:
3302 * a number, which is combined with default_project
3303 * string, which is left as is.
3304
3305 This function may produce more than one line, because bugdroid expects one
3306 project per line.
3307
3308 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3309 ['v8:123', 'chromium:789']
3310 """
3311 default_bugs = []
3312 others = []
3313 for bug in bugs.split(','):
3314 bug = bug.strip()
3315 if bug:
3316 try:
3317 default_bugs.append(int(bug))
3318 except ValueError:
3319 others.append(bug)
3320
3321 if default_bugs:
3322 default_bugs = ','.join(map(str, default_bugs))
3323 if default_project:
3324 yield '%s:%s' % (default_project, default_bugs)
3325 else:
3326 yield default_bugs
3327 for other in sorted(others):
3328 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3329 yield other
3330
3331
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003332class ChangeDescription(object):
3333 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003334 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003335 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003336 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003337 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003338
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003339 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003340 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003341
agable@chromium.org42c20792013-09-12 17:34:49 +00003342 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003343 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003344 return '\n'.join(self._description_lines)
3345
3346 def set_description(self, desc):
3347 if isinstance(desc, basestring):
3348 lines = desc.splitlines()
3349 else:
3350 lines = [line.rstrip() for line in desc]
3351 while lines and not lines[0]:
3352 lines.pop(0)
3353 while lines and not lines[-1]:
3354 lines.pop(-1)
3355 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003356
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003357 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3358 """Rewrites the R=/TBR= line(s) as a single line each.
3359
3360 Args:
3361 reviewers (list(str)) - list of additional emails to use for reviewers.
3362 tbrs (list(str)) - list of additional emails to use for TBRs.
3363 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3364 the change that are missing OWNER coverage. If this is not None, you
3365 must also pass a value for `change`.
3366 change (Change) - The Change that should be used for OWNERS lookups.
3367 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003368 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003369 assert isinstance(tbrs, list), tbrs
3370
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003371 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003372 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003373
3374 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003375 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003376
3377 reviewers = set(reviewers)
3378 tbrs = set(tbrs)
3379 LOOKUP = {
3380 'TBR': tbrs,
3381 'R': reviewers,
3382 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003383
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003384 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003385 regexp = re.compile(self.R_LINE)
3386 matches = [regexp.match(line) for line in self._description_lines]
3387 new_desc = [l for i, l in enumerate(self._description_lines)
3388 if not matches[i]]
3389 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003390
agable@chromium.org42c20792013-09-12 17:34:49 +00003391 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003392
3393 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003394 for match in matches:
3395 if not match:
3396 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003397 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3398
3399 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003400 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003401 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003402 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003403 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003404 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003405 LOOKUP[add_owners_to].update(
3406 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003407
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003408 # If any folks ended up in both groups, remove them from tbrs.
3409 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003410
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003411 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3412 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003413
3414 # Put the new lines in the description where the old first R= line was.
3415 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3416 if 0 <= line_loc < len(self._description_lines):
3417 if new_tbr_line:
3418 self._description_lines.insert(line_loc, new_tbr_line)
3419 if new_r_line:
3420 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003421 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003422 if new_r_line:
3423 self.append_footer(new_r_line)
3424 if new_tbr_line:
3425 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003426
Aaron Gable3a16ed12017-03-23 10:51:55 -07003427 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003428 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003429 self.set_description([
3430 '# Enter a description of the change.',
3431 '# This will be displayed on the codereview site.',
3432 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003433 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003434 '--------------------',
3435 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003436
agable@chromium.org42c20792013-09-12 17:34:49 +00003437 regexp = re.compile(self.BUG_LINE)
3438 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003439 prefix = settings.GetBugPrefix()
3440 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003441 if git_footer:
3442 self.append_footer('Bug: %s' % ', '.join(values))
3443 else:
3444 for value in values:
3445 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003446
agable@chromium.org42c20792013-09-12 17:34:49 +00003447 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003448 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003449 if not content:
3450 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003451 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003452
3453 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003454 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3455 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003456 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003457 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003458
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003459 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003460 """Adds a footer line to the description.
3461
3462 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3463 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3464 that Gerrit footers are always at the end.
3465 """
3466 parsed_footer_line = git_footers.parse_footer(line)
3467 if parsed_footer_line:
3468 # Line is a gerrit footer in the form: Footer-Key: any value.
3469 # Thus, must be appended observing Gerrit footer rules.
3470 self.set_description(
3471 git_footers.add_footer(self.description,
3472 key=parsed_footer_line[0],
3473 value=parsed_footer_line[1]))
3474 return
3475
3476 if not self._description_lines:
3477 self._description_lines.append(line)
3478 return
3479
3480 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3481 if gerrit_footers:
3482 # git_footers.split_footers ensures that there is an empty line before
3483 # actual (gerrit) footers, if any. We have to keep it that way.
3484 assert top_lines and top_lines[-1] == ''
3485 top_lines, separator = top_lines[:-1], top_lines[-1:]
3486 else:
3487 separator = [] # No need for separator if there are no gerrit_footers.
3488
3489 prev_line = top_lines[-1] if top_lines else ''
3490 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3491 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3492 top_lines.append('')
3493 top_lines.append(line)
3494 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003495
tandrii99a72f22016-08-17 14:33:24 -07003496 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003497 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003498 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003499 reviewers = [match.group(2).strip()
3500 for match in matches
3501 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003502 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003503
bradnelsond975b302016-10-23 12:20:23 -07003504 def get_cced(self):
3505 """Retrieves the list of reviewers."""
3506 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3507 cced = [match.group(2).strip() for match in matches if match]
3508 return cleanup_list(cced)
3509
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003510 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3511 """Updates this commit description given the parent.
3512
3513 This is essentially what Gnumbd used to do.
3514 Consult https://goo.gl/WMmpDe for more details.
3515 """
3516 assert parent_msg # No, orphan branch creation isn't supported.
3517 assert parent_hash
3518 assert dest_ref
3519 parent_footer_map = git_footers.parse_footers(parent_msg)
3520 # This will also happily parse svn-position, which GnumbD is no longer
3521 # supporting. While we'd generate correct footers, the verifier plugin
3522 # installed in Gerrit will block such commit (ie git push below will fail).
3523 parent_position = git_footers.get_position(parent_footer_map)
3524
3525 # Cherry-picks may have last line obscuring their prior footers,
3526 # from git_footers perspective. This is also what Gnumbd did.
3527 cp_line = None
3528 if (self._description_lines and
3529 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3530 cp_line = self._description_lines.pop()
3531
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003532 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003533
3534 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3535 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003536 for i, line in enumerate(footer_lines):
3537 k, v = git_footers.parse_footer(line) or (None, None)
3538 if k and k.startswith('Cr-'):
3539 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003540
3541 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003542 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003543 if parent_position[0] == dest_ref:
3544 # Same branch as parent.
3545 number = int(parent_position[1]) + 1
3546 else:
3547 number = 1 # New branch, and extra lineage.
3548 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3549 int(parent_position[1])))
3550
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003551 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3552 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003553
3554 self._description_lines = top_lines
3555 if cp_line:
3556 self._description_lines.append(cp_line)
3557 if self._description_lines[-1] != '':
3558 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003559 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003560
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003561
Aaron Gablea1bab272017-04-11 16:38:18 -07003562def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003563 """Retrieves the reviewers that approved a CL from the issue properties with
3564 messages.
3565
3566 Note that the list may contain reviewers that are not committer, thus are not
3567 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003568
3569 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003570 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003571 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003572 return sorted(
3573 set(
3574 message['sender']
3575 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003576 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003577 )
3578 )
3579
3580
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003581def FindCodereviewSettingsFile(filename='codereview.settings'):
3582 """Finds the given file starting in the cwd and going up.
3583
3584 Only looks up to the top of the repository unless an
3585 'inherit-review-settings-ok' file exists in the root of the repository.
3586 """
3587 inherit_ok_file = 'inherit-review-settings-ok'
3588 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003589 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003590 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3591 root = '/'
3592 while True:
3593 if filename in os.listdir(cwd):
3594 if os.path.isfile(os.path.join(cwd, filename)):
3595 return open(os.path.join(cwd, filename))
3596 if cwd == root:
3597 break
3598 cwd = os.path.dirname(cwd)
3599
3600
3601def LoadCodereviewSettingsFromFile(fileobj):
3602 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003603 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003604
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003605 def SetProperty(name, setting, unset_error_ok=False):
3606 fullname = 'rietveld.' + name
3607 if setting in keyvals:
3608 RunGit(['config', fullname, keyvals[setting]])
3609 else:
3610 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3611
tandrii48df5812016-10-17 03:55:37 -07003612 if not keyvals.get('GERRIT_HOST', False):
3613 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003614 # Only server setting is required. Other settings can be absent.
3615 # In that case, we ignore errors raised during option deletion attempt.
3616 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003617 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003618 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3619 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003620 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003621 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3622 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003623 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003624 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3625 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003626
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003627 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003628 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003629
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003630 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003631 RunGit(['config', 'gerrit.squash-uploads',
3632 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003633
tandrii@chromium.org28253532016-04-14 13:46:56 +00003634 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003635 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003636 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3637
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003638 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003639 # should be of the form
3640 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3641 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003642 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3643 keyvals['ORIGIN_URL_CONFIG']])
3644
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003645
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003646def urlretrieve(source, destination):
3647 """urllib is broken for SSL connections via a proxy therefore we
3648 can't use urllib.urlretrieve()."""
3649 with open(destination, 'w') as f:
3650 f.write(urllib2.urlopen(source).read())
3651
3652
ukai@chromium.org712d6102013-11-27 00:52:58 +00003653def hasSheBang(fname):
3654 """Checks fname is a #! script."""
3655 with open(fname) as f:
3656 return f.read(2).startswith('#!')
3657
3658
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003659# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3660def DownloadHooks(*args, **kwargs):
3661 pass
3662
3663
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003664def DownloadGerritHook(force):
3665 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003666
3667 Args:
3668 force: True to update hooks. False to install hooks if not present.
3669 """
3670 if not settings.GetIsGerrit():
3671 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003672 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003673 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3674 if not os.access(dst, os.X_OK):
3675 if os.path.exists(dst):
3676 if not force:
3677 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003678 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003679 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003680 if not hasSheBang(dst):
3681 DieWithError('Not a script: %s\n'
3682 'You need to download from\n%s\n'
3683 'into .git/hooks/commit-msg and '
3684 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003685 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3686 except Exception:
3687 if os.path.exists(dst):
3688 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003689 DieWithError('\nFailed to download hooks.\n'
3690 'You need to download from\n%s\n'
3691 'into .git/hooks/commit-msg and '
3692 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003693
3694
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003695def GetRietveldCodereviewSettingsInteractively():
3696 """Prompt the user for settings."""
3697 server = settings.GetDefaultServerUrl(error_ok=True)
3698 prompt = 'Rietveld server (host[:port])'
3699 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3700 newserver = ask_for_data(prompt + ':')
3701 if not server and not newserver:
3702 newserver = DEFAULT_SERVER
3703 if newserver:
3704 newserver = gclient_utils.UpgradeToHttps(newserver)
3705 if newserver != server:
3706 RunGit(['config', 'rietveld.server', newserver])
3707
3708 def SetProperty(initial, caption, name, is_url):
3709 prompt = caption
3710 if initial:
3711 prompt += ' ("x" to clear) [%s]' % initial
3712 new_val = ask_for_data(prompt + ':')
3713 if new_val == 'x':
3714 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3715 elif new_val:
3716 if is_url:
3717 new_val = gclient_utils.UpgradeToHttps(new_val)
3718 if new_val != initial:
3719 RunGit(['config', 'rietveld.' + name, new_val])
3720
3721 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3722 SetProperty(settings.GetDefaultPrivateFlag(),
3723 'Private flag (rietveld only)', 'private', False)
3724 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3725 'tree-status-url', False)
3726 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3727 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3728 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3729 'run-post-upload-hook', False)
3730
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003731
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003732class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003733 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003734
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003735 _GOOGLESOURCE = 'googlesource.com'
3736
3737 def __init__(self):
3738 # Cached list of [host, identity, source], where source is either
3739 # .gitcookies or .netrc.
3740 self._all_hosts = None
3741
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003742 def ensure_configured_gitcookies(self):
3743 """Runs checks and suggests fixes to make git use .gitcookies from default
3744 path."""
3745 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3746 configured_path = RunGitSilent(
3747 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003748 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003749 if configured_path:
3750 self._ensure_default_gitcookies_path(configured_path, default)
3751 else:
3752 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003753
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003754 @staticmethod
3755 def _ensure_default_gitcookies_path(configured_path, default_path):
3756 assert configured_path
3757 if configured_path == default_path:
3758 print('git is already configured to use your .gitcookies from %s' %
3759 configured_path)
3760 return
3761
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003762 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003763 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3764 (configured_path, default_path))
3765
3766 if not os.path.exists(configured_path):
3767 print('However, your configured .gitcookies file is missing.')
3768 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3769 action='reconfigure')
3770 RunGit(['config', '--global', 'http.cookiefile', default_path])
3771 return
3772
3773 if os.path.exists(default_path):
3774 print('WARNING: default .gitcookies file already exists %s' %
3775 default_path)
3776 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3777 default_path)
3778
3779 confirm_or_exit('Move existing .gitcookies to default location?',
3780 action='move')
3781 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003782 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003783 print('Moved and reconfigured git to use .gitcookies from %s' %
3784 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003785
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003786 @staticmethod
3787 def _configure_gitcookies_path(default_path):
3788 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3789 if os.path.exists(netrc_path):
3790 print('You seem to be using outdated .netrc for git credentials: %s' %
3791 netrc_path)
3792 print('This tool will guide you through setting up recommended '
3793 '.gitcookies store for git credentials.\n'
3794 '\n'
3795 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3796 ' git config --global --unset http.cookiefile\n'
3797 ' mv %s %s.backup\n\n' % (default_path, default_path))
3798 confirm_or_exit(action='setup .gitcookies')
3799 RunGit(['config', '--global', 'http.cookiefile', default_path])
3800 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003801
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003802 def get_hosts_with_creds(self, include_netrc=False):
3803 if self._all_hosts is None:
3804 a = gerrit_util.CookiesAuthenticator()
3805 self._all_hosts = [
3806 (h, u, s)
3807 for h, u, s in itertools.chain(
3808 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3809 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3810 )
3811 if h.endswith(self._GOOGLESOURCE)
3812 ]
3813
3814 if include_netrc:
3815 return self._all_hosts
3816 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3817
3818 def print_current_creds(self, include_netrc=False):
3819 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3820 if not hosts:
3821 print('No Git/Gerrit credentials found')
3822 return
3823 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3824 header = [('Host', 'User', 'Which file'),
3825 ['=' * l for l in lengths]]
3826 for row in (header + hosts):
3827 print('\t'.join((('%%+%ds' % l) % s)
3828 for l, s in zip(lengths, row)))
3829
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003830 @staticmethod
3831 def _parse_identity(identity):
3832 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003833 # Special case: users whose ldaps contain ".", which are generally not
3834 # distinguishable from sub-domains. But we do know typical domains:
3835 if identity.endswith('.chromium.org'):
3836 domain = 'chromium.org'
3837 username = identity[:-len('.chromium.org')]
3838 else:
3839 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003840 if username.startswith('git-'):
3841 username = username[len('git-'):]
3842 return username, domain
3843
3844 def _get_usernames_of_domain(self, domain):
3845 """Returns list of usernames referenced by .gitcookies in a given domain."""
3846 identities_by_domain = {}
3847 for _, identity, _ in self.get_hosts_with_creds():
3848 username, domain = self._parse_identity(identity)
3849 identities_by_domain.setdefault(domain, []).append(username)
3850 return identities_by_domain.get(domain)
3851
3852 def _canonical_git_googlesource_host(self, host):
3853 """Normalizes Gerrit hosts (with '-review') to Git host."""
3854 assert host.endswith(self._GOOGLESOURCE)
3855 # Prefix doesn't include '.' at the end.
3856 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3857 if prefix.endswith('-review'):
3858 prefix = prefix[:-len('-review')]
3859 return prefix + '.' + self._GOOGLESOURCE
3860
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003861 def _canonical_gerrit_googlesource_host(self, host):
3862 git_host = self._canonical_git_googlesource_host(host)
3863 prefix = git_host.split('.', 1)[0]
3864 return prefix + '-review.' + self._GOOGLESOURCE
3865
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003866 def _get_counterpart_host(self, host):
3867 assert host.endswith(self._GOOGLESOURCE)
3868 git = self._canonical_git_googlesource_host(host)
3869 gerrit = self._canonical_gerrit_googlesource_host(git)
3870 return git if gerrit == host else gerrit
3871
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003872 def has_generic_host(self):
3873 """Returns whether generic .googlesource.com has been configured.
3874
3875 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3876 """
3877 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3878 if host == '.' + self._GOOGLESOURCE:
3879 return True
3880 return False
3881
3882 def _get_git_gerrit_identity_pairs(self):
3883 """Returns map from canonic host to pair of identities (Git, Gerrit).
3884
3885 One of identities might be None, meaning not configured.
3886 """
3887 host_to_identity_pairs = {}
3888 for host, identity, _ in self.get_hosts_with_creds():
3889 canonical = self._canonical_git_googlesource_host(host)
3890 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3891 idx = 0 if canonical == host else 1
3892 pair[idx] = identity
3893 return host_to_identity_pairs
3894
3895 def get_partially_configured_hosts(self):
3896 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003897 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3898 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3899 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003900
3901 def get_conflicting_hosts(self):
3902 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003903 host
3904 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003905 if None not in (i1, i2) and i1 != i2)
3906
3907 def get_duplicated_hosts(self):
3908 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3909 return set(host for host, count in counters.iteritems() if count > 1)
3910
3911 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3912 'chromium.googlesource.com': 'chromium.org',
3913 'chrome-internal.googlesource.com': 'google.com',
3914 }
3915
3916 def get_hosts_with_wrong_identities(self):
3917 """Finds hosts which **likely** reference wrong identities.
3918
3919 Note: skips hosts which have conflicting identities for Git and Gerrit.
3920 """
3921 hosts = set()
3922 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3923 pair = self._get_git_gerrit_identity_pairs().get(host)
3924 if pair and pair[0] == pair[1]:
3925 _, domain = self._parse_identity(pair[0])
3926 if domain != expected:
3927 hosts.add(host)
3928 return hosts
3929
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003930 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003931 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003932 hosts = sorted(hosts)
3933 assert hosts
3934 if extra_column_func is None:
3935 extras = [''] * len(hosts)
3936 else:
3937 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003938 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3939 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003940 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003941 lines.append(tmpl % he)
3942 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003943
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003944 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003945 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003946 yield ('.googlesource.com wildcard record detected',
3947 ['Chrome Infrastructure team recommends to list full host names '
3948 'explicitly.'],
3949 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003950
3951 dups = self.get_duplicated_hosts()
3952 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003953 yield ('The following hosts were defined twice',
3954 self._format_hosts(dups),
3955 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003956
3957 partial = self.get_partially_configured_hosts()
3958 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003959 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3960 'These hosts are missing',
3961 self._format_hosts(partial, lambda host: 'but %s defined' %
3962 self._get_counterpart_host(host)),
3963 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003964
3965 conflicting = self.get_conflicting_hosts()
3966 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003967 yield ('The following Git hosts have differing credentials from their '
3968 'Gerrit counterparts',
3969 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3970 tuple(self._get_git_gerrit_identity_pairs()[host])),
3971 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003972
3973 wrong = self.get_hosts_with_wrong_identities()
3974 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003975 yield ('These hosts likely use wrong identity',
3976 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3977 (self._get_git_gerrit_identity_pairs()[host][0],
3978 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3979 wrong)
3980
3981 def find_and_report_problems(self):
3982 """Returns True if there was at least one problem, else False."""
3983 found = False
3984 bad_hosts = set()
3985 for title, sublines, hosts in self._find_problems():
3986 if not found:
3987 found = True
3988 print('\n\n.gitcookies problem report:\n')
3989 bad_hosts.update(hosts or [])
3990 print(' %s%s' % (title , (':' if sublines else '')))
3991 if sublines:
3992 print()
3993 print(' %s' % '\n '.join(sublines))
3994 print()
3995
3996 if bad_hosts:
3997 assert found
3998 print(' You can manually remove corresponding lines in your %s file and '
3999 'visit the following URLs with correct account to generate '
4000 'correct credential lines:\n' %
4001 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4002 print(' %s' % '\n '.join(sorted(set(
4003 gerrit_util.CookiesAuthenticator().get_new_password_url(
4004 self._canonical_git_googlesource_host(host))
4005 for host in bad_hosts
4006 ))))
4007 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004008
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004009
4010def CMDcreds_check(parser, args):
4011 """Checks credentials and suggests changes."""
4012 _, _ = parser.parse_args(args)
4013
4014 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004015 DieWithError(
4016 'This command is not designed for GCE, are you on a bot?\n'
4017 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004018
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004019 checker = _GitCookiesChecker()
4020 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004021
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004022 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004023 checker.print_current_creds(include_netrc=True)
4024
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004025 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004026 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004027 return 0
4028 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004029
4030
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004031@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004032def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004033 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004034
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004035 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004036 # TODO(tandrii): remove this once we switch to Gerrit.
4037 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004038 parser.add_option('--activate-update', action='store_true',
4039 help='activate auto-updating [rietveld] section in '
4040 '.git/config')
4041 parser.add_option('--deactivate-update', action='store_true',
4042 help='deactivate auto-updating [rietveld] section in '
4043 '.git/config')
4044 options, args = parser.parse_args(args)
4045
4046 if options.deactivate_update:
4047 RunGit(['config', 'rietveld.autoupdate', 'false'])
4048 return
4049
4050 if options.activate_update:
4051 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4052 return
4053
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004054 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004055 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004056 return 0
4057
4058 url = args[0]
4059 if not url.endswith('codereview.settings'):
4060 url = os.path.join(url, 'codereview.settings')
4061
4062 # Load code review settings and download hooks (if available).
4063 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4064 return 0
4065
4066
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004067def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004068 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004069 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4070 branch = ShortBranchName(branchref)
4071 _, args = parser.parse_args(args)
4072 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004073 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004074 return RunGit(['config', 'branch.%s.base-url' % branch],
4075 error_ok=False).strip()
4076 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004077 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004078 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4079 error_ok=False).strip()
4080
4081
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004082def color_for_status(status):
4083 """Maps a Changelist status to color, for CMDstatus and other tools."""
4084 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004085 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004086 'waiting': Fore.BLUE,
4087 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004088 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004089 'lgtm': Fore.GREEN,
4090 'commit': Fore.MAGENTA,
4091 'closed': Fore.CYAN,
4092 'error': Fore.WHITE,
4093 }.get(status, Fore.WHITE)
4094
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004095
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004096def get_cl_statuses(changes, fine_grained, max_processes=None):
4097 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004098
4099 If fine_grained is true, this will fetch CL statuses from the server.
4100 Otherwise, simply indicate if there's a matching url for the given branches.
4101
4102 If max_processes is specified, it is used as the maximum number of processes
4103 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4104 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004105
4106 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004107 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004108 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004109 upload.verbosity = 0
4110
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004111 if not changes:
4112 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004113
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004114 if not fine_grained:
4115 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004116 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004117 for cl in changes:
4118 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004119 return
4120
4121 # First, sort out authentication issues.
4122 logging.debug('ensuring credentials exist')
4123 for cl in changes:
4124 cl.EnsureAuthenticated(force=False, refresh=True)
4125
4126 def fetch(cl):
4127 try:
4128 return (cl, cl.GetStatus())
4129 except:
4130 # See http://crbug.com/629863.
4131 logging.exception('failed to fetch status for %s:', cl)
4132 raise
4133
4134 threads_count = len(changes)
4135 if max_processes:
4136 threads_count = max(1, min(threads_count, max_processes))
4137 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4138
4139 pool = ThreadPool(threads_count)
4140 fetched_cls = set()
4141 try:
4142 it = pool.imap_unordered(fetch, changes).__iter__()
4143 while True:
4144 try:
4145 cl, status = it.next(timeout=5)
4146 except multiprocessing.TimeoutError:
4147 break
4148 fetched_cls.add(cl)
4149 yield cl, status
4150 finally:
4151 pool.close()
4152
4153 # Add any branches that failed to fetch.
4154 for cl in set(changes) - fetched_cls:
4155 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004156
rmistry@google.com2dd99862015-06-22 12:22:18 +00004157
4158def upload_branch_deps(cl, args):
4159 """Uploads CLs of local branches that are dependents of the current branch.
4160
4161 If the local branch dependency tree looks like:
4162 test1 -> test2.1 -> test3.1
4163 -> test3.2
4164 -> test2.2 -> test3.3
4165
4166 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4167 run on the dependent branches in this order:
4168 test2.1, test3.1, test3.2, test2.2, test3.3
4169
4170 Note: This function does not rebase your local dependent branches. Use it when
4171 you make a change to the parent branch that will not conflict with its
4172 dependent branches, and you would like their dependencies updated in
4173 Rietveld.
4174 """
4175 if git_common.is_dirty_git_tree('upload-branch-deps'):
4176 return 1
4177
4178 root_branch = cl.GetBranch()
4179 if root_branch is None:
4180 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4181 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004182 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004183 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4184 'patchset dependencies without an uploaded CL.')
4185
4186 branches = RunGit(['for-each-ref',
4187 '--format=%(refname:short) %(upstream:short)',
4188 'refs/heads'])
4189 if not branches:
4190 print('No local branches found.')
4191 return 0
4192
4193 # Create a dictionary of all local branches to the branches that are dependent
4194 # on it.
4195 tracked_to_dependents = collections.defaultdict(list)
4196 for b in branches.splitlines():
4197 tokens = b.split()
4198 if len(tokens) == 2:
4199 branch_name, tracked = tokens
4200 tracked_to_dependents[tracked].append(branch_name)
4201
vapiera7fbd5a2016-06-16 09:17:49 -07004202 print()
4203 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004204 dependents = []
4205 def traverse_dependents_preorder(branch, padding=''):
4206 dependents_to_process = tracked_to_dependents.get(branch, [])
4207 padding += ' '
4208 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004209 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004210 dependents.append(dependent)
4211 traverse_dependents_preorder(dependent, padding)
4212 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004213 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004214
4215 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004217 return 0
4218
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004219 confirm_or_exit('This command will checkout all dependent branches and run '
4220 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004221
andybons@chromium.org962f9462016-02-03 20:00:42 +00004222 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004223 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004224 args.extend(['-t', 'Updated patchset dependency'])
4225
rmistry@google.com2dd99862015-06-22 12:22:18 +00004226 # Record all dependents that failed to upload.
4227 failures = {}
4228 # Go through all dependents, checkout the branch and upload.
4229 try:
4230 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004231 print()
4232 print('--------------------------------------')
4233 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004234 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004235 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004236 try:
4237 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004238 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004239 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004240 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004241 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004242 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004243 finally:
4244 # Swap back to the original root branch.
4245 RunGit(['checkout', '-q', root_branch])
4246
vapiera7fbd5a2016-06-16 09:17:49 -07004247 print()
4248 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004249 for dependent_branch in dependents:
4250 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004251 print(' %s : %s' % (dependent_branch, upload_status))
4252 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004253
4254 return 0
4255
4256
kmarshall3bff56b2016-06-06 18:31:47 -07004257def CMDarchive(parser, args):
4258 """Archives and deletes branches associated with closed changelists."""
4259 parser.add_option(
4260 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004261 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004262 parser.add_option(
4263 '-f', '--force', action='store_true',
4264 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004265 parser.add_option(
4266 '-d', '--dry-run', action='store_true',
4267 help='Skip the branch tagging and removal steps.')
4268 parser.add_option(
4269 '-t', '--notags', action='store_true',
4270 help='Do not tag archived branches. '
4271 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004272
4273 auth.add_auth_options(parser)
4274 options, args = parser.parse_args(args)
4275 if args:
4276 parser.error('Unsupported args: %s' % ' '.join(args))
4277 auth_config = auth.extract_auth_config_from_options(options)
4278
4279 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4280 if not branches:
4281 return 0
4282
vapiera7fbd5a2016-06-16 09:17:49 -07004283 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004284 changes = [Changelist(branchref=b, auth_config=auth_config)
4285 for b in branches.splitlines()]
4286 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4287 statuses = get_cl_statuses(changes,
4288 fine_grained=True,
4289 max_processes=options.maxjobs)
4290 proposal = [(cl.GetBranch(),
4291 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4292 for cl, status in statuses
4293 if status == 'closed']
4294 proposal.sort()
4295
4296 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004297 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004298 return 0
4299
4300 current_branch = GetCurrentBranch()
4301
vapiera7fbd5a2016-06-16 09:17:49 -07004302 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004303 if options.notags:
4304 for next_item in proposal:
4305 print(' ' + next_item[0])
4306 else:
4307 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4308 for next_item in proposal:
4309 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004310
kmarshall9249e012016-08-23 12:02:16 -07004311 # Quit now on precondition failure or if instructed by the user, either
4312 # via an interactive prompt or by command line flags.
4313 if options.dry_run:
4314 print('\nNo changes were made (dry run).\n')
4315 return 0
4316 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004317 print('You are currently on a branch \'%s\' which is associated with a '
4318 'closed codereview issue, so archive cannot proceed. Please '
4319 'checkout another branch and run this command again.' %
4320 current_branch)
4321 return 1
kmarshall9249e012016-08-23 12:02:16 -07004322 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004323 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4324 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004325 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004326 return 1
4327
4328 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004329 if not options.notags:
4330 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004331 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004332
vapiera7fbd5a2016-06-16 09:17:49 -07004333 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004334
4335 return 0
4336
4337
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004338def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004339 """Show status of changelists.
4340
4341 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004342 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004343 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004344 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004345 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004346 - Magenta in the commit queue
4347 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004348 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004349
4350 Also see 'git cl comments'.
4351 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004353 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004354 parser.add_option('-f', '--fast', action='store_true',
4355 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004356 parser.add_option(
4357 '-j', '--maxjobs', action='store', type=int,
4358 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004359
4360 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004361 _add_codereview_issue_select_options(
4362 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004363 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004364 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004365 if args:
4366 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004367 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004368
iannuccie53c9352016-08-17 14:40:40 -07004369 if options.issue is not None and not options.field:
4370 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004371
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004372 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004373 cl = Changelist(auth_config=auth_config, issue=options.issue,
4374 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004375 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004376 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004377 elif options.field == 'id':
4378 issueid = cl.GetIssue()
4379 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004380 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004381 elif options.field == 'patch':
4382 patchset = cl.GetPatchset()
4383 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004384 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004385 elif options.field == 'status':
4386 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004387 elif options.field == 'url':
4388 url = cl.GetIssueURL()
4389 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004390 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004391 return 0
4392
4393 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4394 if not branches:
4395 print('No local branch found.')
4396 return 0
4397
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004398 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004399 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004400 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004401 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004402 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004403 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004404 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004405
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004406 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004407 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4408 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4409 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004410 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004411 c, status = output.next()
4412 branch_statuses[c.GetBranch()] = status
4413 status = branch_statuses.pop(branch)
4414 url = cl.GetIssueURL()
4415 if url and (not status or status == 'error'):
4416 # The issue probably doesn't exist anymore.
4417 url += ' (broken)'
4418
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004419 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004420 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004421 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004422 color = ''
4423 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004424 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004425 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004426 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004427 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004428
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004429
4430 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004431 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004432 print('Current branch: %s' % branch)
4433 for cl in changes:
4434 if cl.GetBranch() == branch:
4435 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004436 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004437 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004438 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004439 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004440 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('Issue description:')
4442 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004443 return 0
4444
4445
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004446def colorize_CMDstatus_doc():
4447 """To be called once in main() to add colors to git cl status help."""
4448 colors = [i for i in dir(Fore) if i[0].isupper()]
4449
4450 def colorize_line(line):
4451 for color in colors:
4452 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004453 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004454 indent = len(line) - len(line.lstrip(' ')) + 1
4455 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4456 return line
4457
4458 lines = CMDstatus.__doc__.splitlines()
4459 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4460
4461
phajdan.jre328cf92016-08-22 04:12:17 -07004462def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004463 if path == '-':
4464 json.dump(contents, sys.stdout)
4465 else:
4466 with open(path, 'w') as f:
4467 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004468
4469
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004470@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004471def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004472 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004473
4474 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004475 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004476 parser.add_option('-r', '--reverse', action='store_true',
4477 help='Lookup the branch(es) for the specified issues. If '
4478 'no issues are specified, all branches with mapped '
4479 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004480 parser.add_option('--json',
4481 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004482 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004483 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004484 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004485
dnj@chromium.org406c4402015-03-03 17:22:28 +00004486 if options.reverse:
4487 branches = RunGit(['for-each-ref', 'refs/heads',
4488 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004489 # Reverse issue lookup.
4490 issue_branch_map = {}
4491 for branch in branches:
4492 cl = Changelist(branchref=branch)
4493 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4494 if not args:
4495 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004496 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004497 for issue in args:
4498 if not issue:
4499 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004500 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004501 print('Branch for issue number %s: %s' % (
4502 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004503 if options.json:
4504 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004505 return 0
4506
4507 if len(args) > 0:
4508 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4509 if not issue.valid:
4510 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4511 'or no argument to list it.\n'
4512 'Maybe you want to run git cl status?')
4513 cl = Changelist(codereview=issue.codereview)
4514 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004515 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004516 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004517 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4518 if options.json:
4519 write_json(options.json, {
4520 'issue': cl.GetIssue(),
4521 'issue_url': cl.GetIssueURL(),
4522 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004523 return 0
4524
4525
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004526def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004527 """Shows or posts review comments for any changelist."""
4528 parser.add_option('-a', '--add-comment', dest='comment',
4529 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004530 parser.add_option('-i', '--issue', dest='issue',
4531 help='review issue id (defaults to current issue). '
4532 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004533 parser.add_option('-m', '--machine-readable', dest='readable',
4534 action='store_false', default=True,
4535 help='output comments in a format compatible with '
4536 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004537 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004538 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004539 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004540 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004541 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004542 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004543 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004544
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004545 issue = None
4546 if options.issue:
4547 try:
4548 issue = int(options.issue)
4549 except ValueError:
4550 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004551 if not options.forced_codereview:
4552 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004553
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004554 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004555 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004556 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004557
4558 if options.comment:
4559 cl.AddComment(options.comment)
4560 return 0
4561
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004562 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4563 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004564 for comment in summary:
4565 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004566 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004567 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004568 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004569 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004570 color = Fore.MAGENTA
4571 else:
4572 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004573 print('\n%s%s %s%s\n%s' % (
4574 color,
4575 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4576 comment.sender,
4577 Fore.RESET,
4578 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4579
smut@google.comc85ac942015-09-15 16:34:43 +00004580 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004581 def pre_serialize(c):
4582 dct = c.__dict__.copy()
4583 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4584 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004585 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004586 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004587 return 0
4588
4589
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004590@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004591def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004592 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004593 parser.add_option('-d', '--display', action='store_true',
4594 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004595 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004596 help='New description to set for this issue (- for stdin, '
4597 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004598 parser.add_option('-f', '--force', action='store_true',
4599 help='Delete any unpublished Gerrit edits for this issue '
4600 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004601
4602 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004603 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004604 options, args = parser.parse_args(args)
4605 _process_codereview_select_options(parser, options)
4606
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004607 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004608 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004609 target_issue_arg = ParseIssueNumberArgument(args[0],
4610 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004611 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004612 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004613
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004614 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004615
martiniss6eda05f2016-06-30 10:18:35 -07004616 kwargs = {
4617 'auth_config': auth_config,
4618 'codereview': options.forced_codereview,
4619 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004620 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004621 if target_issue_arg:
4622 kwargs['issue'] = target_issue_arg.issue
4623 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004624 if target_issue_arg.codereview and not options.forced_codereview:
4625 detected_codereview_from_url = True
4626 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004627
4628 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004629 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004630 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004631 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004632
4633 if detected_codereview_from_url:
4634 logging.info('canonical issue/change URL: %s (type: %s)\n',
4635 cl.GetIssueURL(), target_issue_arg.codereview)
4636
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004637 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004638
smut@google.com34fb6b12015-07-13 20:03:26 +00004639 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004640 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004641 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004642
4643 if options.new_description:
4644 text = options.new_description
4645 if text == '-':
4646 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004647 elif text == '+':
4648 base_branch = cl.GetCommonAncestorWithUpstream()
4649 change = cl.GetChange(base_branch, None, local_description=True)
4650 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004651
4652 description.set_description(text)
4653 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004654 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004655
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004656 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004657 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004658 return 0
4659
4660
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004661def CreateDescriptionFromLog(args):
4662 """Pulls out the commit log to use as a base for the CL description."""
4663 log_args = []
4664 if len(args) == 1 and not args[0].endswith('.'):
4665 log_args = [args[0] + '..']
4666 elif len(args) == 1 and args[0].endswith('...'):
4667 log_args = [args[0][:-1]]
4668 elif len(args) == 2:
4669 log_args = [args[0] + '..' + args[1]]
4670 else:
4671 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004672 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004673
4674
thestig@chromium.org44202a22014-03-11 19:22:18 +00004675def CMDlint(parser, args):
4676 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004677 parser.add_option('--filter', action='append', metavar='-x,+y',
4678 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004679 auth.add_auth_options(parser)
4680 options, args = parser.parse_args(args)
4681 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004682
4683 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004684 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004685 try:
4686 import cpplint
4687 import cpplint_chromium
4688 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004689 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004690 return 1
4691
4692 # Change the current working directory before calling lint so that it
4693 # shows the correct base.
4694 previous_cwd = os.getcwd()
4695 os.chdir(settings.GetRoot())
4696 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004697 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004698 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4699 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004700 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004701 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004702 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004703
4704 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004705 command = args + files
4706 if options.filter:
4707 command = ['--filter=' + ','.join(options.filter)] + command
4708 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004709
4710 white_regex = re.compile(settings.GetLintRegex())
4711 black_regex = re.compile(settings.GetLintIgnoreRegex())
4712 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4713 for filename in filenames:
4714 if white_regex.match(filename):
4715 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004716 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004717 else:
4718 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4719 extra_check_functions)
4720 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004721 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004722 finally:
4723 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004724 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004725 if cpplint._cpplint_state.error_count != 0:
4726 return 1
4727 return 0
4728
4729
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004730def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004731 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004732 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004733 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004734 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004735 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004736 auth.add_auth_options(parser)
4737 options, args = parser.parse_args(args)
4738 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004739
sbc@chromium.org71437c02015-04-09 19:29:40 +00004740 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004741 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004742 return 1
4743
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004744 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004745 if args:
4746 base_branch = args[0]
4747 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004748 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004749 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004750
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004751 cl.RunHook(
4752 committing=not options.upload,
4753 may_prompt=False,
4754 verbose=options.verbose,
4755 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004756 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004757
4758
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004759def GenerateGerritChangeId(message):
4760 """Returns Ixxxxxx...xxx change id.
4761
4762 Works the same way as
4763 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4764 but can be called on demand on all platforms.
4765
4766 The basic idea is to generate git hash of a state of the tree, original commit
4767 message, author/committer info and timestamps.
4768 """
4769 lines = []
4770 tree_hash = RunGitSilent(['write-tree'])
4771 lines.append('tree %s' % tree_hash.strip())
4772 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4773 if code == 0:
4774 lines.append('parent %s' % parent.strip())
4775 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4776 lines.append('author %s' % author.strip())
4777 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4778 lines.append('committer %s' % committer.strip())
4779 lines.append('')
4780 # Note: Gerrit's commit-hook actually cleans message of some lines and
4781 # whitespace. This code is not doing this, but it clearly won't decrease
4782 # entropy.
4783 lines.append(message)
4784 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4785 stdin='\n'.join(lines))
4786 return 'I%s' % change_hash.strip()
4787
4788
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004789def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004790 """Computes the remote branch ref to use for the CL.
4791
4792 Args:
4793 remote (str): The git remote for the CL.
4794 remote_branch (str): The git remote branch for the CL.
4795 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004796 """
4797 if not (remote and remote_branch):
4798 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004799
wittman@chromium.org455dc922015-01-26 20:15:50 +00004800 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004801 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004802 # refs, which are then translated into the remote full symbolic refs
4803 # below.
4804 if '/' not in target_branch:
4805 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4806 else:
4807 prefix_replacements = (
4808 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4809 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4810 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4811 )
4812 match = None
4813 for regex, replacement in prefix_replacements:
4814 match = re.search(regex, target_branch)
4815 if match:
4816 remote_branch = target_branch.replace(match.group(0), replacement)
4817 break
4818 if not match:
4819 # This is a branch path but not one we recognize; use as-is.
4820 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004821 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4822 # Handle the refs that need to land in different refs.
4823 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004824
wittman@chromium.org455dc922015-01-26 20:15:50 +00004825 # Create the true path to the remote branch.
4826 # Does the following translation:
4827 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4828 # * refs/remotes/origin/master -> refs/heads/master
4829 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4830 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4831 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4832 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4833 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4834 'refs/heads/')
4835 elif remote_branch.startswith('refs/remotes/branch-heads'):
4836 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004837
wittman@chromium.org455dc922015-01-26 20:15:50 +00004838 return remote_branch
4839
4840
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004841def cleanup_list(l):
4842 """Fixes a list so that comma separated items are put as individual items.
4843
4844 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4845 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4846 """
4847 items = sum((i.split(',') for i in l), [])
4848 stripped_items = (i.strip() for i in items)
4849 return sorted(filter(None, stripped_items))
4850
4851
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004852@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004853def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004854 """Uploads the current changelist to codereview.
4855
4856 Can skip dependency patchset uploads for a branch by running:
4857 git config branch.branch_name.skip-deps-uploads True
4858 To unset run:
4859 git config --unset branch.branch_name.skip-deps-uploads
4860 Can also set the above globally by using the --global flag.
4861 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004862 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4863 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004864 parser.add_option('--bypass-watchlists', action='store_true',
4865 dest='bypass_watchlists',
4866 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004867 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004868 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004869 parser.add_option('--message', '-m', dest='message',
4870 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004871 parser.add_option('-b', '--bug',
4872 help='pre-populate the bug number(s) for this issue. '
4873 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004874 parser.add_option('--message-file', dest='message_file',
4875 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004876 parser.add_option('--title', '-t', dest='title',
4877 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004878 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004879 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004880 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004881 parser.add_option('--tbrs',
4882 action='append', default=[],
4883 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004884 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004885 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004886 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004887 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004888 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004889 parser.add_option('--emulate_svn_auto_props',
4890 '--emulate-svn-auto-props',
4891 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004892 dest="emulate_svn_auto_props",
4893 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004894 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004895 help='tell the commit queue to commit this patchset; '
4896 'implies --send-mail')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004897 parser.add_option('--private', action='store_true',
4898 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004899 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004900 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004901 metavar='TARGET',
4902 help='Apply CL to remote ref TARGET. ' +
4903 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004904 parser.add_option('--squash', action='store_true',
4905 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004906 parser.add_option('--no-squash', action='store_true',
4907 help='Don\'t squash multiple commits into one ' +
4908 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004909 parser.add_option('--topic', default=None,
4910 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004911 parser.add_option('--email', default=None,
4912 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004913 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4914 const='TBR', help='add a set of OWNERS to TBR')
4915 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4916 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004917 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4918 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004919 help='Send the patchset to do a CQ dry run right after '
4920 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004921 parser.add_option('--dependencies', action='store_true',
4922 help='Uploads CLs of all the local branches that depend on '
4923 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004924
rmistry@google.com2dd99862015-06-22 12:22:18 +00004925 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004926 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004927 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004928 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004929 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004930 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004931 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004932
sbc@chromium.org71437c02015-04-09 19:29:40 +00004933 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004934 return 1
4935
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004936 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004937 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004938 options.cc = cleanup_list(options.cc)
4939
tandriib80458a2016-06-23 12:20:07 -07004940 if options.message_file:
4941 if options.message:
4942 parser.error('only one of --message and --message-file allowed.')
4943 options.message = gclient_utils.FileRead(options.message_file)
4944 options.message_file = None
4945
tandrii4d0545a2016-07-06 03:56:49 -07004946 if options.cq_dry_run and options.use_commit_queue:
4947 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4948
Aaron Gableedbc4132017-09-11 13:22:28 -07004949 if options.use_commit_queue:
4950 options.send_mail = True
4951
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004952 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4953 settings.GetIsGerrit()
4954
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004955 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004956 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004957
4958
Francois Dorayd42c6812017-05-30 15:10:20 -04004959@subcommand.usage('--description=<description file>')
4960def CMDsplit(parser, args):
4961 """Splits a branch into smaller branches and uploads CLs.
4962
4963 Creates a branch and uploads a CL for each group of files modified in the
4964 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004965 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004966 the shared OWNERS file.
4967 """
4968 parser.add_option("-d", "--description", dest="description_file",
4969 help="A text file containing a CL description. ")
4970 parser.add_option("-c", "--comment", dest="comment_file",
4971 help="A text file containing a CL comment.")
4972 options, _ = parser.parse_args(args)
4973
4974 if not options.description_file:
4975 parser.error('No --description flag specified.')
4976
4977 def WrappedCMDupload(args):
4978 return CMDupload(OptionParser(), args)
4979
4980 return split_cl.SplitCl(options.description_file, options.comment_file,
4981 Changelist, WrappedCMDupload)
4982
4983
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004984@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004985def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004986 """DEPRECATED: Used to commit the current changelist via git-svn."""
4987 message = ('git-cl no longer supports committing to SVN repositories via '
4988 'git-svn. You probably want to use `git cl land` instead.')
4989 print(message)
4990 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004991
4992
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004993# Two special branches used by git cl land.
4994MERGE_BRANCH = 'git-cl-commit'
4995CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4996
4997
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004998@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004999def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005000 """Commits the current changelist via git.
5001
5002 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5003 upstream and closes the issue automatically and atomically.
5004
5005 Otherwise (in case of Rietveld):
5006 Squashes branch into a single commit.
5007 Updates commit message with metadata (e.g. pointer to review).
5008 Pushes the code upstream.
5009 Updates review and closes.
5010 """
5011 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5012 help='bypass upload presubmit hook')
5013 parser.add_option('-m', dest='message',
5014 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005015 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005016 help="force yes to questions (don't prompt)")
5017 parser.add_option('-c', dest='contributor',
5018 help="external contributor for patch (appended to " +
5019 "description and used as author for git). Should be " +
5020 "formatted as 'First Last <email@example.com>'")
5021 add_git_similarity(parser)
5022 auth.add_auth_options(parser)
5023 (options, args) = parser.parse_args(args)
5024 auth_config = auth.extract_auth_config_from_options(options)
5025
5026 cl = Changelist(auth_config=auth_config)
5027
5028 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5029 if cl.IsGerrit():
5030 if options.message:
5031 # This could be implemented, but it requires sending a new patch to
5032 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5033 # Besides, Gerrit has the ability to change the commit message on submit
5034 # automatically, thus there is no need to support this option (so far?).
5035 parser.error('-m MESSAGE option is not supported for Gerrit.')
5036 if options.contributor:
5037 parser.error(
5038 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5039 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5040 'the contributor\'s "name <email>". If you can\'t upload such a '
5041 'commit for review, contact your repository admin and request'
5042 '"Forge-Author" permission.')
5043 if not cl.GetIssue():
5044 DieWithError('You must upload the change first to Gerrit.\n'
5045 ' If you would rather have `git cl land` upload '
5046 'automatically for you, see http://crbug.com/642759')
5047 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5048 options.verbose)
5049
5050 current = cl.GetBranch()
5051 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5052 if remote == '.':
5053 print()
5054 print('Attempting to push branch %r into another local branch!' % current)
5055 print()
5056 print('Either reparent this branch on top of origin/master:')
5057 print(' git reparent-branch --root')
5058 print()
5059 print('OR run `git rebase-update` if you think the parent branch is ')
5060 print('already committed.')
5061 print()
5062 print(' Current parent: %r' % upstream_branch)
5063 return 1
5064
5065 if not args:
5066 # Default to merging against our best guess of the upstream branch.
5067 args = [cl.GetUpstreamBranch()]
5068
5069 if options.contributor:
5070 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005071 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005072 return 1
5073
5074 base_branch = args[0]
5075
5076 if git_common.is_dirty_git_tree('land'):
5077 return 1
5078
5079 # This rev-list syntax means "show all commits not in my branch that
5080 # are in base_branch".
5081 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5082 base_branch]).splitlines()
5083 if upstream_commits:
5084 print('Base branch "%s" has %d commits '
5085 'not in this branch.' % (base_branch, len(upstream_commits)))
5086 print('Run "git merge %s" before attempting to land.' % base_branch)
5087 return 1
5088
5089 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5090 if not options.bypass_hooks:
5091 author = None
5092 if options.contributor:
5093 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5094 hook_results = cl.RunHook(
5095 committing=True,
5096 may_prompt=not options.force,
5097 verbose=options.verbose,
5098 change=cl.GetChange(merge_base, author))
5099 if not hook_results.should_continue():
5100 return 1
5101
5102 # Check the tree status if the tree status URL is set.
5103 status = GetTreeStatus()
5104 if 'closed' == status:
5105 print('The tree is closed. Please wait for it to reopen. Use '
5106 '"git cl land --bypass-hooks" to commit on a closed tree.')
5107 return 1
5108 elif 'unknown' == status:
5109 print('Unable to determine tree status. Please verify manually and '
5110 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5111 return 1
5112
5113 change_desc = ChangeDescription(options.message)
5114 if not change_desc.description and cl.GetIssue():
5115 change_desc = ChangeDescription(cl.GetDescription())
5116
5117 if not change_desc.description:
5118 if not cl.GetIssue() and options.bypass_hooks:
5119 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5120 else:
5121 print('No description set.')
5122 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5123 return 1
5124
5125 # Keep a separate copy for the commit message, because the commit message
5126 # contains the link to the Rietveld issue, while the Rietveld message contains
5127 # the commit viewvc url.
5128 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005129 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005130 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005131
5132 commit_desc = ChangeDescription(change_desc.description)
5133 if cl.GetIssue():
5134 # Xcode won't linkify this URL unless there is a non-whitespace character
5135 # after it. Add a period on a new line to circumvent this. Also add a space
5136 # before the period to make sure that Gitiles continues to correctly resolve
5137 # the URL.
5138 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5139 if options.contributor:
5140 commit_desc.append_footer('Patch from %s.' % options.contributor)
5141
5142 print('Description:')
5143 print(commit_desc.description)
5144
5145 branches = [merge_base, cl.GetBranchRef()]
5146 if not options.force:
5147 print_stats(options.similarity, options.find_copies, branches)
5148
5149 # We want to squash all this branch's commits into one commit with the proper
5150 # description. We do this by doing a "reset --soft" to the base branch (which
5151 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005152 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005153 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5154 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5155 result = RunGitWithCode(showref_cmd)
5156 if result[0] == 0:
5157 RunGit(['branch', '-D', branch])
5158
5159 # We might be in a directory that's present in this branch but not in the
5160 # trunk. Move up to the top of the tree so that git commands that expect a
5161 # valid CWD won't fail after we check out the merge branch.
5162 rel_base_path = settings.GetRelativeRoot()
5163 if rel_base_path:
5164 os.chdir(rel_base_path)
5165
5166 # Stuff our change into the merge branch.
5167 # We wrap in a try...finally block so if anything goes wrong,
5168 # we clean up the branches.
5169 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005170 revision = None
5171 try:
5172 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5173 RunGit(['reset', '--soft', merge_base])
5174 if options.contributor:
5175 RunGit(
5176 [
5177 'commit', '--author', options.contributor,
5178 '-m', commit_desc.description,
5179 ])
5180 else:
5181 RunGit(['commit', '-m', commit_desc.description])
5182
5183 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5184 mirror = settings.GetGitMirror(remote)
5185 if mirror:
5186 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005187 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005188 else:
5189 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005190 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005191 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5192
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005193 retcode = PushToGitWithAutoRebase(
5194 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005195 if retcode == 0:
5196 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005197 if git_numberer_enabled:
5198 change_desc = ChangeDescription(
5199 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005200 except: # pylint: disable=bare-except
5201 if _IS_BEING_TESTED:
5202 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5203 + '-' * 30 + '8<' + '-' * 30)
5204 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5205 raise
5206 finally:
5207 # And then swap back to the original branch and clean up.
5208 RunGit(['checkout', '-q', cl.GetBranch()])
5209 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005210 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005211
5212 if not revision:
5213 print('Failed to push. If this persists, please file a bug.')
5214 return 1
5215
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005216 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005217 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005218 if viewvc_url and revision:
5219 change_desc.append_footer(
5220 'Committed: %s%s' % (viewvc_url, revision))
5221 elif revision:
5222 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005223 print('Closing issue '
5224 '(you may be prompted for your codereview password)...')
5225 cl.UpdateDescription(change_desc.description)
5226 cl.CloseIssue()
5227 props = cl.GetIssueProperties()
5228 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005229 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5230 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005231 if options.bypass_hooks:
5232 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5233 else:
5234 comment += ' (presubmit successful).'
5235 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5236
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005237 if os.path.isfile(POSTUPSTREAM_HOOK):
5238 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5239
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005240 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005241
5242
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005243def PushToGitWithAutoRebase(remote, branch, original_description,
5244 git_numberer_enabled, max_attempts=3):
5245 """Pushes current HEAD commit on top of remote's branch.
5246
5247 Attempts to fetch and autorebase on push failures.
5248 Adds git number footers on the fly.
5249
5250 Returns integer code from last command.
5251 """
5252 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5253 code = 0
5254 attempts_left = max_attempts
5255 while attempts_left:
5256 attempts_left -= 1
5257 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5258
5259 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5260 # If fetch fails, retry.
5261 print('Fetching %s/%s...' % (remote, branch))
5262 code, out = RunGitWithCode(
5263 ['retry', 'fetch', remote,
5264 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5265 if code:
5266 print('Fetch failed with exit code %d.' % code)
5267 print(out.strip())
5268 continue
5269
5270 print('Cherry-picking commit on top of latest %s' % branch)
5271 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5272 suppress_stderr=True)
5273 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5274 code, out = RunGitWithCode(['cherry-pick', cherry])
5275 if code:
5276 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5277 'the following files have merge conflicts:' %
5278 (branch, parent_hash))
5279 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5280 print('Please rebase your patch and try again.')
5281 RunGitWithCode(['cherry-pick', '--abort'])
5282 break
5283
5284 commit_desc = ChangeDescription(original_description)
5285 if git_numberer_enabled:
5286 logging.debug('Adding git number footers')
5287 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5288 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5289 branch)
5290 # Ensure timestamps are monotonically increasing.
5291 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5292 _get_committer_timestamp('HEAD'))
5293 _git_amend_head(commit_desc.description, timestamp)
5294
5295 code, out = RunGitWithCode(
5296 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5297 print(out)
5298 if code == 0:
5299 break
5300 if IsFatalPushFailure(out):
5301 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005302 'user.email are correct and you have push access to the repo.\n'
5303 'Hint: run command below to diangose common Git/Gerrit credential '
5304 'problems:\n'
5305 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005306 break
5307 return code
5308
5309
5310def IsFatalPushFailure(push_stdout):
5311 """True if retrying push won't help."""
5312 return '(prohibited by Gerrit)' in push_stdout
5313
5314
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005315@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005316def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005317 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005318 parser.add_option('-b', dest='newbranch',
5319 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005320 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005321 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005322 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005323 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005324 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005325 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005326 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005327 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005328 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005329 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005330
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005331
5332 group = optparse.OptionGroup(
5333 parser,
5334 'Options for continuing work on the current issue uploaded from a '
5335 'different clone (e.g. different machine). Must be used independently '
5336 'from the other options. No issue number should be specified, and the '
5337 'branch must have an issue number associated with it')
5338 group.add_option('--reapply', action='store_true', dest='reapply',
5339 help='Reset the branch and reapply the issue.\n'
5340 'CAUTION: This will undo any local changes in this '
5341 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005342
5343 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005344 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005345 parser.add_option_group(group)
5346
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005347 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005348 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005349 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005350 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005351 auth_config = auth.extract_auth_config_from_options(options)
5352
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005353 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005354 if options.newbranch:
5355 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005356 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005357 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005358
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005359 cl = Changelist(auth_config=auth_config,
5360 codereview=options.forced_codereview)
5361 if not cl.GetIssue():
5362 parser.error('current branch must have an associated issue')
5363
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005364 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005365 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005366 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005367
5368 RunGit(['reset', '--hard', upstream])
5369 if options.pull:
5370 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005371
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005372 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5373 options.directory)
5374
5375 if len(args) != 1 or not args[0]:
5376 parser.error('Must specify issue number or url')
5377
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005378 target_issue_arg = ParseIssueNumberArgument(args[0],
5379 options.forced_codereview)
5380 if not target_issue_arg.valid:
5381 parser.error('invalid codereview url or CL id')
5382
5383 cl_kwargs = {
5384 'auth_config': auth_config,
5385 'codereview_host': target_issue_arg.hostname,
5386 'codereview': options.forced_codereview,
5387 }
5388 detected_codereview_from_url = False
5389 if target_issue_arg.codereview and not options.forced_codereview:
5390 detected_codereview_from_url = True
5391 cl_kwargs['codereview'] = target_issue_arg.codereview
5392 cl_kwargs['issue'] = target_issue_arg.issue
5393
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005394 # We don't want uncommitted changes mixed up with the patch.
5395 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005396 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005397
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005398 if options.newbranch:
5399 if options.force:
5400 RunGit(['branch', '-D', options.newbranch],
5401 stderr=subprocess2.PIPE, error_ok=True)
5402 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005403 elif not GetCurrentBranch():
5404 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005405
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005406 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005407
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005408 if cl.IsGerrit():
5409 if options.reject:
5410 parser.error('--reject is not supported with Gerrit codereview.')
5411 if options.nocommit:
5412 parser.error('--nocommit is not supported with Gerrit codereview.')
5413 if options.directory:
5414 parser.error('--directory is not supported with Gerrit codereview.')
5415
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005416 if detected_codereview_from_url:
5417 print('canonical issue/change URL: %s (type: %s)\n' %
5418 (cl.GetIssueURL(), target_issue_arg.codereview))
5419
5420 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005421 options.nocommit, options.directory,
5422 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005423
5424
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005425def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005426 """Fetches the tree status and returns either 'open', 'closed',
5427 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005428 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005429 if url:
5430 status = urllib2.urlopen(url).read().lower()
5431 if status.find('closed') != -1 or status == '0':
5432 return 'closed'
5433 elif status.find('open') != -1 or status == '1':
5434 return 'open'
5435 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005436 return 'unset'
5437
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005438
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005439def GetTreeStatusReason():
5440 """Fetches the tree status from a json url and returns the message
5441 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005442 url = settings.GetTreeStatusUrl()
5443 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005444 connection = urllib2.urlopen(json_url)
5445 status = json.loads(connection.read())
5446 connection.close()
5447 return status['message']
5448
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005449
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005450def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005451 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005452 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005453 status = GetTreeStatus()
5454 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005455 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005456 return 2
5457
vapiera7fbd5a2016-06-16 09:17:49 -07005458 print('The tree is %s' % status)
5459 print()
5460 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005461 if status != 'open':
5462 return 1
5463 return 0
5464
5465
maruel@chromium.org15192402012-09-06 12:38:29 +00005466def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005467 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005468 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005469 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005470 '-b', '--bot', action='append',
5471 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5472 'times to specify multiple builders. ex: '
5473 '"-b win_rel -b win_layout". See '
5474 'the try server waterfall for the builders name and the tests '
5475 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005476 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005477 '-B', '--bucket', default='',
5478 help=('Buildbucket bucket to send the try requests.'))
5479 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005480 '-m', '--master', default='',
5481 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005482 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005483 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005484 help='Revision to use for the try job; default: the revision will '
5485 'be determined by the try recipe that builder runs, which usually '
5486 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005487 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005488 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005489 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005490 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005491 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005492 '--project',
5493 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005494 'in recipe to determine to which repository or directory to '
5495 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005496 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005497 '-p', '--property', dest='properties', action='append', default=[],
5498 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005499 'key2=value2 etc. The value will be treated as '
5500 'json if decodable, or as string otherwise. '
5501 'NOTE: using this may make your try job not usable for CQ, '
5502 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005503 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005504 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5505 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005506 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005507 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005508 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005509 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005510
machenbach@chromium.org45453142015-09-15 08:45:22 +00005511 # Make sure that all properties are prop=value pairs.
5512 bad_params = [x for x in options.properties if '=' not in x]
5513 if bad_params:
5514 parser.error('Got properties with missing "=": %s' % bad_params)
5515
maruel@chromium.org15192402012-09-06 12:38:29 +00005516 if args:
5517 parser.error('Unknown arguments: %s' % args)
5518
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005519 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005520 if not cl.GetIssue():
5521 parser.error('Need to upload first')
5522
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005523 if cl.IsGerrit():
5524 # HACK: warm up Gerrit change detail cache to save on RPCs.
5525 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5526
tandriie113dfd2016-10-11 10:20:12 -07005527 error_message = cl.CannotTriggerTryJobReason()
5528 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005529 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005530
borenet6c0efe62016-10-19 08:13:29 -07005531 if options.bucket and options.master:
5532 parser.error('Only one of --bucket and --master may be used.')
5533
qyearsley1fdfcb62016-10-24 13:22:03 -07005534 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005535
qyearsleydd49f942016-10-28 11:57:22 -07005536 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5537 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005538 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005539 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005540 print('git cl try with no bots now defaults to CQ dry run.')
5541 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5542 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005543
borenet6c0efe62016-10-19 08:13:29 -07005544 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005545 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005546 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005547 'of bot requires an initial job from a parent (usually a builder). '
5548 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005549 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005550 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005551
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005552 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005553 # TODO(tandrii): Checking local patchset against remote patchset is only
5554 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5555 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005556 print('Warning: Codereview server has newer patchsets (%s) than most '
5557 'recent upload from local checkout (%s). Did a previous upload '
5558 'fail?\n'
5559 'By default, git cl try uses the latest patchset from '
5560 'codereview, continuing to use patchset %s.\n' %
5561 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005562
tandrii568043b2016-10-11 07:49:18 -07005563 try:
borenet6c0efe62016-10-19 08:13:29 -07005564 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5565 patchset)
tandrii568043b2016-10-11 07:49:18 -07005566 except BuildbucketResponseException as ex:
5567 print('ERROR: %s' % ex)
5568 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005569 return 0
5570
5571
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005572def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005573 """Prints info about try jobs associated with current CL."""
5574 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005575 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005576 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005577 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005578 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005579 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005580 '--color', action='store_true', default=setup_color.IS_TTY,
5581 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005582 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005583 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5584 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005585 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005586 '--json', help=('Path of JSON output file to write try job results to,'
5587 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005588 parser.add_option_group(group)
5589 auth.add_auth_options(parser)
5590 options, args = parser.parse_args(args)
5591 if args:
5592 parser.error('Unrecognized args: %s' % ' '.join(args))
5593
5594 auth_config = auth.extract_auth_config_from_options(options)
5595 cl = Changelist(auth_config=auth_config)
5596 if not cl.GetIssue():
5597 parser.error('Need to upload first')
5598
tandrii221ab252016-10-06 08:12:04 -07005599 patchset = options.patchset
5600 if not patchset:
5601 patchset = cl.GetMostRecentPatchset()
5602 if not patchset:
5603 parser.error('Codereview doesn\'t know about issue %s. '
5604 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005605 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005606 cl.GetIssue())
5607
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005608 # TODO(tandrii): Checking local patchset against remote patchset is only
5609 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5610 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005611 print('Warning: Codereview server has newer patchsets (%s) than most '
5612 'recent upload from local checkout (%s). Did a previous upload '
5613 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005614 'By default, git cl try-results uses the latest patchset from '
5615 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005616 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005617 try:
tandrii221ab252016-10-06 08:12:04 -07005618 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005619 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005620 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005621 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005622 if options.json:
5623 write_try_results_json(options.json, jobs)
5624 else:
5625 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005626 return 0
5627
5628
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005629@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005630def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005631 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005632 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005633 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005634 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005635
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005636 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005637 if args:
5638 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005639 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005640 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005641 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005642 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005643
5644 # Clear configured merge-base, if there is one.
5645 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005646 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005647 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005648 return 0
5649
5650
thestig@chromium.org00858c82013-12-02 23:08:03 +00005651def CMDweb(parser, args):
5652 """Opens the current CL in the web browser."""
5653 _, args = parser.parse_args(args)
5654 if args:
5655 parser.error('Unrecognized args: %s' % ' '.join(args))
5656
5657 issue_url = Changelist().GetIssueURL()
5658 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005659 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005660 return 1
5661
5662 webbrowser.open(issue_url)
5663 return 0
5664
5665
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005666def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005667 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005668 parser.add_option('-d', '--dry-run', action='store_true',
5669 help='trigger in dry run mode')
5670 parser.add_option('-c', '--clear', action='store_true',
5671 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005672 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005673 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005674 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005675 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005676 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005677 if args:
5678 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005679 if options.dry_run and options.clear:
5680 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5681
iannuccie53c9352016-08-17 14:40:40 -07005682 cl = Changelist(auth_config=auth_config, issue=options.issue,
5683 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005684 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005685 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005686 elif options.dry_run:
5687 state = _CQState.DRY_RUN
5688 else:
5689 state = _CQState.COMMIT
5690 if not cl.GetIssue():
5691 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005692 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005693 return 0
5694
5695
groby@chromium.org411034a2013-02-26 15:12:01 +00005696def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005697 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005698 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005699 auth.add_auth_options(parser)
5700 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005701 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005702 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005703 if args:
5704 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005705 cl = Changelist(auth_config=auth_config, issue=options.issue,
5706 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005707 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005708 if not cl.GetIssue():
5709 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005710 cl.CloseIssue()
5711 return 0
5712
5713
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005714def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005715 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005716 parser.add_option(
5717 '--stat',
5718 action='store_true',
5719 dest='stat',
5720 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005721 auth.add_auth_options(parser)
5722 options, args = parser.parse_args(args)
5723 auth_config = auth.extract_auth_config_from_options(options)
5724 if args:
5725 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005726
5727 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005728 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005729 # Staged changes would be committed along with the patch from last
5730 # upload, hence counted toward the "last upload" side in the final
5731 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005732 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005733 return 1
5734
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005735 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005736 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005737 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005738 if not issue:
5739 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005740 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005741 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005742
5743 # Create a new branch based on the merge-base
5744 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005745 # Clear cached branch in cl object, to avoid overwriting original CL branch
5746 # properties.
5747 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005748 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005749 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005750 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005751 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005752 return rtn
5753
wychen@chromium.org06928532015-02-03 02:11:29 +00005754 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005755 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005756 cmd = ['git', 'diff']
5757 if options.stat:
5758 cmd.append('--stat')
5759 cmd.extend([TMP_BRANCH, branch, '--'])
5760 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005761 finally:
5762 RunGit(['checkout', '-q', branch])
5763 RunGit(['branch', '-D', TMP_BRANCH])
5764
5765 return 0
5766
5767
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005768def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005769 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005770 parser.add_option(
5771 '--no-color',
5772 action='store_true',
5773 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005774 parser.add_option(
5775 '--batch',
5776 action='store_true',
5777 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005778 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005779 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005780 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005781
5782 author = RunGit(['config', 'user.email']).strip() or None
5783
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005784 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005785
5786 if args:
5787 if len(args) > 1:
5788 parser.error('Unknown args')
5789 base_branch = args[0]
5790 else:
5791 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005792 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005793
5794 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005795 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5796
5797 if options.batch:
5798 db = owners.Database(change.RepositoryRoot(), file, os.path)
5799 print('\n'.join(db.reviewers_for(affected_files, author)))
5800 return 0
5801
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005802 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005803 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005804 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005805 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005806 disable_color=options.no_color,
5807 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005808
5809
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005810def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005811 """Generates a diff command."""
5812 # Generate diff for the current branch's changes.
5813 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005814 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005815
5816 if args:
5817 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005818 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005819 diff_cmd.append(arg)
5820 else:
5821 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005822
5823 return diff_cmd
5824
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005825
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005826def MatchingFileType(file_name, extensions):
5827 """Returns true if the file name ends with one of the given extensions."""
5828 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005829
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005830
enne@chromium.org555cfe42014-01-29 18:21:39 +00005831@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005832def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005833 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005834 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005835 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005836 parser.add_option('--full', action='store_true',
5837 help='Reformat the full content of all touched files')
5838 parser.add_option('--dry-run', action='store_true',
5839 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005840 parser.add_option('--python', action='store_true',
5841 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005842 parser.add_option('--js', action='store_true',
5843 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005844 parser.add_option('--diff', action='store_true',
5845 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005846 parser.add_option('--presubmit', action='store_true',
5847 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005848 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005849
Daniel Chengc55eecf2016-12-30 03:11:02 -08005850 # Normalize any remaining args against the current path, so paths relative to
5851 # the current directory are still resolved as expected.
5852 args = [os.path.join(os.getcwd(), arg) for arg in args]
5853
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005854 # git diff generates paths against the root of the repository. Change
5855 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005856 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005857 if rel_base_path:
5858 os.chdir(rel_base_path)
5859
digit@chromium.org29e47272013-05-17 17:01:46 +00005860 # Grab the merge-base commit, i.e. the upstream commit of the current
5861 # branch when it was created or the last time it was rebased. This is
5862 # to cover the case where the user may have called "git fetch origin",
5863 # moving the origin branch to a newer commit, but hasn't rebased yet.
5864 upstream_commit = None
5865 cl = Changelist()
5866 upstream_branch = cl.GetUpstreamBranch()
5867 if upstream_branch:
5868 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5869 upstream_commit = upstream_commit.strip()
5870
5871 if not upstream_commit:
5872 DieWithError('Could not find base commit for this branch. '
5873 'Are you in detached state?')
5874
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005875 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5876 diff_output = RunGit(changed_files_cmd)
5877 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005878 # Filter out files deleted by this CL
5879 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005880
Christopher Lamc5ba6922017-01-24 11:19:14 +11005881 if opts.js:
5882 CLANG_EXTS.append('.js')
5883
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005884 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5885 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5886 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005887 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005888
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005889 top_dir = os.path.normpath(
5890 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5891
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005892 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5893 # formatted. This is used to block during the presubmit.
5894 return_value = 0
5895
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005896 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005897 # Locate the clang-format binary in the checkout
5898 try:
5899 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005900 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005901 DieWithError(e)
5902
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005903 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005904 cmd = [clang_format_tool]
5905 if not opts.dry_run and not opts.diff:
5906 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005907 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005908 if opts.diff:
5909 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005910 else:
5911 env = os.environ.copy()
5912 env['PATH'] = str(os.path.dirname(clang_format_tool))
5913 try:
5914 script = clang_format.FindClangFormatScriptInChromiumTree(
5915 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005916 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005917 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005918
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005919 cmd = [sys.executable, script, '-p0']
5920 if not opts.dry_run and not opts.diff:
5921 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005922
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005923 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5924 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005925
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005926 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5927 if opts.diff:
5928 sys.stdout.write(stdout)
5929 if opts.dry_run and len(stdout) > 0:
5930 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005931
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005932 # Similar code to above, but using yapf on .py files rather than clang-format
5933 # on C/C++ files
5934 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005935 yapf_tool = gclient_utils.FindExecutable('yapf')
5936 if yapf_tool is None:
5937 DieWithError('yapf not found in PATH')
5938
5939 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005940 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005941 cmd = [yapf_tool]
5942 if not opts.dry_run and not opts.diff:
5943 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005944 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005945 if opts.diff:
5946 sys.stdout.write(stdout)
5947 else:
5948 # TODO(sbc): yapf --lines mode still has some issues.
5949 # https://github.com/google/yapf/issues/154
5950 DieWithError('--python currently only works with --full')
5951
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005952 # Dart's formatter does not have the nice property of only operating on
5953 # modified chunks, so hard code full.
5954 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005955 try:
5956 command = [dart_format.FindDartFmtToolInChromiumTree()]
5957 if not opts.dry_run and not opts.diff:
5958 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005959 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005960
ppi@chromium.org6593d932016-03-03 15:41:15 +00005961 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005962 if opts.dry_run and stdout:
5963 return_value = 2
5964 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005965 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5966 'found in this checkout. Files in other languages are still '
5967 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005968
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005969 # Format GN build files. Always run on full build files for canonical form.
5970 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005971 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005972 if opts.dry_run or opts.diff:
5973 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005974 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005975 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5976 shell=sys.platform == 'win32',
5977 cwd=top_dir)
5978 if opts.dry_run and gn_ret == 2:
5979 return_value = 2 # Not formatted.
5980 elif opts.diff and gn_ret == 2:
5981 # TODO this should compute and print the actual diff.
5982 print("This change has GN build file diff for " + gn_diff_file)
5983 elif gn_ret != 0:
5984 # For non-dry run cases (and non-2 return values for dry-run), a
5985 # nonzero error code indicates a failure, probably because the file
5986 # doesn't parse.
5987 DieWithError("gn format failed on " + gn_diff_file +
5988 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005989
Ilya Shermane081cbe2017-08-15 17:51:04 -07005990 # Skip the metrics formatting from the global presubmit hook. These files have
5991 # a separate presubmit hook that issues an error if the files need formatting,
5992 # whereas the top-level presubmit script merely issues a warning. Formatting
5993 # these files is somewhat slow, so it's important not to duplicate the work.
5994 if not opts.presubmit:
5995 for xml_dir in GetDirtyMetricsDirs(diff_files):
5996 tool_dir = os.path.join(top_dir, xml_dir)
5997 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5998 if opts.dry_run or opts.diff:
5999 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07006000 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07006001 if opts.diff:
6002 sys.stdout.write(stdout)
6003 if opts.dry_run and stdout:
6004 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006005
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006006 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006007
Steven Holte2e664bf2017-04-21 13:10:47 -07006008def GetDirtyMetricsDirs(diff_files):
6009 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6010 metrics_xml_dirs = [
6011 os.path.join('tools', 'metrics', 'actions'),
6012 os.path.join('tools', 'metrics', 'histograms'),
6013 os.path.join('tools', 'metrics', 'rappor'),
6014 os.path.join('tools', 'metrics', 'ukm')]
6015 for xml_dir in metrics_xml_dirs:
6016 if any(file.startswith(xml_dir) for file in xml_diff_files):
6017 yield xml_dir
6018
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006019
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006020@subcommand.usage('<codereview url or issue id>')
6021def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006022 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006023 _, args = parser.parse_args(args)
6024
6025 if len(args) != 1:
6026 parser.print_help()
6027 return 1
6028
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006029 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006030 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006031 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006032
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006033 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006034
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006035 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006036 output = RunGit(['config', '--local', '--get-regexp',
6037 r'branch\..*\.%s' % issueprefix],
6038 error_ok=True)
6039 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006040 if issue == target_issue:
6041 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006042
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006043 branches = []
6044 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006045 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006046 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006047 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006048 return 1
6049 if len(branches) == 1:
6050 RunGit(['checkout', branches[0]])
6051 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006052 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006053 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006054 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006055 which = raw_input('Choose by index: ')
6056 try:
6057 RunGit(['checkout', branches[int(which)]])
6058 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006059 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006060 return 1
6061
6062 return 0
6063
6064
maruel@chromium.org29404b52014-09-08 22:58:00 +00006065def CMDlol(parser, args):
6066 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006067 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006068 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6069 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6070 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006071 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006072 return 0
6073
6074
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006075class OptionParser(optparse.OptionParser):
6076 """Creates the option parse and add --verbose support."""
6077 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006078 optparse.OptionParser.__init__(
6079 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006080 self.add_option(
6081 '-v', '--verbose', action='count', default=0,
6082 help='Use 2 times for more debugging info')
6083
6084 def parse_args(self, args=None, values=None):
6085 options, args = optparse.OptionParser.parse_args(self, args, values)
6086 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006087 logging.basicConfig(
6088 level=levels[min(options.verbose, len(levels) - 1)],
6089 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6090 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006091 return options, args
6092
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006093
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006094def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006095 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006096 print('\nYour python version %s is unsupported, please upgrade.\n' %
6097 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006098 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006099
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006100 # Reload settings.
6101 global settings
6102 settings = Settings()
6103
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006104 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006105 dispatcher = subcommand.CommandDispatcher(__name__)
6106 try:
6107 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006108 except auth.AuthenticationError as e:
6109 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006110 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006111 if e.code != 500:
6112 raise
6113 DieWithError(
6114 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6115 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006116 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006117
6118
6119if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006120 # These affect sys.stdout so do it outside of main() to simplify mocks in
6121 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006122 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006123 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006124 try:
6125 sys.exit(main(sys.argv[1:]))
6126 except KeyboardInterrupt:
6127 sys.stderr.write('interrupted\n')
6128 sys.exit(1)