blob: 1cec90466e6b28b35489a0987ec1263df3f4c865 [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
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002785 assert not directory
2786 assert parsed_issue_arg.valid
2787
2788 self._changelist.issue = parsed_issue_arg.issue
2789
2790 if parsed_issue_arg.hostname:
2791 self._gerrit_host = parsed_issue_arg.hostname
2792 self._gerrit_server = 'https://%s' % self._gerrit_host
2793
tandriic2405f52016-10-10 08:13:15 -07002794 try:
2795 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002796 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002797 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002798
2799 if not parsed_issue_arg.patchset:
2800 # Use current revision by default.
2801 revision_info = detail['revisions'][detail['current_revision']]
2802 patchset = int(revision_info['_number'])
2803 else:
2804 patchset = parsed_issue_arg.patchset
2805 for revision_info in detail['revisions'].itervalues():
2806 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2807 break
2808 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002809 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002810 (parsed_issue_arg.patchset, self.GetIssue()))
2811
2812 fetch_info = revision_info['fetch']['http']
2813 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002814
Aaron Gable62619a32017-06-16 08:22:09 -07002815 if force:
2816 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2817 print('Checked out commit for change %i patchset %i locally' %
2818 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002819 elif nocommit:
2820 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2821 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002822 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002823 RunGit(['cherry-pick', 'FETCH_HEAD'])
2824 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002825 (parsed_issue_arg.issue, patchset))
2826 print('Note: this created a local commit which does not have '
2827 'the same hash as the one uploaded for review. This will make '
2828 'uploading changes based on top of this branch difficult.\n'
2829 'If you want to do that, use "git cl patch --force" instead.')
2830
2831 self.SetIssue(parsed_issue_arg.issue)
2832 self.SetPatchset(patchset)
2833 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2834 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2835 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002836 return 0
2837
2838 @staticmethod
2839 def ParseIssueURL(parsed_url):
2840 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2841 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002842 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2843 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002844 # Short urls like https://domain/<issue_number> can be used, but don't allow
2845 # specifying the patchset (you'd 404), but we allow that here.
2846 if parsed_url.path == '/':
2847 part = parsed_url.fragment
2848 else:
2849 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002850 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002851 if match:
2852 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002853 issue=int(match.group(3)),
2854 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002855 hostname=parsed_url.netloc,
2856 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002857 return None
2858
tandrii16e0b4e2016-06-07 10:34:28 -07002859 def _GerritCommitMsgHookCheck(self, offer_removal):
2860 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2861 if not os.path.exists(hook):
2862 return
2863 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2864 # custom developer made one.
2865 data = gclient_utils.FileRead(hook)
2866 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2867 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002868 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002869 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002870 'and may interfere with it in subtle ways.\n'
2871 'We recommend you remove the commit-msg hook.')
2872 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002873 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002874 gclient_utils.rm_file_or_tree(hook)
2875 print('Gerrit commit-msg hook removed.')
2876 else:
2877 print('OK, will keep Gerrit commit-msg hook in place.')
2878
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002879 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002881 if options.squash and options.no_squash:
2882 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002883
2884 if not options.squash and not options.no_squash:
2885 # Load default for user, repo, squash=true, in this order.
2886 options.squash = settings.GetSquashGerritUploads()
2887 elif options.no_squash:
2888 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002889
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002890 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002891 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002892
Aaron Gableb56ad332017-01-06 15:24:31 -08002893 # This may be None; default fallback value is determined in logic below.
2894 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002895 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002896
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002897 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002898 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002899 if self.GetIssue():
2900 # Try to get the message from a previous upload.
2901 message = self.GetDescription()
2902 if not message:
2903 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002904 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002905 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002906 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002907 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002908 # When uploading a subsequent patchset, -m|--message is taken
2909 # as the patchset title if --title was not provided.
2910 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002911 else:
2912 default_title = RunGit(
2913 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002914 if options.force:
2915 title = default_title
2916 else:
2917 title = ask_for_data(
2918 'Title for patchset [%s]: ' % default_title) or default_title
2919 if title == default_title:
2920 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002921 change_id = self._GetChangeDetail()['change_id']
2922 while True:
2923 footer_change_ids = git_footers.get_footer_change_id(message)
2924 if footer_change_ids == [change_id]:
2925 break
2926 if not footer_change_ids:
2927 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002928 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002929 continue
2930 # There is already a valid footer but with different or several ids.
2931 # Doing this automatically is non-trivial as we don't want to lose
2932 # existing other footers, yet we want to append just 1 desired
2933 # Change-Id. Thus, just create a new footer, but let user verify the
2934 # new description.
2935 message = '%s\n\nChange-Id: %s' % (message, change_id)
2936 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002937 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002938 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002939 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002940 'Please, check the proposed correction to the description, '
2941 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2942 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2943 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002944 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002945 if not options.force:
2946 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002947 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002948 message = change_desc.description
2949 if not message:
2950 DieWithError("Description is empty. Aborting...")
2951 # Continue the while loop.
2952 # Sanity check of this code - we should end up with proper message
2953 # footer.
2954 assert [change_id] == git_footers.get_footer_change_id(message)
2955 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002956 else: # if not self.GetIssue()
2957 if options.message:
2958 message = options.message
2959 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002960 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002961 if options.title:
2962 message = options.title + '\n\n' + message
2963 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002964
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002965 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002966 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002967 # On first upload, patchset title is always this string, while
2968 # --title flag gets converted to first line of message.
2969 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002970 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002971 if not change_desc.description:
2972 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002973 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002974 if len(change_ids) > 1:
2975 DieWithError('too many Change-Id footers, at most 1 allowed.')
2976 if not change_ids:
2977 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002978 change_desc.set_description(git_footers.add_footer_change_id(
2979 change_desc.description,
2980 GenerateGerritChangeId(change_desc.description)))
2981 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002982 assert len(change_ids) == 1
2983 change_id = change_ids[0]
2984
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002985 if options.reviewers or options.tbrs or options.add_owners_to:
2986 change_desc.update_reviewers(options.reviewers, options.tbrs,
2987 options.add_owners_to, change)
2988
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002989 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002990 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2991 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002992 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2993 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002994 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002995 else:
2996 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002997 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002998 if not change_desc.description:
2999 DieWithError("Description is empty. Aborting...")
3000
3001 if not git_footers.get_footer_change_id(change_desc.description):
3002 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003003 change_desc.set_description(
3004 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003005 if options.reviewers or options.tbrs or options.add_owners_to:
3006 change_desc.update_reviewers(options.reviewers, options.tbrs,
3007 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003008 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003009 # For no-squash mode, we assume the remote called "origin" is the one we
3010 # want. It is not worthwhile to support different workflows for
3011 # no-squash mode.
3012 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003013 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3014
3015 assert change_desc
3016 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3017 ref_to_push)]).splitlines()
3018 if len(commits) > 1:
3019 print('WARNING: This will upload %d commits. Run the following command '
3020 'to see which commits will be uploaded: ' % len(commits))
3021 print('git log %s..%s' % (parent, ref_to_push))
3022 print('You can also use `git squash-branch` to squash these into a '
3023 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003024 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003025
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003026 if options.reviewers or options.tbrs or options.add_owners_to:
3027 change_desc.update_reviewers(options.reviewers, options.tbrs,
3028 options.add_owners_to, change)
3029
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003030 # Extra options that can be specified at push time. Doc:
3031 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003032 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003033
Aaron Gable844cf292017-06-28 11:32:59 -07003034 # By default, new changes are started in WIP mode, and subsequent patchsets
3035 # don't send email. At any time, passing --send-mail will mark the change
3036 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003037 if options.send_mail:
3038 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003039 refspec_opts.append('notify=ALL')
Aaron Gableafd52772017-06-27 16:40:10 -07003040 else:
Aaron Gable844cf292017-06-28 11:32:59 -07003041 if not self.GetIssue():
3042 refspec_opts.append('wip')
3043 else:
3044 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003045
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003046 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003047 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003048
Aaron Gable9b713dd2016-12-14 16:04:21 -08003049 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003050 if not re.match(r'^[\w ]+$', title):
3051 title = re.sub(r'[^\w ]', '', title)
3052 if not automatic_title:
3053 print('WARNING: Patchset title may only contain alphanumeric chars '
3054 'and spaces. You can edit it in the UI. '
3055 'See https://crbug.com/663787.\n'
3056 'Cleaned up title: %s' % title)
3057 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3058 # reverse on its side.
3059 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003060
agablec6787972016-09-09 16:13:34 -07003061 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003062 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003063
rmistry9eadede2016-09-19 11:22:43 -07003064 if options.topic:
3065 # Documentation on Gerrit topics is here:
3066 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003067 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003068
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003069 refspec_suffix = ''
3070 if refspec_opts:
3071 refspec_suffix = '%' + ','.join(refspec_opts)
3072 assert ' ' not in refspec_suffix, (
3073 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3074 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3075
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003076 try:
3077 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003078 ['git', 'push', self.GetRemoteUrl(), refspec],
3079 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003080 # Flush after every line: useful for seeing progress when running as
3081 # recipe.
3082 filter_fn=lambda _: sys.stdout.flush())
3083 except subprocess2.CalledProcessError:
3084 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003085 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003086 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003087 'credential problems:\n'
3088 ' git cl creds-check\n',
3089 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003090
3091 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003092 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003093 change_numbers = [m.group(1)
3094 for m in map(regex.match, push_stdout.splitlines())
3095 if m]
3096 if len(change_numbers) != 1:
3097 DieWithError(
3098 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003099 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003100 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003101 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003102
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003103 reviewers = sorted(change_desc.get_reviewers())
3104
tandrii88189772016-09-29 04:29:57 -07003105 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003106 if not options.private:
3107 cc = self.GetCCList().split(',')
3108 else:
3109 cc = []
tandrii88189772016-09-29 04:29:57 -07003110 if options.cc:
3111 cc.extend(options.cc)
3112 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003113 if change_desc.get_cced():
3114 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003115
3116 gerrit_util.AddReviewers(
3117 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3118 notify=bool(options.send_mail))
3119
Aaron Gablefd238082017-06-07 13:42:34 -07003120 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003121 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3122 score = 1
3123 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3124 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3125 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003126 gerrit_util.SetReview(
3127 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003128 msg='Self-approving for TBR',
3129 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003130
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003131 return 0
3132
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003133 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3134 change_desc):
3135 """Computes parent of the generated commit to be uploaded to Gerrit.
3136
3137 Returns revision or a ref name.
3138 """
3139 if custom_cl_base:
3140 # Try to avoid creating additional unintended CLs when uploading, unless
3141 # user wants to take this risk.
3142 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3143 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3144 local_ref_of_target_remote])
3145 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003146 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003147 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3148 'If you proceed with upload, more than 1 CL may be created by '
3149 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3150 'If you are certain that specified base `%s` has already been '
3151 'uploaded to Gerrit as another CL, you may proceed.\n' %
3152 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3153 if not force:
3154 confirm_or_exit(
3155 'Do you take responsibility for cleaning up potential mess '
3156 'resulting from proceeding with upload?',
3157 action='upload')
3158 return custom_cl_base
3159
Aaron Gablef97e33d2017-03-30 15:44:27 -07003160 if remote != '.':
3161 return self.GetCommonAncestorWithUpstream()
3162
3163 # If our upstream branch is local, we base our squashed commit on its
3164 # squashed version.
3165 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3166
Aaron Gablef97e33d2017-03-30 15:44:27 -07003167 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003168 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003169
3170 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003171 # TODO(tandrii): consider checking parent change in Gerrit and using its
3172 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3173 # the tree hash of the parent branch. The upside is less likely bogus
3174 # requests to reupload parent change just because it's uploadhash is
3175 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003176 parent = RunGit(['config',
3177 'branch.%s.gerritsquashhash' % upstream_branch_name],
3178 error_ok=True).strip()
3179 # Verify that the upstream branch has been uploaded too, otherwise
3180 # Gerrit will create additional CLs when uploading.
3181 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3182 RunGitSilent(['rev-parse', parent + ':'])):
3183 DieWithError(
3184 '\nUpload upstream branch %s first.\n'
3185 'It is likely that this branch has been rebased since its last '
3186 'upload, so you just need to upload it again.\n'
3187 '(If you uploaded it with --no-squash, then branch dependencies '
3188 'are not supported, and you should reupload with --squash.)'
3189 % upstream_branch_name,
3190 change_desc)
3191 return parent
3192
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003193 def _AddChangeIdToCommitMessage(self, options, args):
3194 """Re-commits using the current message, assumes the commit hook is in
3195 place.
3196 """
3197 log_desc = options.message or CreateDescriptionFromLog(args)
3198 git_command = ['commit', '--amend', '-m', log_desc]
3199 RunGit(git_command)
3200 new_log_desc = CreateDescriptionFromLog(args)
3201 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003202 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003203 return new_log_desc
3204 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003205 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003206
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003207 def SetCQState(self, new_state):
3208 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003209 vote_map = {
3210 _CQState.NONE: 0,
3211 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003212 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003213 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003214 labels = {'Commit-Queue': vote_map[new_state]}
3215 notify = False if new_state == _CQState.DRY_RUN else None
3216 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3217 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003218
tandriie113dfd2016-10-11 10:20:12 -07003219 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003220 try:
3221 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003222 except GerritChangeNotExists:
3223 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003224
3225 if data['status'] in ('ABANDONED', 'MERGED'):
3226 return 'CL %s is closed' % self.GetIssue()
3227
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003228 def GetTryJobProperties(self, patchset=None):
3229 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003230 data = self._GetChangeDetail(['ALL_REVISIONS'])
3231 patchset = int(patchset or self.GetPatchset())
3232 assert patchset
3233 revision_data = None # Pylint wants it to be defined.
3234 for revision_data in data['revisions'].itervalues():
3235 if int(revision_data['_number']) == patchset:
3236 break
3237 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003238 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003239 (patchset, self.GetIssue()))
3240 return {
3241 'patch_issue': self.GetIssue(),
3242 'patch_set': patchset or self.GetPatchset(),
3243 'patch_project': data['project'],
3244 'patch_storage': 'gerrit',
3245 'patch_ref': revision_data['fetch']['http']['ref'],
3246 'patch_repository_url': revision_data['fetch']['http']['url'],
3247 'patch_gerrit_url': self.GetCodereviewServer(),
3248 }
tandriie113dfd2016-10-11 10:20:12 -07003249
tandriide281ae2016-10-12 06:02:30 -07003250 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003251 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003252
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003253
3254_CODEREVIEW_IMPLEMENTATIONS = {
3255 'rietveld': _RietveldChangelistImpl,
3256 'gerrit': _GerritChangelistImpl,
3257}
3258
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003259
iannuccie53c9352016-08-17 14:40:40 -07003260def _add_codereview_issue_select_options(parser, extra=""):
3261 _add_codereview_select_options(parser)
3262
3263 text = ('Operate on this issue number instead of the current branch\'s '
3264 'implicit issue.')
3265 if extra:
3266 text += ' '+extra
3267 parser.add_option('-i', '--issue', type=int, help=text)
3268
3269
3270def _process_codereview_issue_select_options(parser, options):
3271 _process_codereview_select_options(parser, options)
3272 if options.issue is not None and not options.forced_codereview:
3273 parser.error('--issue must be specified with either --rietveld or --gerrit')
3274
3275
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003276def _add_codereview_select_options(parser):
3277 """Appends --gerrit and --rietveld options to force specific codereview."""
3278 parser.codereview_group = optparse.OptionGroup(
3279 parser, 'EXPERIMENTAL! Codereview override options')
3280 parser.add_option_group(parser.codereview_group)
3281 parser.codereview_group.add_option(
3282 '--gerrit', action='store_true',
3283 help='Force the use of Gerrit for codereview')
3284 parser.codereview_group.add_option(
3285 '--rietveld', action='store_true',
3286 help='Force the use of Rietveld for codereview')
3287
3288
3289def _process_codereview_select_options(parser, options):
3290 if options.gerrit and options.rietveld:
3291 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3292 options.forced_codereview = None
3293 if options.gerrit:
3294 options.forced_codereview = 'gerrit'
3295 elif options.rietveld:
3296 options.forced_codereview = 'rietveld'
3297
3298
tandriif9aefb72016-07-01 09:06:51 -07003299def _get_bug_line_values(default_project, bugs):
3300 """Given default_project and comma separated list of bugs, yields bug line
3301 values.
3302
3303 Each bug can be either:
3304 * a number, which is combined with default_project
3305 * string, which is left as is.
3306
3307 This function may produce more than one line, because bugdroid expects one
3308 project per line.
3309
3310 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3311 ['v8:123', 'chromium:789']
3312 """
3313 default_bugs = []
3314 others = []
3315 for bug in bugs.split(','):
3316 bug = bug.strip()
3317 if bug:
3318 try:
3319 default_bugs.append(int(bug))
3320 except ValueError:
3321 others.append(bug)
3322
3323 if default_bugs:
3324 default_bugs = ','.join(map(str, default_bugs))
3325 if default_project:
3326 yield '%s:%s' % (default_project, default_bugs)
3327 else:
3328 yield default_bugs
3329 for other in sorted(others):
3330 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3331 yield other
3332
3333
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003334class ChangeDescription(object):
3335 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003336 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003337 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003338 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003339 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003340
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003341 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003342 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003343
agable@chromium.org42c20792013-09-12 17:34:49 +00003344 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003345 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003346 return '\n'.join(self._description_lines)
3347
3348 def set_description(self, desc):
3349 if isinstance(desc, basestring):
3350 lines = desc.splitlines()
3351 else:
3352 lines = [line.rstrip() for line in desc]
3353 while lines and not lines[0]:
3354 lines.pop(0)
3355 while lines and not lines[-1]:
3356 lines.pop(-1)
3357 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003358
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003359 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3360 """Rewrites the R=/TBR= line(s) as a single line each.
3361
3362 Args:
3363 reviewers (list(str)) - list of additional emails to use for reviewers.
3364 tbrs (list(str)) - list of additional emails to use for TBRs.
3365 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3366 the change that are missing OWNER coverage. If this is not None, you
3367 must also pass a value for `change`.
3368 change (Change) - The Change that should be used for OWNERS lookups.
3369 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003370 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003371 assert isinstance(tbrs, list), tbrs
3372
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003373 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003374 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003375
3376 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003377 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003378
3379 reviewers = set(reviewers)
3380 tbrs = set(tbrs)
3381 LOOKUP = {
3382 'TBR': tbrs,
3383 'R': reviewers,
3384 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003385
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003386 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003387 regexp = re.compile(self.R_LINE)
3388 matches = [regexp.match(line) for line in self._description_lines]
3389 new_desc = [l for i, l in enumerate(self._description_lines)
3390 if not matches[i]]
3391 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003392
agable@chromium.org42c20792013-09-12 17:34:49 +00003393 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003394
3395 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003396 for match in matches:
3397 if not match:
3398 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003399 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3400
3401 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003402 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003403 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003404 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003405 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003406 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003407 LOOKUP[add_owners_to].update(
3408 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003409
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003410 # If any folks ended up in both groups, remove them from tbrs.
3411 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003412
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003413 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3414 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003415
3416 # Put the new lines in the description where the old first R= line was.
3417 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3418 if 0 <= line_loc < len(self._description_lines):
3419 if new_tbr_line:
3420 self._description_lines.insert(line_loc, new_tbr_line)
3421 if new_r_line:
3422 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003423 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003424 if new_r_line:
3425 self.append_footer(new_r_line)
3426 if new_tbr_line:
3427 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003428
Aaron Gable3a16ed12017-03-23 10:51:55 -07003429 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003430 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003431 self.set_description([
3432 '# Enter a description of the change.',
3433 '# This will be displayed on the codereview site.',
3434 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003435 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003436 '--------------------',
3437 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003438
agable@chromium.org42c20792013-09-12 17:34:49 +00003439 regexp = re.compile(self.BUG_LINE)
3440 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003441 prefix = settings.GetBugPrefix()
3442 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003443 if git_footer:
3444 self.append_footer('Bug: %s' % ', '.join(values))
3445 else:
3446 for value in values:
3447 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003448
agable@chromium.org42c20792013-09-12 17:34:49 +00003449 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003450 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003451 if not content:
3452 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003453 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003454
3455 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003456 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3457 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003458 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003459 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003460
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003461 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003462 """Adds a footer line to the description.
3463
3464 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3465 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3466 that Gerrit footers are always at the end.
3467 """
3468 parsed_footer_line = git_footers.parse_footer(line)
3469 if parsed_footer_line:
3470 # Line is a gerrit footer in the form: Footer-Key: any value.
3471 # Thus, must be appended observing Gerrit footer rules.
3472 self.set_description(
3473 git_footers.add_footer(self.description,
3474 key=parsed_footer_line[0],
3475 value=parsed_footer_line[1]))
3476 return
3477
3478 if not self._description_lines:
3479 self._description_lines.append(line)
3480 return
3481
3482 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3483 if gerrit_footers:
3484 # git_footers.split_footers ensures that there is an empty line before
3485 # actual (gerrit) footers, if any. We have to keep it that way.
3486 assert top_lines and top_lines[-1] == ''
3487 top_lines, separator = top_lines[:-1], top_lines[-1:]
3488 else:
3489 separator = [] # No need for separator if there are no gerrit_footers.
3490
3491 prev_line = top_lines[-1] if top_lines else ''
3492 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3493 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3494 top_lines.append('')
3495 top_lines.append(line)
3496 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003497
tandrii99a72f22016-08-17 14:33:24 -07003498 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003499 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003500 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003501 reviewers = [match.group(2).strip()
3502 for match in matches
3503 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003504 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003505
bradnelsond975b302016-10-23 12:20:23 -07003506 def get_cced(self):
3507 """Retrieves the list of reviewers."""
3508 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3509 cced = [match.group(2).strip() for match in matches if match]
3510 return cleanup_list(cced)
3511
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003512 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3513 """Updates this commit description given the parent.
3514
3515 This is essentially what Gnumbd used to do.
3516 Consult https://goo.gl/WMmpDe for more details.
3517 """
3518 assert parent_msg # No, orphan branch creation isn't supported.
3519 assert parent_hash
3520 assert dest_ref
3521 parent_footer_map = git_footers.parse_footers(parent_msg)
3522 # This will also happily parse svn-position, which GnumbD is no longer
3523 # supporting. While we'd generate correct footers, the verifier plugin
3524 # installed in Gerrit will block such commit (ie git push below will fail).
3525 parent_position = git_footers.get_position(parent_footer_map)
3526
3527 # Cherry-picks may have last line obscuring their prior footers,
3528 # from git_footers perspective. This is also what Gnumbd did.
3529 cp_line = None
3530 if (self._description_lines and
3531 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3532 cp_line = self._description_lines.pop()
3533
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003534 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003535
3536 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3537 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003538 for i, line in enumerate(footer_lines):
3539 k, v = git_footers.parse_footer(line) or (None, None)
3540 if k and k.startswith('Cr-'):
3541 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003542
3543 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003544 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003545 if parent_position[0] == dest_ref:
3546 # Same branch as parent.
3547 number = int(parent_position[1]) + 1
3548 else:
3549 number = 1 # New branch, and extra lineage.
3550 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3551 int(parent_position[1])))
3552
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003553 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3554 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003555
3556 self._description_lines = top_lines
3557 if cp_line:
3558 self._description_lines.append(cp_line)
3559 if self._description_lines[-1] != '':
3560 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003561 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003562
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003563
Aaron Gablea1bab272017-04-11 16:38:18 -07003564def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003565 """Retrieves the reviewers that approved a CL from the issue properties with
3566 messages.
3567
3568 Note that the list may contain reviewers that are not committer, thus are not
3569 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003570
3571 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003572 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003573 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003574 return sorted(
3575 set(
3576 message['sender']
3577 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003578 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003579 )
3580 )
3581
3582
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003583def FindCodereviewSettingsFile(filename='codereview.settings'):
3584 """Finds the given file starting in the cwd and going up.
3585
3586 Only looks up to the top of the repository unless an
3587 'inherit-review-settings-ok' file exists in the root of the repository.
3588 """
3589 inherit_ok_file = 'inherit-review-settings-ok'
3590 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003591 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003592 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3593 root = '/'
3594 while True:
3595 if filename in os.listdir(cwd):
3596 if os.path.isfile(os.path.join(cwd, filename)):
3597 return open(os.path.join(cwd, filename))
3598 if cwd == root:
3599 break
3600 cwd = os.path.dirname(cwd)
3601
3602
3603def LoadCodereviewSettingsFromFile(fileobj):
3604 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003605 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003606
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003607 def SetProperty(name, setting, unset_error_ok=False):
3608 fullname = 'rietveld.' + name
3609 if setting in keyvals:
3610 RunGit(['config', fullname, keyvals[setting]])
3611 else:
3612 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3613
tandrii48df5812016-10-17 03:55:37 -07003614 if not keyvals.get('GERRIT_HOST', False):
3615 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003616 # Only server setting is required. Other settings can be absent.
3617 # In that case, we ignore errors raised during option deletion attempt.
3618 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003619 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003620 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3621 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003622 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003623 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3624 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003625 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003626 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3627 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003628
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003629 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003630 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003631
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003632 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003633 RunGit(['config', 'gerrit.squash-uploads',
3634 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003635
tandrii@chromium.org28253532016-04-14 13:46:56 +00003636 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003637 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003638 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3639
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003640 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003641 # should be of the form
3642 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3643 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003644 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3645 keyvals['ORIGIN_URL_CONFIG']])
3646
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003647
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003648def urlretrieve(source, destination):
3649 """urllib is broken for SSL connections via a proxy therefore we
3650 can't use urllib.urlretrieve()."""
3651 with open(destination, 'w') as f:
3652 f.write(urllib2.urlopen(source).read())
3653
3654
ukai@chromium.org712d6102013-11-27 00:52:58 +00003655def hasSheBang(fname):
3656 """Checks fname is a #! script."""
3657 with open(fname) as f:
3658 return f.read(2).startswith('#!')
3659
3660
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003661# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3662def DownloadHooks(*args, **kwargs):
3663 pass
3664
3665
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003666def DownloadGerritHook(force):
3667 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003668
3669 Args:
3670 force: True to update hooks. False to install hooks if not present.
3671 """
3672 if not settings.GetIsGerrit():
3673 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003674 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003675 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3676 if not os.access(dst, os.X_OK):
3677 if os.path.exists(dst):
3678 if not force:
3679 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003680 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003681 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003682 if not hasSheBang(dst):
3683 DieWithError('Not a script: %s\n'
3684 'You need to download from\n%s\n'
3685 'into .git/hooks/commit-msg and '
3686 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003687 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3688 except Exception:
3689 if os.path.exists(dst):
3690 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003691 DieWithError('\nFailed to download hooks.\n'
3692 'You need to download from\n%s\n'
3693 'into .git/hooks/commit-msg and '
3694 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003695
3696
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003697def GetRietveldCodereviewSettingsInteractively():
3698 """Prompt the user for settings."""
3699 server = settings.GetDefaultServerUrl(error_ok=True)
3700 prompt = 'Rietveld server (host[:port])'
3701 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3702 newserver = ask_for_data(prompt + ':')
3703 if not server and not newserver:
3704 newserver = DEFAULT_SERVER
3705 if newserver:
3706 newserver = gclient_utils.UpgradeToHttps(newserver)
3707 if newserver != server:
3708 RunGit(['config', 'rietveld.server', newserver])
3709
3710 def SetProperty(initial, caption, name, is_url):
3711 prompt = caption
3712 if initial:
3713 prompt += ' ("x" to clear) [%s]' % initial
3714 new_val = ask_for_data(prompt + ':')
3715 if new_val == 'x':
3716 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3717 elif new_val:
3718 if is_url:
3719 new_val = gclient_utils.UpgradeToHttps(new_val)
3720 if new_val != initial:
3721 RunGit(['config', 'rietveld.' + name, new_val])
3722
3723 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3724 SetProperty(settings.GetDefaultPrivateFlag(),
3725 'Private flag (rietveld only)', 'private', False)
3726 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3727 'tree-status-url', False)
3728 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3729 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3730 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3731 'run-post-upload-hook', False)
3732
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003733
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003734class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003735 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003736
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003737 _GOOGLESOURCE = 'googlesource.com'
3738
3739 def __init__(self):
3740 # Cached list of [host, identity, source], where source is either
3741 # .gitcookies or .netrc.
3742 self._all_hosts = None
3743
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003744 def ensure_configured_gitcookies(self):
3745 """Runs checks and suggests fixes to make git use .gitcookies from default
3746 path."""
3747 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3748 configured_path = RunGitSilent(
3749 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003750 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003751 if configured_path:
3752 self._ensure_default_gitcookies_path(configured_path, default)
3753 else:
3754 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003755
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003756 @staticmethod
3757 def _ensure_default_gitcookies_path(configured_path, default_path):
3758 assert configured_path
3759 if configured_path == default_path:
3760 print('git is already configured to use your .gitcookies from %s' %
3761 configured_path)
3762 return
3763
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003764 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003765 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3766 (configured_path, default_path))
3767
3768 if not os.path.exists(configured_path):
3769 print('However, your configured .gitcookies file is missing.')
3770 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3771 action='reconfigure')
3772 RunGit(['config', '--global', 'http.cookiefile', default_path])
3773 return
3774
3775 if os.path.exists(default_path):
3776 print('WARNING: default .gitcookies file already exists %s' %
3777 default_path)
3778 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3779 default_path)
3780
3781 confirm_or_exit('Move existing .gitcookies to default location?',
3782 action='move')
3783 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003784 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003785 print('Moved and reconfigured git to use .gitcookies from %s' %
3786 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003787
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003788 @staticmethod
3789 def _configure_gitcookies_path(default_path):
3790 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3791 if os.path.exists(netrc_path):
3792 print('You seem to be using outdated .netrc for git credentials: %s' %
3793 netrc_path)
3794 print('This tool will guide you through setting up recommended '
3795 '.gitcookies store for git credentials.\n'
3796 '\n'
3797 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3798 ' git config --global --unset http.cookiefile\n'
3799 ' mv %s %s.backup\n\n' % (default_path, default_path))
3800 confirm_or_exit(action='setup .gitcookies')
3801 RunGit(['config', '--global', 'http.cookiefile', default_path])
3802 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003803
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003804 def get_hosts_with_creds(self, include_netrc=False):
3805 if self._all_hosts is None:
3806 a = gerrit_util.CookiesAuthenticator()
3807 self._all_hosts = [
3808 (h, u, s)
3809 for h, u, s in itertools.chain(
3810 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3811 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3812 )
3813 if h.endswith(self._GOOGLESOURCE)
3814 ]
3815
3816 if include_netrc:
3817 return self._all_hosts
3818 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3819
3820 def print_current_creds(self, include_netrc=False):
3821 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3822 if not hosts:
3823 print('No Git/Gerrit credentials found')
3824 return
3825 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3826 header = [('Host', 'User', 'Which file'),
3827 ['=' * l for l in lengths]]
3828 for row in (header + hosts):
3829 print('\t'.join((('%%+%ds' % l) % s)
3830 for l, s in zip(lengths, row)))
3831
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003832 @staticmethod
3833 def _parse_identity(identity):
3834 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003835 # Special case: users whose ldaps contain ".", which are generally not
3836 # distinguishable from sub-domains. But we do know typical domains:
3837 if identity.endswith('.chromium.org'):
3838 domain = 'chromium.org'
3839 username = identity[:-len('.chromium.org')]
3840 else:
3841 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003842 if username.startswith('git-'):
3843 username = username[len('git-'):]
3844 return username, domain
3845
3846 def _get_usernames_of_domain(self, domain):
3847 """Returns list of usernames referenced by .gitcookies in a given domain."""
3848 identities_by_domain = {}
3849 for _, identity, _ in self.get_hosts_with_creds():
3850 username, domain = self._parse_identity(identity)
3851 identities_by_domain.setdefault(domain, []).append(username)
3852 return identities_by_domain.get(domain)
3853
3854 def _canonical_git_googlesource_host(self, host):
3855 """Normalizes Gerrit hosts (with '-review') to Git host."""
3856 assert host.endswith(self._GOOGLESOURCE)
3857 # Prefix doesn't include '.' at the end.
3858 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3859 if prefix.endswith('-review'):
3860 prefix = prefix[:-len('-review')]
3861 return prefix + '.' + self._GOOGLESOURCE
3862
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003863 def _canonical_gerrit_googlesource_host(self, host):
3864 git_host = self._canonical_git_googlesource_host(host)
3865 prefix = git_host.split('.', 1)[0]
3866 return prefix + '-review.' + self._GOOGLESOURCE
3867
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003868 def _get_counterpart_host(self, host):
3869 assert host.endswith(self._GOOGLESOURCE)
3870 git = self._canonical_git_googlesource_host(host)
3871 gerrit = self._canonical_gerrit_googlesource_host(git)
3872 return git if gerrit == host else gerrit
3873
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003874 def has_generic_host(self):
3875 """Returns whether generic .googlesource.com has been configured.
3876
3877 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3878 """
3879 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3880 if host == '.' + self._GOOGLESOURCE:
3881 return True
3882 return False
3883
3884 def _get_git_gerrit_identity_pairs(self):
3885 """Returns map from canonic host to pair of identities (Git, Gerrit).
3886
3887 One of identities might be None, meaning not configured.
3888 """
3889 host_to_identity_pairs = {}
3890 for host, identity, _ in self.get_hosts_with_creds():
3891 canonical = self._canonical_git_googlesource_host(host)
3892 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3893 idx = 0 if canonical == host else 1
3894 pair[idx] = identity
3895 return host_to_identity_pairs
3896
3897 def get_partially_configured_hosts(self):
3898 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003899 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3900 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3901 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003902
3903 def get_conflicting_hosts(self):
3904 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003905 host
3906 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003907 if None not in (i1, i2) and i1 != i2)
3908
3909 def get_duplicated_hosts(self):
3910 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3911 return set(host for host, count in counters.iteritems() if count > 1)
3912
3913 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3914 'chromium.googlesource.com': 'chromium.org',
3915 'chrome-internal.googlesource.com': 'google.com',
3916 }
3917
3918 def get_hosts_with_wrong_identities(self):
3919 """Finds hosts which **likely** reference wrong identities.
3920
3921 Note: skips hosts which have conflicting identities for Git and Gerrit.
3922 """
3923 hosts = set()
3924 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3925 pair = self._get_git_gerrit_identity_pairs().get(host)
3926 if pair and pair[0] == pair[1]:
3927 _, domain = self._parse_identity(pair[0])
3928 if domain != expected:
3929 hosts.add(host)
3930 return hosts
3931
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003932 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003933 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003934 hosts = sorted(hosts)
3935 assert hosts
3936 if extra_column_func is None:
3937 extras = [''] * len(hosts)
3938 else:
3939 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003940 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3941 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003942 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003943 lines.append(tmpl % he)
3944 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003945
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003946 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003947 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003948 yield ('.googlesource.com wildcard record detected',
3949 ['Chrome Infrastructure team recommends to list full host names '
3950 'explicitly.'],
3951 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003952
3953 dups = self.get_duplicated_hosts()
3954 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003955 yield ('The following hosts were defined twice',
3956 self._format_hosts(dups),
3957 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003958
3959 partial = self.get_partially_configured_hosts()
3960 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003961 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3962 'These hosts are missing',
3963 self._format_hosts(partial, lambda host: 'but %s defined' %
3964 self._get_counterpart_host(host)),
3965 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003966
3967 conflicting = self.get_conflicting_hosts()
3968 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003969 yield ('The following Git hosts have differing credentials from their '
3970 'Gerrit counterparts',
3971 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3972 tuple(self._get_git_gerrit_identity_pairs()[host])),
3973 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003974
3975 wrong = self.get_hosts_with_wrong_identities()
3976 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003977 yield ('These hosts likely use wrong identity',
3978 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3979 (self._get_git_gerrit_identity_pairs()[host][0],
3980 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3981 wrong)
3982
3983 def find_and_report_problems(self):
3984 """Returns True if there was at least one problem, else False."""
3985 found = False
3986 bad_hosts = set()
3987 for title, sublines, hosts in self._find_problems():
3988 if not found:
3989 found = True
3990 print('\n\n.gitcookies problem report:\n')
3991 bad_hosts.update(hosts or [])
3992 print(' %s%s' % (title , (':' if sublines else '')))
3993 if sublines:
3994 print()
3995 print(' %s' % '\n '.join(sublines))
3996 print()
3997
3998 if bad_hosts:
3999 assert found
4000 print(' You can manually remove corresponding lines in your %s file and '
4001 'visit the following URLs with correct account to generate '
4002 'correct credential lines:\n' %
4003 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4004 print(' %s' % '\n '.join(sorted(set(
4005 gerrit_util.CookiesAuthenticator().get_new_password_url(
4006 self._canonical_git_googlesource_host(host))
4007 for host in bad_hosts
4008 ))))
4009 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004010
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004011
4012def CMDcreds_check(parser, args):
4013 """Checks credentials and suggests changes."""
4014 _, _ = parser.parse_args(args)
4015
4016 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004017 DieWithError(
4018 'This command is not designed for GCE, are you on a bot?\n'
4019 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004020
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004021 checker = _GitCookiesChecker()
4022 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004023
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004024 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004025 checker.print_current_creds(include_netrc=True)
4026
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004027 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004028 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004029 return 0
4030 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004031
4032
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004033@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004034def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004035 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004036
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004037 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004038 # TODO(tandrii): remove this once we switch to Gerrit.
4039 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004040 parser.add_option('--activate-update', action='store_true',
4041 help='activate auto-updating [rietveld] section in '
4042 '.git/config')
4043 parser.add_option('--deactivate-update', action='store_true',
4044 help='deactivate auto-updating [rietveld] section in '
4045 '.git/config')
4046 options, args = parser.parse_args(args)
4047
4048 if options.deactivate_update:
4049 RunGit(['config', 'rietveld.autoupdate', 'false'])
4050 return
4051
4052 if options.activate_update:
4053 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4054 return
4055
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004056 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004057 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004058 return 0
4059
4060 url = args[0]
4061 if not url.endswith('codereview.settings'):
4062 url = os.path.join(url, 'codereview.settings')
4063
4064 # Load code review settings and download hooks (if available).
4065 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4066 return 0
4067
4068
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004069def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004070 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004071 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4072 branch = ShortBranchName(branchref)
4073 _, args = parser.parse_args(args)
4074 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004076 return RunGit(['config', 'branch.%s.base-url' % branch],
4077 error_ok=False).strip()
4078 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004079 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004080 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4081 error_ok=False).strip()
4082
4083
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004084def color_for_status(status):
4085 """Maps a Changelist status to color, for CMDstatus and other tools."""
4086 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004087 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004088 'waiting': Fore.BLUE,
4089 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004090 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004091 'lgtm': Fore.GREEN,
4092 'commit': Fore.MAGENTA,
4093 'closed': Fore.CYAN,
4094 'error': Fore.WHITE,
4095 }.get(status, Fore.WHITE)
4096
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004097
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004098def get_cl_statuses(changes, fine_grained, max_processes=None):
4099 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004100
4101 If fine_grained is true, this will fetch CL statuses from the server.
4102 Otherwise, simply indicate if there's a matching url for the given branches.
4103
4104 If max_processes is specified, it is used as the maximum number of processes
4105 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4106 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004107
4108 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004109 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004110 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004111 upload.verbosity = 0
4112
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004113 if not changes:
4114 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004115
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004116 if not fine_grained:
4117 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004118 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004119 for cl in changes:
4120 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004121 return
4122
4123 # First, sort out authentication issues.
4124 logging.debug('ensuring credentials exist')
4125 for cl in changes:
4126 cl.EnsureAuthenticated(force=False, refresh=True)
4127
4128 def fetch(cl):
4129 try:
4130 return (cl, cl.GetStatus())
4131 except:
4132 # See http://crbug.com/629863.
4133 logging.exception('failed to fetch status for %s:', cl)
4134 raise
4135
4136 threads_count = len(changes)
4137 if max_processes:
4138 threads_count = max(1, min(threads_count, max_processes))
4139 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4140
4141 pool = ThreadPool(threads_count)
4142 fetched_cls = set()
4143 try:
4144 it = pool.imap_unordered(fetch, changes).__iter__()
4145 while True:
4146 try:
4147 cl, status = it.next(timeout=5)
4148 except multiprocessing.TimeoutError:
4149 break
4150 fetched_cls.add(cl)
4151 yield cl, status
4152 finally:
4153 pool.close()
4154
4155 # Add any branches that failed to fetch.
4156 for cl in set(changes) - fetched_cls:
4157 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004158
rmistry@google.com2dd99862015-06-22 12:22:18 +00004159
4160def upload_branch_deps(cl, args):
4161 """Uploads CLs of local branches that are dependents of the current branch.
4162
4163 If the local branch dependency tree looks like:
4164 test1 -> test2.1 -> test3.1
4165 -> test3.2
4166 -> test2.2 -> test3.3
4167
4168 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4169 run on the dependent branches in this order:
4170 test2.1, test3.1, test3.2, test2.2, test3.3
4171
4172 Note: This function does not rebase your local dependent branches. Use it when
4173 you make a change to the parent branch that will not conflict with its
4174 dependent branches, and you would like their dependencies updated in
4175 Rietveld.
4176 """
4177 if git_common.is_dirty_git_tree('upload-branch-deps'):
4178 return 1
4179
4180 root_branch = cl.GetBranch()
4181 if root_branch is None:
4182 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4183 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004184 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004185 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4186 'patchset dependencies without an uploaded CL.')
4187
4188 branches = RunGit(['for-each-ref',
4189 '--format=%(refname:short) %(upstream:short)',
4190 'refs/heads'])
4191 if not branches:
4192 print('No local branches found.')
4193 return 0
4194
4195 # Create a dictionary of all local branches to the branches that are dependent
4196 # on it.
4197 tracked_to_dependents = collections.defaultdict(list)
4198 for b in branches.splitlines():
4199 tokens = b.split()
4200 if len(tokens) == 2:
4201 branch_name, tracked = tokens
4202 tracked_to_dependents[tracked].append(branch_name)
4203
vapiera7fbd5a2016-06-16 09:17:49 -07004204 print()
4205 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004206 dependents = []
4207 def traverse_dependents_preorder(branch, padding=''):
4208 dependents_to_process = tracked_to_dependents.get(branch, [])
4209 padding += ' '
4210 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004212 dependents.append(dependent)
4213 traverse_dependents_preorder(dependent, padding)
4214 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004215 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004216
4217 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004218 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004219 return 0
4220
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004221 confirm_or_exit('This command will checkout all dependent branches and run '
4222 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004223
andybons@chromium.org962f9462016-02-03 20:00:42 +00004224 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004225 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004226 args.extend(['-t', 'Updated patchset dependency'])
4227
rmistry@google.com2dd99862015-06-22 12:22:18 +00004228 # Record all dependents that failed to upload.
4229 failures = {}
4230 # Go through all dependents, checkout the branch and upload.
4231 try:
4232 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004233 print()
4234 print('--------------------------------------')
4235 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004236 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004237 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004238 try:
4239 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004240 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004241 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004242 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004243 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004244 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004245 finally:
4246 # Swap back to the original root branch.
4247 RunGit(['checkout', '-q', root_branch])
4248
vapiera7fbd5a2016-06-16 09:17:49 -07004249 print()
4250 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004251 for dependent_branch in dependents:
4252 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004253 print(' %s : %s' % (dependent_branch, upload_status))
4254 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004255
4256 return 0
4257
4258
kmarshall3bff56b2016-06-06 18:31:47 -07004259def CMDarchive(parser, args):
4260 """Archives and deletes branches associated with closed changelists."""
4261 parser.add_option(
4262 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004263 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004264 parser.add_option(
4265 '-f', '--force', action='store_true',
4266 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004267 parser.add_option(
4268 '-d', '--dry-run', action='store_true',
4269 help='Skip the branch tagging and removal steps.')
4270 parser.add_option(
4271 '-t', '--notags', action='store_true',
4272 help='Do not tag archived branches. '
4273 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004274
4275 auth.add_auth_options(parser)
4276 options, args = parser.parse_args(args)
4277 if args:
4278 parser.error('Unsupported args: %s' % ' '.join(args))
4279 auth_config = auth.extract_auth_config_from_options(options)
4280
4281 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4282 if not branches:
4283 return 0
4284
vapiera7fbd5a2016-06-16 09:17:49 -07004285 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004286 changes = [Changelist(branchref=b, auth_config=auth_config)
4287 for b in branches.splitlines()]
4288 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4289 statuses = get_cl_statuses(changes,
4290 fine_grained=True,
4291 max_processes=options.maxjobs)
4292 proposal = [(cl.GetBranch(),
4293 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4294 for cl, status in statuses
4295 if status == 'closed']
4296 proposal.sort()
4297
4298 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004299 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004300 return 0
4301
4302 current_branch = GetCurrentBranch()
4303
vapiera7fbd5a2016-06-16 09:17:49 -07004304 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004305 if options.notags:
4306 for next_item in proposal:
4307 print(' ' + next_item[0])
4308 else:
4309 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4310 for next_item in proposal:
4311 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004312
kmarshall9249e012016-08-23 12:02:16 -07004313 # Quit now on precondition failure or if instructed by the user, either
4314 # via an interactive prompt or by command line flags.
4315 if options.dry_run:
4316 print('\nNo changes were made (dry run).\n')
4317 return 0
4318 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004319 print('You are currently on a branch \'%s\' which is associated with a '
4320 'closed codereview issue, so archive cannot proceed. Please '
4321 'checkout another branch and run this command again.' %
4322 current_branch)
4323 return 1
kmarshall9249e012016-08-23 12:02:16 -07004324 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004325 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4326 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004327 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004328 return 1
4329
4330 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004331 if not options.notags:
4332 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004333 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004334
vapiera7fbd5a2016-06-16 09:17:49 -07004335 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004336
4337 return 0
4338
4339
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004340def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004341 """Show status of changelists.
4342
4343 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004344 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004345 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004346 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004347 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004348 - Magenta in the commit queue
4349 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004350 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004351
4352 Also see 'git cl comments'.
4353 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004354 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004355 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004356 parser.add_option('-f', '--fast', action='store_true',
4357 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004358 parser.add_option(
4359 '-j', '--maxjobs', action='store', type=int,
4360 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004361
4362 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004363 _add_codereview_issue_select_options(
4364 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004365 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004366 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004367 if args:
4368 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004369 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004370
iannuccie53c9352016-08-17 14:40:40 -07004371 if options.issue is not None and not options.field:
4372 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004373
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004374 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004375 cl = Changelist(auth_config=auth_config, issue=options.issue,
4376 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004377 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004378 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004379 elif options.field == 'id':
4380 issueid = cl.GetIssue()
4381 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004382 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004383 elif options.field == 'patch':
4384 patchset = cl.GetPatchset()
4385 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004386 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004387 elif options.field == 'status':
4388 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004389 elif options.field == 'url':
4390 url = cl.GetIssueURL()
4391 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004392 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004393 return 0
4394
4395 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4396 if not branches:
4397 print('No local branch found.')
4398 return 0
4399
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004400 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004401 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004402 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004403 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004404 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004405 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004406 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004407
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004408 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004409 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4410 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4411 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004412 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004413 c, status = output.next()
4414 branch_statuses[c.GetBranch()] = status
4415 status = branch_statuses.pop(branch)
4416 url = cl.GetIssueURL()
4417 if url and (not status or status == 'error'):
4418 # The issue probably doesn't exist anymore.
4419 url += ' (broken)'
4420
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004421 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004422 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004423 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004424 color = ''
4425 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004426 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004427 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004428 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004429 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004430
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004431
4432 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004433 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004434 print('Current branch: %s' % branch)
4435 for cl in changes:
4436 if cl.GetBranch() == branch:
4437 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004438 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004439 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004440 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004442 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004443 print('Issue description:')
4444 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004445 return 0
4446
4447
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004448def colorize_CMDstatus_doc():
4449 """To be called once in main() to add colors to git cl status help."""
4450 colors = [i for i in dir(Fore) if i[0].isupper()]
4451
4452 def colorize_line(line):
4453 for color in colors:
4454 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004455 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004456 indent = len(line) - len(line.lstrip(' ')) + 1
4457 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4458 return line
4459
4460 lines = CMDstatus.__doc__.splitlines()
4461 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4462
4463
phajdan.jre328cf92016-08-22 04:12:17 -07004464def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004465 if path == '-':
4466 json.dump(contents, sys.stdout)
4467 else:
4468 with open(path, 'w') as f:
4469 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004470
4471
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004472@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004473def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004474 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004475
4476 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004477 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004478 parser.add_option('-r', '--reverse', action='store_true',
4479 help='Lookup the branch(es) for the specified issues. If '
4480 'no issues are specified, all branches with mapped '
4481 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004482 parser.add_option('--json',
4483 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004484 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004485 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004486 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004487
dnj@chromium.org406c4402015-03-03 17:22:28 +00004488 if options.reverse:
4489 branches = RunGit(['for-each-ref', 'refs/heads',
4490 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004491 # Reverse issue lookup.
4492 issue_branch_map = {}
4493 for branch in branches:
4494 cl = Changelist(branchref=branch)
4495 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4496 if not args:
4497 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004498 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004499 for issue in args:
4500 if not issue:
4501 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004502 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004503 print('Branch for issue number %s: %s' % (
4504 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004505 if options.json:
4506 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004507 return 0
4508
4509 if len(args) > 0:
4510 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4511 if not issue.valid:
4512 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4513 'or no argument to list it.\n'
4514 'Maybe you want to run git cl status?')
4515 cl = Changelist(codereview=issue.codereview)
4516 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004517 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004518 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004519 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4520 if options.json:
4521 write_json(options.json, {
4522 'issue': cl.GetIssue(),
4523 'issue_url': cl.GetIssueURL(),
4524 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004525 return 0
4526
4527
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004528def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004529 """Shows or posts review comments for any changelist."""
4530 parser.add_option('-a', '--add-comment', dest='comment',
4531 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004532 parser.add_option('-i', '--issue', dest='issue',
4533 help='review issue id (defaults to current issue). '
4534 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004535 parser.add_option('-m', '--machine-readable', dest='readable',
4536 action='store_false', default=True,
4537 help='output comments in a format compatible with '
4538 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004539 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004540 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004541 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004542 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004543 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004544 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004545 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004546
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004547 issue = None
4548 if options.issue:
4549 try:
4550 issue = int(options.issue)
4551 except ValueError:
4552 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004553 if not options.forced_codereview:
4554 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004555
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004556 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004557 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004558 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004559
4560 if options.comment:
4561 cl.AddComment(options.comment)
4562 return 0
4563
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004564 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4565 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004566 for comment in summary:
4567 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004568 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004569 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004570 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004571 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004572 color = Fore.MAGENTA
4573 else:
4574 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004575 print('\n%s%s %s%s\n%s' % (
4576 color,
4577 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4578 comment.sender,
4579 Fore.RESET,
4580 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4581
smut@google.comc85ac942015-09-15 16:34:43 +00004582 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004583 def pre_serialize(c):
4584 dct = c.__dict__.copy()
4585 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4586 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004587 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004588 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004589 return 0
4590
4591
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004592@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004593def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004594 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004595 parser.add_option('-d', '--display', action='store_true',
4596 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004597 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004598 help='New description to set for this issue (- for stdin, '
4599 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004600 parser.add_option('-f', '--force', action='store_true',
4601 help='Delete any unpublished Gerrit edits for this issue '
4602 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004603
4604 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004605 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004606 options, args = parser.parse_args(args)
4607 _process_codereview_select_options(parser, options)
4608
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004609 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004610 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004611 target_issue_arg = ParseIssueNumberArgument(args[0],
4612 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004613 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004614 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004615
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004616 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004617
martiniss6eda05f2016-06-30 10:18:35 -07004618 kwargs = {
4619 'auth_config': auth_config,
4620 'codereview': options.forced_codereview,
4621 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004622 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004623 if target_issue_arg:
4624 kwargs['issue'] = target_issue_arg.issue
4625 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004626 if target_issue_arg.codereview and not options.forced_codereview:
4627 detected_codereview_from_url = True
4628 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004629
4630 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004631 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004632 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004633 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004634
4635 if detected_codereview_from_url:
4636 logging.info('canonical issue/change URL: %s (type: %s)\n',
4637 cl.GetIssueURL(), target_issue_arg.codereview)
4638
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004639 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004640
smut@google.com34fb6b12015-07-13 20:03:26 +00004641 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004642 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004643 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004644
4645 if options.new_description:
4646 text = options.new_description
4647 if text == '-':
4648 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004649 elif text == '+':
4650 base_branch = cl.GetCommonAncestorWithUpstream()
4651 change = cl.GetChange(base_branch, None, local_description=True)
4652 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004653
4654 description.set_description(text)
4655 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004656 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004657
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004658 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004659 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004660 return 0
4661
4662
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004663def CreateDescriptionFromLog(args):
4664 """Pulls out the commit log to use as a base for the CL description."""
4665 log_args = []
4666 if len(args) == 1 and not args[0].endswith('.'):
4667 log_args = [args[0] + '..']
4668 elif len(args) == 1 and args[0].endswith('...'):
4669 log_args = [args[0][:-1]]
4670 elif len(args) == 2:
4671 log_args = [args[0] + '..' + args[1]]
4672 else:
4673 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004674 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004675
4676
thestig@chromium.org44202a22014-03-11 19:22:18 +00004677def CMDlint(parser, args):
4678 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004679 parser.add_option('--filter', action='append', metavar='-x,+y',
4680 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004681 auth.add_auth_options(parser)
4682 options, args = parser.parse_args(args)
4683 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004684
4685 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004686 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004687 try:
4688 import cpplint
4689 import cpplint_chromium
4690 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004691 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004692 return 1
4693
4694 # Change the current working directory before calling lint so that it
4695 # shows the correct base.
4696 previous_cwd = os.getcwd()
4697 os.chdir(settings.GetRoot())
4698 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004699 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004700 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4701 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004702 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004703 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004704 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004705
4706 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004707 command = args + files
4708 if options.filter:
4709 command = ['--filter=' + ','.join(options.filter)] + command
4710 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004711
4712 white_regex = re.compile(settings.GetLintRegex())
4713 black_regex = re.compile(settings.GetLintIgnoreRegex())
4714 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4715 for filename in filenames:
4716 if white_regex.match(filename):
4717 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004718 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004719 else:
4720 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4721 extra_check_functions)
4722 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004723 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004724 finally:
4725 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004726 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004727 if cpplint._cpplint_state.error_count != 0:
4728 return 1
4729 return 0
4730
4731
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004732def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004733 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004734 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004735 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004736 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004737 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004738 auth.add_auth_options(parser)
4739 options, args = parser.parse_args(args)
4740 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004741
sbc@chromium.org71437c02015-04-09 19:29:40 +00004742 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004743 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004744 return 1
4745
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004746 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004747 if args:
4748 base_branch = args[0]
4749 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004750 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004751 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004752
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004753 cl.RunHook(
4754 committing=not options.upload,
4755 may_prompt=False,
4756 verbose=options.verbose,
4757 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004758 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004759
4760
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004761def GenerateGerritChangeId(message):
4762 """Returns Ixxxxxx...xxx change id.
4763
4764 Works the same way as
4765 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4766 but can be called on demand on all platforms.
4767
4768 The basic idea is to generate git hash of a state of the tree, original commit
4769 message, author/committer info and timestamps.
4770 """
4771 lines = []
4772 tree_hash = RunGitSilent(['write-tree'])
4773 lines.append('tree %s' % tree_hash.strip())
4774 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4775 if code == 0:
4776 lines.append('parent %s' % parent.strip())
4777 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4778 lines.append('author %s' % author.strip())
4779 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4780 lines.append('committer %s' % committer.strip())
4781 lines.append('')
4782 # Note: Gerrit's commit-hook actually cleans message of some lines and
4783 # whitespace. This code is not doing this, but it clearly won't decrease
4784 # entropy.
4785 lines.append(message)
4786 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4787 stdin='\n'.join(lines))
4788 return 'I%s' % change_hash.strip()
4789
4790
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004791def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004792 """Computes the remote branch ref to use for the CL.
4793
4794 Args:
4795 remote (str): The git remote for the CL.
4796 remote_branch (str): The git remote branch for the CL.
4797 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004798 """
4799 if not (remote and remote_branch):
4800 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004801
wittman@chromium.org455dc922015-01-26 20:15:50 +00004802 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004803 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004804 # refs, which are then translated into the remote full symbolic refs
4805 # below.
4806 if '/' not in target_branch:
4807 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4808 else:
4809 prefix_replacements = (
4810 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4811 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4812 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4813 )
4814 match = None
4815 for regex, replacement in prefix_replacements:
4816 match = re.search(regex, target_branch)
4817 if match:
4818 remote_branch = target_branch.replace(match.group(0), replacement)
4819 break
4820 if not match:
4821 # This is a branch path but not one we recognize; use as-is.
4822 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004823 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4824 # Handle the refs that need to land in different refs.
4825 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004826
wittman@chromium.org455dc922015-01-26 20:15:50 +00004827 # Create the true path to the remote branch.
4828 # Does the following translation:
4829 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4830 # * refs/remotes/origin/master -> refs/heads/master
4831 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4832 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4833 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4834 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4835 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4836 'refs/heads/')
4837 elif remote_branch.startswith('refs/remotes/branch-heads'):
4838 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004839
wittman@chromium.org455dc922015-01-26 20:15:50 +00004840 return remote_branch
4841
4842
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004843def cleanup_list(l):
4844 """Fixes a list so that comma separated items are put as individual items.
4845
4846 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4847 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4848 """
4849 items = sum((i.split(',') for i in l), [])
4850 stripped_items = (i.strip() for i in items)
4851 return sorted(filter(None, stripped_items))
4852
4853
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004854@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004855def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004856 """Uploads the current changelist to codereview.
4857
4858 Can skip dependency patchset uploads for a branch by running:
4859 git config branch.branch_name.skip-deps-uploads True
4860 To unset run:
4861 git config --unset branch.branch_name.skip-deps-uploads
4862 Can also set the above globally by using the --global flag.
4863 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004864 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4865 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004866 parser.add_option('--bypass-watchlists', action='store_true',
4867 dest='bypass_watchlists',
4868 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004869 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004870 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004871 parser.add_option('--message', '-m', dest='message',
4872 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004873 parser.add_option('-b', '--bug',
4874 help='pre-populate the bug number(s) for this issue. '
4875 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004876 parser.add_option('--message-file', dest='message_file',
4877 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004878 parser.add_option('--title', '-t', dest='title',
4879 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004880 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004881 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004882 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004883 parser.add_option('--tbrs',
4884 action='append', default=[],
4885 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004886 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004887 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004888 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004889 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004890 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004891 parser.add_option('--emulate_svn_auto_props',
4892 '--emulate-svn-auto-props',
4893 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004894 dest="emulate_svn_auto_props",
4895 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004896 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004897 help='tell the commit queue to commit this patchset; '
4898 'implies --send-mail')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004899 parser.add_option('--private', action='store_true',
4900 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004901 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004902 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004903 metavar='TARGET',
4904 help='Apply CL to remote ref TARGET. ' +
4905 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004906 parser.add_option('--squash', action='store_true',
4907 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004908 parser.add_option('--no-squash', action='store_true',
4909 help='Don\'t squash multiple commits into one ' +
4910 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004911 parser.add_option('--topic', default=None,
4912 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004913 parser.add_option('--email', default=None,
4914 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004915 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4916 const='TBR', help='add a set of OWNERS to TBR')
4917 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4918 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004919 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4920 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004921 help='Send the patchset to do a CQ dry run right after '
4922 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004923 parser.add_option('--dependencies', action='store_true',
4924 help='Uploads CLs of all the local branches that depend on '
4925 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004926
rmistry@google.com2dd99862015-06-22 12:22:18 +00004927 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004928 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004929 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004930 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004931 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004932 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004933 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004934
sbc@chromium.org71437c02015-04-09 19:29:40 +00004935 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004936 return 1
4937
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004938 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004939 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004940 options.cc = cleanup_list(options.cc)
4941
tandriib80458a2016-06-23 12:20:07 -07004942 if options.message_file:
4943 if options.message:
4944 parser.error('only one of --message and --message-file allowed.')
4945 options.message = gclient_utils.FileRead(options.message_file)
4946 options.message_file = None
4947
tandrii4d0545a2016-07-06 03:56:49 -07004948 if options.cq_dry_run and options.use_commit_queue:
4949 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4950
Aaron Gableedbc4132017-09-11 13:22:28 -07004951 if options.use_commit_queue:
4952 options.send_mail = True
4953
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004954 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4955 settings.GetIsGerrit()
4956
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004957 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004958 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004959
4960
Francois Dorayd42c6812017-05-30 15:10:20 -04004961@subcommand.usage('--description=<description file>')
4962def CMDsplit(parser, args):
4963 """Splits a branch into smaller branches and uploads CLs.
4964
4965 Creates a branch and uploads a CL for each group of files modified in the
4966 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004967 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004968 the shared OWNERS file.
4969 """
4970 parser.add_option("-d", "--description", dest="description_file",
4971 help="A text file containing a CL description. ")
4972 parser.add_option("-c", "--comment", dest="comment_file",
4973 help="A text file containing a CL comment.")
4974 options, _ = parser.parse_args(args)
4975
4976 if not options.description_file:
4977 parser.error('No --description flag specified.')
4978
4979 def WrappedCMDupload(args):
4980 return CMDupload(OptionParser(), args)
4981
4982 return split_cl.SplitCl(options.description_file, options.comment_file,
4983 Changelist, WrappedCMDupload)
4984
4985
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004986@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004987def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004988 """DEPRECATED: Used to commit the current changelist via git-svn."""
4989 message = ('git-cl no longer supports committing to SVN repositories via '
4990 'git-svn. You probably want to use `git cl land` instead.')
4991 print(message)
4992 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004993
4994
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004995# Two special branches used by git cl land.
4996MERGE_BRANCH = 'git-cl-commit'
4997CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4998
4999
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005000@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005001def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005002 """Commits the current changelist via git.
5003
5004 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5005 upstream and closes the issue automatically and atomically.
5006
5007 Otherwise (in case of Rietveld):
5008 Squashes branch into a single commit.
5009 Updates commit message with metadata (e.g. pointer to review).
5010 Pushes the code upstream.
5011 Updates review and closes.
5012 """
5013 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5014 help='bypass upload presubmit hook')
5015 parser.add_option('-m', dest='message',
5016 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005017 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005018 help="force yes to questions (don't prompt)")
5019 parser.add_option('-c', dest='contributor',
5020 help="external contributor for patch (appended to " +
5021 "description and used as author for git). Should be " +
5022 "formatted as 'First Last <email@example.com>'")
5023 add_git_similarity(parser)
5024 auth.add_auth_options(parser)
5025 (options, args) = parser.parse_args(args)
5026 auth_config = auth.extract_auth_config_from_options(options)
5027
5028 cl = Changelist(auth_config=auth_config)
5029
5030 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5031 if cl.IsGerrit():
5032 if options.message:
5033 # This could be implemented, but it requires sending a new patch to
5034 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5035 # Besides, Gerrit has the ability to change the commit message on submit
5036 # automatically, thus there is no need to support this option (so far?).
5037 parser.error('-m MESSAGE option is not supported for Gerrit.')
5038 if options.contributor:
5039 parser.error(
5040 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5041 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5042 'the contributor\'s "name <email>". If you can\'t upload such a '
5043 'commit for review, contact your repository admin and request'
5044 '"Forge-Author" permission.')
5045 if not cl.GetIssue():
5046 DieWithError('You must upload the change first to Gerrit.\n'
5047 ' If you would rather have `git cl land` upload '
5048 'automatically for you, see http://crbug.com/642759')
5049 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5050 options.verbose)
5051
5052 current = cl.GetBranch()
5053 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5054 if remote == '.':
5055 print()
5056 print('Attempting to push branch %r into another local branch!' % current)
5057 print()
5058 print('Either reparent this branch on top of origin/master:')
5059 print(' git reparent-branch --root')
5060 print()
5061 print('OR run `git rebase-update` if you think the parent branch is ')
5062 print('already committed.')
5063 print()
5064 print(' Current parent: %r' % upstream_branch)
5065 return 1
5066
5067 if not args:
5068 # Default to merging against our best guess of the upstream branch.
5069 args = [cl.GetUpstreamBranch()]
5070
5071 if options.contributor:
5072 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005073 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005074 return 1
5075
5076 base_branch = args[0]
5077
5078 if git_common.is_dirty_git_tree('land'):
5079 return 1
5080
5081 # This rev-list syntax means "show all commits not in my branch that
5082 # are in base_branch".
5083 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5084 base_branch]).splitlines()
5085 if upstream_commits:
5086 print('Base branch "%s" has %d commits '
5087 'not in this branch.' % (base_branch, len(upstream_commits)))
5088 print('Run "git merge %s" before attempting to land.' % base_branch)
5089 return 1
5090
5091 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5092 if not options.bypass_hooks:
5093 author = None
5094 if options.contributor:
5095 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5096 hook_results = cl.RunHook(
5097 committing=True,
5098 may_prompt=not options.force,
5099 verbose=options.verbose,
5100 change=cl.GetChange(merge_base, author))
5101 if not hook_results.should_continue():
5102 return 1
5103
5104 # Check the tree status if the tree status URL is set.
5105 status = GetTreeStatus()
5106 if 'closed' == status:
5107 print('The tree is closed. Please wait for it to reopen. Use '
5108 '"git cl land --bypass-hooks" to commit on a closed tree.')
5109 return 1
5110 elif 'unknown' == status:
5111 print('Unable to determine tree status. Please verify manually and '
5112 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5113 return 1
5114
5115 change_desc = ChangeDescription(options.message)
5116 if not change_desc.description and cl.GetIssue():
5117 change_desc = ChangeDescription(cl.GetDescription())
5118
5119 if not change_desc.description:
5120 if not cl.GetIssue() and options.bypass_hooks:
5121 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5122 else:
5123 print('No description set.')
5124 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5125 return 1
5126
5127 # Keep a separate copy for the commit message, because the commit message
5128 # contains the link to the Rietveld issue, while the Rietveld message contains
5129 # the commit viewvc url.
5130 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005131 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005132 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005133
5134 commit_desc = ChangeDescription(change_desc.description)
5135 if cl.GetIssue():
5136 # Xcode won't linkify this URL unless there is a non-whitespace character
5137 # after it. Add a period on a new line to circumvent this. Also add a space
5138 # before the period to make sure that Gitiles continues to correctly resolve
5139 # the URL.
5140 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5141 if options.contributor:
5142 commit_desc.append_footer('Patch from %s.' % options.contributor)
5143
5144 print('Description:')
5145 print(commit_desc.description)
5146
5147 branches = [merge_base, cl.GetBranchRef()]
5148 if not options.force:
5149 print_stats(options.similarity, options.find_copies, branches)
5150
5151 # We want to squash all this branch's commits into one commit with the proper
5152 # description. We do this by doing a "reset --soft" to the base branch (which
5153 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005154 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005155 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5156 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5157 result = RunGitWithCode(showref_cmd)
5158 if result[0] == 0:
5159 RunGit(['branch', '-D', branch])
5160
5161 # We might be in a directory that's present in this branch but not in the
5162 # trunk. Move up to the top of the tree so that git commands that expect a
5163 # valid CWD won't fail after we check out the merge branch.
5164 rel_base_path = settings.GetRelativeRoot()
5165 if rel_base_path:
5166 os.chdir(rel_base_path)
5167
5168 # Stuff our change into the merge branch.
5169 # We wrap in a try...finally block so if anything goes wrong,
5170 # we clean up the branches.
5171 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005172 revision = None
5173 try:
5174 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5175 RunGit(['reset', '--soft', merge_base])
5176 if options.contributor:
5177 RunGit(
5178 [
5179 'commit', '--author', options.contributor,
5180 '-m', commit_desc.description,
5181 ])
5182 else:
5183 RunGit(['commit', '-m', commit_desc.description])
5184
5185 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5186 mirror = settings.GetGitMirror(remote)
5187 if mirror:
5188 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005189 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005190 else:
5191 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005192 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005193 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5194
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005195 retcode = PushToGitWithAutoRebase(
5196 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005197 if retcode == 0:
5198 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005199 if git_numberer_enabled:
5200 change_desc = ChangeDescription(
5201 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005202 except: # pylint: disable=bare-except
5203 if _IS_BEING_TESTED:
5204 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5205 + '-' * 30 + '8<' + '-' * 30)
5206 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5207 raise
5208 finally:
5209 # And then swap back to the original branch and clean up.
5210 RunGit(['checkout', '-q', cl.GetBranch()])
5211 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005212 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005213
5214 if not revision:
5215 print('Failed to push. If this persists, please file a bug.')
5216 return 1
5217
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005218 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005219 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005220 if viewvc_url and revision:
5221 change_desc.append_footer(
5222 'Committed: %s%s' % (viewvc_url, revision))
5223 elif revision:
5224 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005225 print('Closing issue '
5226 '(you may be prompted for your codereview password)...')
5227 cl.UpdateDescription(change_desc.description)
5228 cl.CloseIssue()
5229 props = cl.GetIssueProperties()
5230 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005231 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5232 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005233 if options.bypass_hooks:
5234 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5235 else:
5236 comment += ' (presubmit successful).'
5237 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5238
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005239 if os.path.isfile(POSTUPSTREAM_HOOK):
5240 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5241
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005242 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005243
5244
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005245def PushToGitWithAutoRebase(remote, branch, original_description,
5246 git_numberer_enabled, max_attempts=3):
5247 """Pushes current HEAD commit on top of remote's branch.
5248
5249 Attempts to fetch and autorebase on push failures.
5250 Adds git number footers on the fly.
5251
5252 Returns integer code from last command.
5253 """
5254 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5255 code = 0
5256 attempts_left = max_attempts
5257 while attempts_left:
5258 attempts_left -= 1
5259 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5260
5261 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5262 # If fetch fails, retry.
5263 print('Fetching %s/%s...' % (remote, branch))
5264 code, out = RunGitWithCode(
5265 ['retry', 'fetch', remote,
5266 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5267 if code:
5268 print('Fetch failed with exit code %d.' % code)
5269 print(out.strip())
5270 continue
5271
5272 print('Cherry-picking commit on top of latest %s' % branch)
5273 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5274 suppress_stderr=True)
5275 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5276 code, out = RunGitWithCode(['cherry-pick', cherry])
5277 if code:
5278 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5279 'the following files have merge conflicts:' %
5280 (branch, parent_hash))
5281 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5282 print('Please rebase your patch and try again.')
5283 RunGitWithCode(['cherry-pick', '--abort'])
5284 break
5285
5286 commit_desc = ChangeDescription(original_description)
5287 if git_numberer_enabled:
5288 logging.debug('Adding git number footers')
5289 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5290 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5291 branch)
5292 # Ensure timestamps are monotonically increasing.
5293 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5294 _get_committer_timestamp('HEAD'))
5295 _git_amend_head(commit_desc.description, timestamp)
5296
5297 code, out = RunGitWithCode(
5298 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5299 print(out)
5300 if code == 0:
5301 break
5302 if IsFatalPushFailure(out):
5303 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005304 'user.email are correct and you have push access to the repo.\n'
5305 'Hint: run command below to diangose common Git/Gerrit credential '
5306 'problems:\n'
5307 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005308 break
5309 return code
5310
5311
5312def IsFatalPushFailure(push_stdout):
5313 """True if retrying push won't help."""
5314 return '(prohibited by Gerrit)' in push_stdout
5315
5316
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005317@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005318def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005319 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005320 parser.add_option('-b', dest='newbranch',
5321 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005322 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005323 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005324 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005325 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005326 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005327 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005328 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005329 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005330 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005331 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005332
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005333
5334 group = optparse.OptionGroup(
5335 parser,
5336 'Options for continuing work on the current issue uploaded from a '
5337 'different clone (e.g. different machine). Must be used independently '
5338 'from the other options. No issue number should be specified, and the '
5339 'branch must have an issue number associated with it')
5340 group.add_option('--reapply', action='store_true', dest='reapply',
5341 help='Reset the branch and reapply the issue.\n'
5342 'CAUTION: This will undo any local changes in this '
5343 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005344
5345 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005346 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005347 parser.add_option_group(group)
5348
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005349 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005350 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005351 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005352 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005353 auth_config = auth.extract_auth_config_from_options(options)
5354
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005355 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005356 if options.newbranch:
5357 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005358 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005359 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005360
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005361 cl = Changelist(auth_config=auth_config,
5362 codereview=options.forced_codereview)
5363 if not cl.GetIssue():
5364 parser.error('current branch must have an associated issue')
5365
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005366 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005367 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005368 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005369
5370 RunGit(['reset', '--hard', upstream])
5371 if options.pull:
5372 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005373
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005374 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5375 options.directory)
5376
5377 if len(args) != 1 or not args[0]:
5378 parser.error('Must specify issue number or url')
5379
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005380 target_issue_arg = ParseIssueNumberArgument(args[0],
5381 options.forced_codereview)
5382 if not target_issue_arg.valid:
5383 parser.error('invalid codereview url or CL id')
5384
5385 cl_kwargs = {
5386 'auth_config': auth_config,
5387 'codereview_host': target_issue_arg.hostname,
5388 'codereview': options.forced_codereview,
5389 }
5390 detected_codereview_from_url = False
5391 if target_issue_arg.codereview and not options.forced_codereview:
5392 detected_codereview_from_url = True
5393 cl_kwargs['codereview'] = target_issue_arg.codereview
5394 cl_kwargs['issue'] = target_issue_arg.issue
5395
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005396 # We don't want uncommitted changes mixed up with the patch.
5397 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005398 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005399
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005400 if options.newbranch:
5401 if options.force:
5402 RunGit(['branch', '-D', options.newbranch],
5403 stderr=subprocess2.PIPE, error_ok=True)
5404 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005405 elif not GetCurrentBranch():
5406 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005407
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005408 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005409
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005410 if cl.IsGerrit():
5411 if options.reject:
5412 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005413 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='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005481 help=('DEPRECATED, use -B. The try master where to run the builds.'))
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
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005511 if options.master and options.master.startswith('luci.'):
5512 parser.error(
5513 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005514 # Make sure that all properties are prop=value pairs.
5515 bad_params = [x for x in options.properties if '=' not in x]
5516 if bad_params:
5517 parser.error('Got properties with missing "=": %s' % bad_params)
5518
maruel@chromium.org15192402012-09-06 12:38:29 +00005519 if args:
5520 parser.error('Unknown arguments: %s' % args)
5521
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005522 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005523 if not cl.GetIssue():
5524 parser.error('Need to upload first')
5525
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005526 if cl.IsGerrit():
5527 # HACK: warm up Gerrit change detail cache to save on RPCs.
5528 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5529
tandriie113dfd2016-10-11 10:20:12 -07005530 error_message = cl.CannotTriggerTryJobReason()
5531 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005532 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005533
borenet6c0efe62016-10-19 08:13:29 -07005534 if options.bucket and options.master:
5535 parser.error('Only one of --bucket and --master may be used.')
5536
qyearsley1fdfcb62016-10-24 13:22:03 -07005537 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005538
qyearsleydd49f942016-10-28 11:57:22 -07005539 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5540 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005541 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005542 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005543 print('git cl try with no bots now defaults to CQ dry run.')
5544 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5545 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005546
borenet6c0efe62016-10-19 08:13:29 -07005547 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005548 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005549 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005550 'of bot requires an initial job from a parent (usually a builder). '
5551 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005552 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005553 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005554
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005555 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005556 # TODO(tandrii): Checking local patchset against remote patchset is only
5557 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5558 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005559 print('Warning: Codereview server has newer patchsets (%s) than most '
5560 'recent upload from local checkout (%s). Did a previous upload '
5561 'fail?\n'
5562 'By default, git cl try uses the latest patchset from '
5563 'codereview, continuing to use patchset %s.\n' %
5564 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005565
tandrii568043b2016-10-11 07:49:18 -07005566 try:
borenet6c0efe62016-10-19 08:13:29 -07005567 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5568 patchset)
tandrii568043b2016-10-11 07:49:18 -07005569 except BuildbucketResponseException as ex:
5570 print('ERROR: %s' % ex)
5571 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005572 return 0
5573
5574
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005575def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005576 """Prints info about try jobs associated with current CL."""
5577 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005578 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005579 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005580 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005581 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005582 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005583 '--color', action='store_true', default=setup_color.IS_TTY,
5584 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005585 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005586 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5587 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005588 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005589 '--json', help=('Path of JSON output file to write try job results to,'
5590 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005591 parser.add_option_group(group)
5592 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005593 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005594 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005595 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005596 if args:
5597 parser.error('Unrecognized args: %s' % ' '.join(args))
5598
5599 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005600 cl = Changelist(
5601 issue=options.issue, codereview=options.forced_codereview,
5602 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005603 if not cl.GetIssue():
5604 parser.error('Need to upload first')
5605
tandrii221ab252016-10-06 08:12:04 -07005606 patchset = options.patchset
5607 if not patchset:
5608 patchset = cl.GetMostRecentPatchset()
5609 if not patchset:
5610 parser.error('Codereview doesn\'t know about issue %s. '
5611 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005612 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005613 cl.GetIssue())
5614
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005615 # TODO(tandrii): Checking local patchset against remote patchset is only
5616 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5617 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005618 print('Warning: Codereview server has newer patchsets (%s) than most '
5619 'recent upload from local checkout (%s). Did a previous upload '
5620 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005621 'By default, git cl try-results uses the latest patchset from '
5622 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005623 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005624 try:
tandrii221ab252016-10-06 08:12:04 -07005625 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005626 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005627 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005628 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005629 if options.json:
5630 write_try_results_json(options.json, jobs)
5631 else:
5632 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005633 return 0
5634
5635
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005636@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005637def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005638 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005639 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005640 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005641 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005642
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005643 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005644 if args:
5645 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005646 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005647 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005648 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005649 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005650
5651 # Clear configured merge-base, if there is one.
5652 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005653 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005654 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005655 return 0
5656
5657
thestig@chromium.org00858c82013-12-02 23:08:03 +00005658def CMDweb(parser, args):
5659 """Opens the current CL in the web browser."""
5660 _, args = parser.parse_args(args)
5661 if args:
5662 parser.error('Unrecognized args: %s' % ' '.join(args))
5663
5664 issue_url = Changelist().GetIssueURL()
5665 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005666 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005667 return 1
5668
5669 webbrowser.open(issue_url)
5670 return 0
5671
5672
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005673def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005674 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005675 parser.add_option('-d', '--dry-run', action='store_true',
5676 help='trigger in dry run mode')
5677 parser.add_option('-c', '--clear', action='store_true',
5678 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005679 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005680 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005681 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005682 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005683 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005684 if args:
5685 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005686 if options.dry_run and options.clear:
5687 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5688
iannuccie53c9352016-08-17 14:40:40 -07005689 cl = Changelist(auth_config=auth_config, issue=options.issue,
5690 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005691 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005692 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005693 elif options.dry_run:
5694 state = _CQState.DRY_RUN
5695 else:
5696 state = _CQState.COMMIT
5697 if not cl.GetIssue():
5698 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005699 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005700 return 0
5701
5702
groby@chromium.org411034a2013-02-26 15:12:01 +00005703def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005704 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005705 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005706 auth.add_auth_options(parser)
5707 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005708 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005709 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005710 if args:
5711 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005712 cl = Changelist(auth_config=auth_config, issue=options.issue,
5713 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005714 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005715 if not cl.GetIssue():
5716 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005717 cl.CloseIssue()
5718 return 0
5719
5720
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005721def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005722 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005723 parser.add_option(
5724 '--stat',
5725 action='store_true',
5726 dest='stat',
5727 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005728 auth.add_auth_options(parser)
5729 options, args = parser.parse_args(args)
5730 auth_config = auth.extract_auth_config_from_options(options)
5731 if args:
5732 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005733
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005734 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005735 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005736 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005737 if not issue:
5738 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005739
Aaron Gablea718c3e2017-08-28 17:47:28 -07005740 base = cl._GitGetBranchConfigValue('last-upload-hash')
5741 if not base:
5742 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5743 if not base:
5744 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5745 revision_info = detail['revisions'][detail['current_revision']]
5746 fetch_info = revision_info['fetch']['http']
5747 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5748 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005749
Aaron Gablea718c3e2017-08-28 17:47:28 -07005750 cmd = ['git', 'diff']
5751 if options.stat:
5752 cmd.append('--stat')
5753 cmd.append(base)
5754 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005755
5756 return 0
5757
5758
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005759def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005760 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005761 parser.add_option(
5762 '--no-color',
5763 action='store_true',
5764 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005765 parser.add_option(
5766 '--batch',
5767 action='store_true',
5768 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005769 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005770 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005771 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005772
5773 author = RunGit(['config', 'user.email']).strip() or None
5774
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005775 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005776
5777 if args:
5778 if len(args) > 1:
5779 parser.error('Unknown args')
5780 base_branch = args[0]
5781 else:
5782 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005783 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005784
5785 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005786 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5787
5788 if options.batch:
5789 db = owners.Database(change.RepositoryRoot(), file, os.path)
5790 print('\n'.join(db.reviewers_for(affected_files, author)))
5791 return 0
5792
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005793 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005794 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005795 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005796 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005797 disable_color=options.no_color,
5798 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005799
5800
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005801def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005802 """Generates a diff command."""
5803 # Generate diff for the current branch's changes.
5804 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005805 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005806
5807 if args:
5808 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005809 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005810 diff_cmd.append(arg)
5811 else:
5812 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005813
5814 return diff_cmd
5815
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005816
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005817def MatchingFileType(file_name, extensions):
5818 """Returns true if the file name ends with one of the given extensions."""
5819 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005820
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005821
enne@chromium.org555cfe42014-01-29 18:21:39 +00005822@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005823def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005824 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005825 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005826 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005827 parser.add_option('--full', action='store_true',
5828 help='Reformat the full content of all touched files')
5829 parser.add_option('--dry-run', action='store_true',
5830 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005831 parser.add_option('--python', action='store_true',
5832 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005833 parser.add_option('--js', action='store_true',
5834 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005835 parser.add_option('--diff', action='store_true',
5836 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005837 parser.add_option('--presubmit', action='store_true',
5838 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005839 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005840
Daniel Chengc55eecf2016-12-30 03:11:02 -08005841 # Normalize any remaining args against the current path, so paths relative to
5842 # the current directory are still resolved as expected.
5843 args = [os.path.join(os.getcwd(), arg) for arg in args]
5844
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005845 # git diff generates paths against the root of the repository. Change
5846 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005847 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005848 if rel_base_path:
5849 os.chdir(rel_base_path)
5850
digit@chromium.org29e47272013-05-17 17:01:46 +00005851 # Grab the merge-base commit, i.e. the upstream commit of the current
5852 # branch when it was created or the last time it was rebased. This is
5853 # to cover the case where the user may have called "git fetch origin",
5854 # moving the origin branch to a newer commit, but hasn't rebased yet.
5855 upstream_commit = None
5856 cl = Changelist()
5857 upstream_branch = cl.GetUpstreamBranch()
5858 if upstream_branch:
5859 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5860 upstream_commit = upstream_commit.strip()
5861
5862 if not upstream_commit:
5863 DieWithError('Could not find base commit for this branch. '
5864 'Are you in detached state?')
5865
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005866 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5867 diff_output = RunGit(changed_files_cmd)
5868 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005869 # Filter out files deleted by this CL
5870 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005871
Christopher Lamc5ba6922017-01-24 11:19:14 +11005872 if opts.js:
5873 CLANG_EXTS.append('.js')
5874
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005875 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5876 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5877 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005878 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005879
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005880 top_dir = os.path.normpath(
5881 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5882
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005883 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5884 # formatted. This is used to block during the presubmit.
5885 return_value = 0
5886
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005887 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005888 # Locate the clang-format binary in the checkout
5889 try:
5890 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005891 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005892 DieWithError(e)
5893
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005894 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005895 cmd = [clang_format_tool]
5896 if not opts.dry_run and not opts.diff:
5897 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005898 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005899 if opts.diff:
5900 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005901 else:
5902 env = os.environ.copy()
5903 env['PATH'] = str(os.path.dirname(clang_format_tool))
5904 try:
5905 script = clang_format.FindClangFormatScriptInChromiumTree(
5906 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005907 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005908 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005909
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005910 cmd = [sys.executable, script, '-p0']
5911 if not opts.dry_run and not opts.diff:
5912 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005913
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005914 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5915 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005916
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005917 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5918 if opts.diff:
5919 sys.stdout.write(stdout)
5920 if opts.dry_run and len(stdout) > 0:
5921 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005922
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005923 # Similar code to above, but using yapf on .py files rather than clang-format
5924 # on C/C++ files
5925 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005926 yapf_tool = gclient_utils.FindExecutable('yapf')
5927 if yapf_tool is None:
5928 DieWithError('yapf not found in PATH')
5929
5930 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005931 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005932 cmd = [yapf_tool]
5933 if not opts.dry_run and not opts.diff:
5934 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005935 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005936 if opts.diff:
5937 sys.stdout.write(stdout)
5938 else:
5939 # TODO(sbc): yapf --lines mode still has some issues.
5940 # https://github.com/google/yapf/issues/154
5941 DieWithError('--python currently only works with --full')
5942
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005943 # Dart's formatter does not have the nice property of only operating on
5944 # modified chunks, so hard code full.
5945 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005946 try:
5947 command = [dart_format.FindDartFmtToolInChromiumTree()]
5948 if not opts.dry_run and not opts.diff:
5949 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005950 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005951
ppi@chromium.org6593d932016-03-03 15:41:15 +00005952 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005953 if opts.dry_run and stdout:
5954 return_value = 2
5955 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005956 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5957 'found in this checkout. Files in other languages are still '
5958 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005959
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005960 # Format GN build files. Always run on full build files for canonical form.
5961 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005962 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005963 if opts.dry_run or opts.diff:
5964 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005965 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005966 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5967 shell=sys.platform == 'win32',
5968 cwd=top_dir)
5969 if opts.dry_run and gn_ret == 2:
5970 return_value = 2 # Not formatted.
5971 elif opts.diff and gn_ret == 2:
5972 # TODO this should compute and print the actual diff.
5973 print("This change has GN build file diff for " + gn_diff_file)
5974 elif gn_ret != 0:
5975 # For non-dry run cases (and non-2 return values for dry-run), a
5976 # nonzero error code indicates a failure, probably because the file
5977 # doesn't parse.
5978 DieWithError("gn format failed on " + gn_diff_file +
5979 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005980
Ilya Shermane081cbe2017-08-15 17:51:04 -07005981 # Skip the metrics formatting from the global presubmit hook. These files have
5982 # a separate presubmit hook that issues an error if the files need formatting,
5983 # whereas the top-level presubmit script merely issues a warning. Formatting
5984 # these files is somewhat slow, so it's important not to duplicate the work.
5985 if not opts.presubmit:
5986 for xml_dir in GetDirtyMetricsDirs(diff_files):
5987 tool_dir = os.path.join(top_dir, xml_dir)
5988 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5989 if opts.dry_run or opts.diff:
5990 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005991 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005992 if opts.diff:
5993 sys.stdout.write(stdout)
5994 if opts.dry_run and stdout:
5995 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005996
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005997 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005998
Steven Holte2e664bf2017-04-21 13:10:47 -07005999def GetDirtyMetricsDirs(diff_files):
6000 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6001 metrics_xml_dirs = [
6002 os.path.join('tools', 'metrics', 'actions'),
6003 os.path.join('tools', 'metrics', 'histograms'),
6004 os.path.join('tools', 'metrics', 'rappor'),
6005 os.path.join('tools', 'metrics', 'ukm')]
6006 for xml_dir in metrics_xml_dirs:
6007 if any(file.startswith(xml_dir) for file in xml_diff_files):
6008 yield xml_dir
6009
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006010
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006011@subcommand.usage('<codereview url or issue id>')
6012def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006013 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006014 _, args = parser.parse_args(args)
6015
6016 if len(args) != 1:
6017 parser.print_help()
6018 return 1
6019
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006020 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006021 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006022 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006023
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006024 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006025
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006026 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006027 output = RunGit(['config', '--local', '--get-regexp',
6028 r'branch\..*\.%s' % issueprefix],
6029 error_ok=True)
6030 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006031 if issue == target_issue:
6032 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006033
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006034 branches = []
6035 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006036 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006037 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006038 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006039 return 1
6040 if len(branches) == 1:
6041 RunGit(['checkout', branches[0]])
6042 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006043 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006044 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006045 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006046 which = raw_input('Choose by index: ')
6047 try:
6048 RunGit(['checkout', branches[int(which)]])
6049 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006050 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006051 return 1
6052
6053 return 0
6054
6055
maruel@chromium.org29404b52014-09-08 22:58:00 +00006056def CMDlol(parser, args):
6057 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006058 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006059 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6060 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6061 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006062 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006063 return 0
6064
6065
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006066class OptionParser(optparse.OptionParser):
6067 """Creates the option parse and add --verbose support."""
6068 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006069 optparse.OptionParser.__init__(
6070 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006071 self.add_option(
6072 '-v', '--verbose', action='count', default=0,
6073 help='Use 2 times for more debugging info')
6074
6075 def parse_args(self, args=None, values=None):
6076 options, args = optparse.OptionParser.parse_args(self, args, values)
6077 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006078 logging.basicConfig(
6079 level=levels[min(options.verbose, len(levels) - 1)],
6080 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6081 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006082 return options, args
6083
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006084
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006085def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006086 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006087 print('\nYour python version %s is unsupported, please upgrade.\n' %
6088 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006089 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006090
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006091 # Reload settings.
6092 global settings
6093 settings = Settings()
6094
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006095 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006096 dispatcher = subcommand.CommandDispatcher(__name__)
6097 try:
6098 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006099 except auth.AuthenticationError as e:
6100 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006101 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006102 if e.code != 500:
6103 raise
6104 DieWithError(
6105 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6106 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006107 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006108
6109
6110if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006111 # These affect sys.stdout so do it outside of main() to simplify mocks in
6112 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006113 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006114 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006115 try:
6116 sys.exit(main(sys.argv[1:]))
6117 except KeyboardInterrupt:
6118 sys.stderr.write('interrupted\n')
6119 sys.exit(1)