blob: 178a40fb32f72ede10bd5b007da6196d8104ff62 [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
Stefan Zagerd08043c2017-10-12 12:07:02 -07002831 if self.GetBranch():
2832 self.SetIssue(parsed_issue_arg.issue)
2833 self.SetPatchset(patchset)
2834 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2835 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2836 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2837 else:
2838 print('WARNING: You are in detached HEAD state.\n'
2839 'The patch has been applied to your checkout, but you will not be '
2840 'able to upload a new patch set to the gerrit issue.\n'
2841 'Try using the \'-b\' option if you would like to work on a '
2842 'branch and/or upload a new patch set.')
2843
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002844 return 0
2845
2846 @staticmethod
2847 def ParseIssueURL(parsed_url):
2848 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2849 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002850 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2851 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002852 # Short urls like https://domain/<issue_number> can be used, but don't allow
2853 # specifying the patchset (you'd 404), but we allow that here.
2854 if parsed_url.path == '/':
2855 part = parsed_url.fragment
2856 else:
2857 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002858 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002859 if match:
2860 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002861 issue=int(match.group(3)),
2862 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002863 hostname=parsed_url.netloc,
2864 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002865 return None
2866
tandrii16e0b4e2016-06-07 10:34:28 -07002867 def _GerritCommitMsgHookCheck(self, offer_removal):
2868 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2869 if not os.path.exists(hook):
2870 return
2871 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2872 # custom developer made one.
2873 data = gclient_utils.FileRead(hook)
2874 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2875 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002876 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002877 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002878 'and may interfere with it in subtle ways.\n'
2879 'We recommend you remove the commit-msg hook.')
2880 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002881 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002882 gclient_utils.rm_file_or_tree(hook)
2883 print('Gerrit commit-msg hook removed.')
2884 else:
2885 print('OK, will keep Gerrit commit-msg hook in place.')
2886
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002887 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002889 if options.squash and options.no_squash:
2890 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002891
2892 if not options.squash and not options.no_squash:
2893 # Load default for user, repo, squash=true, in this order.
2894 options.squash = settings.GetSquashGerritUploads()
2895 elif options.no_squash:
2896 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002897
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002898 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002899 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002900
Aaron Gableb56ad332017-01-06 15:24:31 -08002901 # This may be None; default fallback value is determined in logic below.
2902 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002903 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002904
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002905 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002906 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002907 if self.GetIssue():
2908 # Try to get the message from a previous upload.
2909 message = self.GetDescription()
2910 if not message:
2911 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002912 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002913 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002914 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002915 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002916 # When uploading a subsequent patchset, -m|--message is taken
2917 # as the patchset title if --title was not provided.
2918 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002919 else:
2920 default_title = RunGit(
2921 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002922 if options.force:
2923 title = default_title
2924 else:
2925 title = ask_for_data(
2926 'Title for patchset [%s]: ' % default_title) or default_title
2927 if title == default_title:
2928 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002929 change_id = self._GetChangeDetail()['change_id']
2930 while True:
2931 footer_change_ids = git_footers.get_footer_change_id(message)
2932 if footer_change_ids == [change_id]:
2933 break
2934 if not footer_change_ids:
2935 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002936 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002937 continue
2938 # There is already a valid footer but with different or several ids.
2939 # Doing this automatically is non-trivial as we don't want to lose
2940 # existing other footers, yet we want to append just 1 desired
2941 # Change-Id. Thus, just create a new footer, but let user verify the
2942 # new description.
2943 message = '%s\n\nChange-Id: %s' % (message, change_id)
2944 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002945 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002946 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002947 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002948 'Please, check the proposed correction to the description, '
2949 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2950 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2951 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002952 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002953 if not options.force:
2954 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002955 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002956 message = change_desc.description
2957 if not message:
2958 DieWithError("Description is empty. Aborting...")
2959 # Continue the while loop.
2960 # Sanity check of this code - we should end up with proper message
2961 # footer.
2962 assert [change_id] == git_footers.get_footer_change_id(message)
2963 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002964 else: # if not self.GetIssue()
2965 if options.message:
2966 message = options.message
2967 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002968 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002969 if options.title:
2970 message = options.title + '\n\n' + message
2971 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002972
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002973 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002974 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002975 # On first upload, patchset title is always this string, while
2976 # --title flag gets converted to first line of message.
2977 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002978 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002979 if not change_desc.description:
2980 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002981 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002982 if len(change_ids) > 1:
2983 DieWithError('too many Change-Id footers, at most 1 allowed.')
2984 if not change_ids:
2985 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002986 change_desc.set_description(git_footers.add_footer_change_id(
2987 change_desc.description,
2988 GenerateGerritChangeId(change_desc.description)))
2989 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002990 assert len(change_ids) == 1
2991 change_id = change_ids[0]
2992
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002993 if options.reviewers or options.tbrs or options.add_owners_to:
2994 change_desc.update_reviewers(options.reviewers, options.tbrs,
2995 options.add_owners_to, change)
2996
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002997 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002998 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2999 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003000 tree = RunGit(['rev-parse', 'HEAD:']).strip()
3001 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003002 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003003 else:
3004 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003005 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003006 if not change_desc.description:
3007 DieWithError("Description is empty. Aborting...")
3008
3009 if not git_footers.get_footer_change_id(change_desc.description):
3010 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003011 change_desc.set_description(
3012 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003013 if options.reviewers or options.tbrs or options.add_owners_to:
3014 change_desc.update_reviewers(options.reviewers, options.tbrs,
3015 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003016 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003017 # For no-squash mode, we assume the remote called "origin" is the one we
3018 # want. It is not worthwhile to support different workflows for
3019 # no-squash mode.
3020 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003021 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3022
3023 assert change_desc
3024 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3025 ref_to_push)]).splitlines()
3026 if len(commits) > 1:
3027 print('WARNING: This will upload %d commits. Run the following command '
3028 'to see which commits will be uploaded: ' % len(commits))
3029 print('git log %s..%s' % (parent, ref_to_push))
3030 print('You can also use `git squash-branch` to squash these into a '
3031 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003032 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003033
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003034 if options.reviewers or options.tbrs or options.add_owners_to:
3035 change_desc.update_reviewers(options.reviewers, options.tbrs,
3036 options.add_owners_to, change)
3037
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003038 # Extra options that can be specified at push time. Doc:
3039 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003040 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003041
Aaron Gable844cf292017-06-28 11:32:59 -07003042 # By default, new changes are started in WIP mode, and subsequent patchsets
3043 # don't send email. At any time, passing --send-mail will mark the change
3044 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003045 if options.send_mail:
3046 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003047 refspec_opts.append('notify=ALL')
Aaron Gableafd52772017-06-27 16:40:10 -07003048 else:
Aaron Gable844cf292017-06-28 11:32:59 -07003049 if not self.GetIssue():
3050 refspec_opts.append('wip')
3051 else:
3052 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003053
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003054 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003055 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003056
Aaron Gable9b713dd2016-12-14 16:04:21 -08003057 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003058 if not re.match(r'^[\w ]+$', title):
3059 title = re.sub(r'[^\w ]', '', title)
3060 if not automatic_title:
3061 print('WARNING: Patchset title may only contain alphanumeric chars '
3062 'and spaces. You can edit it in the UI. '
3063 'See https://crbug.com/663787.\n'
3064 'Cleaned up title: %s' % title)
3065 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3066 # reverse on its side.
3067 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003068
agablec6787972016-09-09 16:13:34 -07003069 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003070 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003071
rmistry9eadede2016-09-19 11:22:43 -07003072 if options.topic:
3073 # Documentation on Gerrit topics is here:
3074 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003075 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003076
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003077 refspec_suffix = ''
3078 if refspec_opts:
3079 refspec_suffix = '%' + ','.join(refspec_opts)
3080 assert ' ' not in refspec_suffix, (
3081 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3082 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3083
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003084 try:
3085 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003086 ['git', 'push', self.GetRemoteUrl(), refspec],
3087 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003088 # Flush after every line: useful for seeing progress when running as
3089 # recipe.
3090 filter_fn=lambda _: sys.stdout.flush())
3091 except subprocess2.CalledProcessError:
3092 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003093 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003094 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003095 'credential problems:\n'
3096 ' git cl creds-check\n',
3097 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003098
3099 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003100 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003101 change_numbers = [m.group(1)
3102 for m in map(regex.match, push_stdout.splitlines())
3103 if m]
3104 if len(change_numbers) != 1:
3105 DieWithError(
3106 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003107 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003108 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003109 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003110
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003111 reviewers = sorted(change_desc.get_reviewers())
3112
tandrii88189772016-09-29 04:29:57 -07003113 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003114 if not options.private:
3115 cc = self.GetCCList().split(',')
3116 else:
3117 cc = []
tandrii88189772016-09-29 04:29:57 -07003118 if options.cc:
3119 cc.extend(options.cc)
3120 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003121 if change_desc.get_cced():
3122 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003123
3124 gerrit_util.AddReviewers(
3125 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3126 notify=bool(options.send_mail))
3127
Aaron Gablefd238082017-06-07 13:42:34 -07003128 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003129 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3130 score = 1
3131 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3132 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3133 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003134 gerrit_util.SetReview(
3135 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003136 msg='Self-approving for TBR',
3137 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003138
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003139 return 0
3140
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003141 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3142 change_desc):
3143 """Computes parent of the generated commit to be uploaded to Gerrit.
3144
3145 Returns revision or a ref name.
3146 """
3147 if custom_cl_base:
3148 # Try to avoid creating additional unintended CLs when uploading, unless
3149 # user wants to take this risk.
3150 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3151 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3152 local_ref_of_target_remote])
3153 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003154 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003155 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3156 'If you proceed with upload, more than 1 CL may be created by '
3157 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3158 'If you are certain that specified base `%s` has already been '
3159 'uploaded to Gerrit as another CL, you may proceed.\n' %
3160 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3161 if not force:
3162 confirm_or_exit(
3163 'Do you take responsibility for cleaning up potential mess '
3164 'resulting from proceeding with upload?',
3165 action='upload')
3166 return custom_cl_base
3167
Aaron Gablef97e33d2017-03-30 15:44:27 -07003168 if remote != '.':
3169 return self.GetCommonAncestorWithUpstream()
3170
3171 # If our upstream branch is local, we base our squashed commit on its
3172 # squashed version.
3173 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3174
Aaron Gablef97e33d2017-03-30 15:44:27 -07003175 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003176 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003177
3178 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003179 # TODO(tandrii): consider checking parent change in Gerrit and using its
3180 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3181 # the tree hash of the parent branch. The upside is less likely bogus
3182 # requests to reupload parent change just because it's uploadhash is
3183 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003184 parent = RunGit(['config',
3185 'branch.%s.gerritsquashhash' % upstream_branch_name],
3186 error_ok=True).strip()
3187 # Verify that the upstream branch has been uploaded too, otherwise
3188 # Gerrit will create additional CLs when uploading.
3189 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3190 RunGitSilent(['rev-parse', parent + ':'])):
3191 DieWithError(
3192 '\nUpload upstream branch %s first.\n'
3193 'It is likely that this branch has been rebased since its last '
3194 'upload, so you just need to upload it again.\n'
3195 '(If you uploaded it with --no-squash, then branch dependencies '
3196 'are not supported, and you should reupload with --squash.)'
3197 % upstream_branch_name,
3198 change_desc)
3199 return parent
3200
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003201 def _AddChangeIdToCommitMessage(self, options, args):
3202 """Re-commits using the current message, assumes the commit hook is in
3203 place.
3204 """
3205 log_desc = options.message or CreateDescriptionFromLog(args)
3206 git_command = ['commit', '--amend', '-m', log_desc]
3207 RunGit(git_command)
3208 new_log_desc = CreateDescriptionFromLog(args)
3209 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003210 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003211 return new_log_desc
3212 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003213 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003214
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003215 def SetCQState(self, new_state):
3216 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003217 vote_map = {
3218 _CQState.NONE: 0,
3219 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003220 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003221 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003222 labels = {'Commit-Queue': vote_map[new_state]}
3223 notify = False if new_state == _CQState.DRY_RUN else None
3224 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3225 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003226
tandriie113dfd2016-10-11 10:20:12 -07003227 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003228 try:
3229 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003230 except GerritChangeNotExists:
3231 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003232
3233 if data['status'] in ('ABANDONED', 'MERGED'):
3234 return 'CL %s is closed' % self.GetIssue()
3235
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003236 def GetTryJobProperties(self, patchset=None):
3237 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003238 data = self._GetChangeDetail(['ALL_REVISIONS'])
3239 patchset = int(patchset or self.GetPatchset())
3240 assert patchset
3241 revision_data = None # Pylint wants it to be defined.
3242 for revision_data in data['revisions'].itervalues():
3243 if int(revision_data['_number']) == patchset:
3244 break
3245 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003246 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003247 (patchset, self.GetIssue()))
3248 return {
3249 'patch_issue': self.GetIssue(),
3250 'patch_set': patchset or self.GetPatchset(),
3251 'patch_project': data['project'],
3252 'patch_storage': 'gerrit',
3253 'patch_ref': revision_data['fetch']['http']['ref'],
3254 'patch_repository_url': revision_data['fetch']['http']['url'],
3255 'patch_gerrit_url': self.GetCodereviewServer(),
3256 }
tandriie113dfd2016-10-11 10:20:12 -07003257
tandriide281ae2016-10-12 06:02:30 -07003258 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003259 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003260
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003261
3262_CODEREVIEW_IMPLEMENTATIONS = {
3263 'rietveld': _RietveldChangelistImpl,
3264 'gerrit': _GerritChangelistImpl,
3265}
3266
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003267
iannuccie53c9352016-08-17 14:40:40 -07003268def _add_codereview_issue_select_options(parser, extra=""):
3269 _add_codereview_select_options(parser)
3270
3271 text = ('Operate on this issue number instead of the current branch\'s '
3272 'implicit issue.')
3273 if extra:
3274 text += ' '+extra
3275 parser.add_option('-i', '--issue', type=int, help=text)
3276
3277
3278def _process_codereview_issue_select_options(parser, options):
3279 _process_codereview_select_options(parser, options)
3280 if options.issue is not None and not options.forced_codereview:
3281 parser.error('--issue must be specified with either --rietveld or --gerrit')
3282
3283
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003284def _add_codereview_select_options(parser):
3285 """Appends --gerrit and --rietveld options to force specific codereview."""
3286 parser.codereview_group = optparse.OptionGroup(
3287 parser, 'EXPERIMENTAL! Codereview override options')
3288 parser.add_option_group(parser.codereview_group)
3289 parser.codereview_group.add_option(
3290 '--gerrit', action='store_true',
3291 help='Force the use of Gerrit for codereview')
3292 parser.codereview_group.add_option(
3293 '--rietveld', action='store_true',
3294 help='Force the use of Rietveld for codereview')
3295
3296
3297def _process_codereview_select_options(parser, options):
3298 if options.gerrit and options.rietveld:
3299 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3300 options.forced_codereview = None
3301 if options.gerrit:
3302 options.forced_codereview = 'gerrit'
3303 elif options.rietveld:
3304 options.forced_codereview = 'rietveld'
3305
3306
tandriif9aefb72016-07-01 09:06:51 -07003307def _get_bug_line_values(default_project, bugs):
3308 """Given default_project and comma separated list of bugs, yields bug line
3309 values.
3310
3311 Each bug can be either:
3312 * a number, which is combined with default_project
3313 * string, which is left as is.
3314
3315 This function may produce more than one line, because bugdroid expects one
3316 project per line.
3317
3318 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3319 ['v8:123', 'chromium:789']
3320 """
3321 default_bugs = []
3322 others = []
3323 for bug in bugs.split(','):
3324 bug = bug.strip()
3325 if bug:
3326 try:
3327 default_bugs.append(int(bug))
3328 except ValueError:
3329 others.append(bug)
3330
3331 if default_bugs:
3332 default_bugs = ','.join(map(str, default_bugs))
3333 if default_project:
3334 yield '%s:%s' % (default_project, default_bugs)
3335 else:
3336 yield default_bugs
3337 for other in sorted(others):
3338 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3339 yield other
3340
3341
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003342class ChangeDescription(object):
3343 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003344 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003345 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003346 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003347 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003348
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003349 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003350 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003351
agable@chromium.org42c20792013-09-12 17:34:49 +00003352 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003353 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003354 return '\n'.join(self._description_lines)
3355
3356 def set_description(self, desc):
3357 if isinstance(desc, basestring):
3358 lines = desc.splitlines()
3359 else:
3360 lines = [line.rstrip() for line in desc]
3361 while lines and not lines[0]:
3362 lines.pop(0)
3363 while lines and not lines[-1]:
3364 lines.pop(-1)
3365 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003366
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003367 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3368 """Rewrites the R=/TBR= line(s) as a single line each.
3369
3370 Args:
3371 reviewers (list(str)) - list of additional emails to use for reviewers.
3372 tbrs (list(str)) - list of additional emails to use for TBRs.
3373 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3374 the change that are missing OWNER coverage. If this is not None, you
3375 must also pass a value for `change`.
3376 change (Change) - The Change that should be used for OWNERS lookups.
3377 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003378 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003379 assert isinstance(tbrs, list), tbrs
3380
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003381 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003382 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003383
3384 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003385 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003386
3387 reviewers = set(reviewers)
3388 tbrs = set(tbrs)
3389 LOOKUP = {
3390 'TBR': tbrs,
3391 'R': reviewers,
3392 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003393
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003394 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003395 regexp = re.compile(self.R_LINE)
3396 matches = [regexp.match(line) for line in self._description_lines]
3397 new_desc = [l for i, l in enumerate(self._description_lines)
3398 if not matches[i]]
3399 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003400
agable@chromium.org42c20792013-09-12 17:34:49 +00003401 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003402
3403 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003404 for match in matches:
3405 if not match:
3406 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003407 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3408
3409 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003410 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003411 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003412 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003413 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003414 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003415 LOOKUP[add_owners_to].update(
3416 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003417
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003418 # If any folks ended up in both groups, remove them from tbrs.
3419 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003420
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003421 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3422 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003423
3424 # Put the new lines in the description where the old first R= line was.
3425 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3426 if 0 <= line_loc < len(self._description_lines):
3427 if new_tbr_line:
3428 self._description_lines.insert(line_loc, new_tbr_line)
3429 if new_r_line:
3430 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003431 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003432 if new_r_line:
3433 self.append_footer(new_r_line)
3434 if new_tbr_line:
3435 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003436
Aaron Gable3a16ed12017-03-23 10:51:55 -07003437 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003438 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003439 self.set_description([
3440 '# Enter a description of the change.',
3441 '# This will be displayed on the codereview site.',
3442 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003443 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003444 '--------------------',
3445 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003446
agable@chromium.org42c20792013-09-12 17:34:49 +00003447 regexp = re.compile(self.BUG_LINE)
3448 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003449 prefix = settings.GetBugPrefix()
3450 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003451 if git_footer:
3452 self.append_footer('Bug: %s' % ', '.join(values))
3453 else:
3454 for value in values:
3455 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003456
agable@chromium.org42c20792013-09-12 17:34:49 +00003457 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003458 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003459 if not content:
3460 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003461 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003462
3463 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003464 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3465 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003466 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003467 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003468
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003469 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003470 """Adds a footer line to the description.
3471
3472 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3473 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3474 that Gerrit footers are always at the end.
3475 """
3476 parsed_footer_line = git_footers.parse_footer(line)
3477 if parsed_footer_line:
3478 # Line is a gerrit footer in the form: Footer-Key: any value.
3479 # Thus, must be appended observing Gerrit footer rules.
3480 self.set_description(
3481 git_footers.add_footer(self.description,
3482 key=parsed_footer_line[0],
3483 value=parsed_footer_line[1]))
3484 return
3485
3486 if not self._description_lines:
3487 self._description_lines.append(line)
3488 return
3489
3490 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3491 if gerrit_footers:
3492 # git_footers.split_footers ensures that there is an empty line before
3493 # actual (gerrit) footers, if any. We have to keep it that way.
3494 assert top_lines and top_lines[-1] == ''
3495 top_lines, separator = top_lines[:-1], top_lines[-1:]
3496 else:
3497 separator = [] # No need for separator if there are no gerrit_footers.
3498
3499 prev_line = top_lines[-1] if top_lines else ''
3500 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3501 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3502 top_lines.append('')
3503 top_lines.append(line)
3504 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003505
tandrii99a72f22016-08-17 14:33:24 -07003506 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003507 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003508 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003509 reviewers = [match.group(2).strip()
3510 for match in matches
3511 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003512 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003513
bradnelsond975b302016-10-23 12:20:23 -07003514 def get_cced(self):
3515 """Retrieves the list of reviewers."""
3516 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3517 cced = [match.group(2).strip() for match in matches if match]
3518 return cleanup_list(cced)
3519
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003520 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3521 """Updates this commit description given the parent.
3522
3523 This is essentially what Gnumbd used to do.
3524 Consult https://goo.gl/WMmpDe for more details.
3525 """
3526 assert parent_msg # No, orphan branch creation isn't supported.
3527 assert parent_hash
3528 assert dest_ref
3529 parent_footer_map = git_footers.parse_footers(parent_msg)
3530 # This will also happily parse svn-position, which GnumbD is no longer
3531 # supporting. While we'd generate correct footers, the verifier plugin
3532 # installed in Gerrit will block such commit (ie git push below will fail).
3533 parent_position = git_footers.get_position(parent_footer_map)
3534
3535 # Cherry-picks may have last line obscuring their prior footers,
3536 # from git_footers perspective. This is also what Gnumbd did.
3537 cp_line = None
3538 if (self._description_lines and
3539 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3540 cp_line = self._description_lines.pop()
3541
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003542 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003543
3544 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3545 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003546 for i, line in enumerate(footer_lines):
3547 k, v = git_footers.parse_footer(line) or (None, None)
3548 if k and k.startswith('Cr-'):
3549 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003550
3551 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003552 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003553 if parent_position[0] == dest_ref:
3554 # Same branch as parent.
3555 number = int(parent_position[1]) + 1
3556 else:
3557 number = 1 # New branch, and extra lineage.
3558 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3559 int(parent_position[1])))
3560
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003561 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3562 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003563
3564 self._description_lines = top_lines
3565 if cp_line:
3566 self._description_lines.append(cp_line)
3567 if self._description_lines[-1] != '':
3568 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003569 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003570
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003571
Aaron Gablea1bab272017-04-11 16:38:18 -07003572def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003573 """Retrieves the reviewers that approved a CL from the issue properties with
3574 messages.
3575
3576 Note that the list may contain reviewers that are not committer, thus are not
3577 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003578
3579 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003580 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003581 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003582 return sorted(
3583 set(
3584 message['sender']
3585 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003586 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003587 )
3588 )
3589
3590
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003591def FindCodereviewSettingsFile(filename='codereview.settings'):
3592 """Finds the given file starting in the cwd and going up.
3593
3594 Only looks up to the top of the repository unless an
3595 'inherit-review-settings-ok' file exists in the root of the repository.
3596 """
3597 inherit_ok_file = 'inherit-review-settings-ok'
3598 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003599 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3601 root = '/'
3602 while True:
3603 if filename in os.listdir(cwd):
3604 if os.path.isfile(os.path.join(cwd, filename)):
3605 return open(os.path.join(cwd, filename))
3606 if cwd == root:
3607 break
3608 cwd = os.path.dirname(cwd)
3609
3610
3611def LoadCodereviewSettingsFromFile(fileobj):
3612 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003613 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003614
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003615 def SetProperty(name, setting, unset_error_ok=False):
3616 fullname = 'rietveld.' + name
3617 if setting in keyvals:
3618 RunGit(['config', fullname, keyvals[setting]])
3619 else:
3620 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3621
tandrii48df5812016-10-17 03:55:37 -07003622 if not keyvals.get('GERRIT_HOST', False):
3623 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003624 # Only server setting is required. Other settings can be absent.
3625 # In that case, we ignore errors raised during option deletion attempt.
3626 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003627 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003628 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3629 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003630 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003631 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3632 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003633 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003634 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3635 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003636
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003637 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003638 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003639
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003640 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003641 RunGit(['config', 'gerrit.squash-uploads',
3642 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003643
tandrii@chromium.org28253532016-04-14 13:46:56 +00003644 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003645 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003646 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3647
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003648 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003649 # should be of the form
3650 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3651 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003652 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3653 keyvals['ORIGIN_URL_CONFIG']])
3654
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003655
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003656def urlretrieve(source, destination):
3657 """urllib is broken for SSL connections via a proxy therefore we
3658 can't use urllib.urlretrieve()."""
3659 with open(destination, 'w') as f:
3660 f.write(urllib2.urlopen(source).read())
3661
3662
ukai@chromium.org712d6102013-11-27 00:52:58 +00003663def hasSheBang(fname):
3664 """Checks fname is a #! script."""
3665 with open(fname) as f:
3666 return f.read(2).startswith('#!')
3667
3668
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003669# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3670def DownloadHooks(*args, **kwargs):
3671 pass
3672
3673
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003674def DownloadGerritHook(force):
3675 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003676
3677 Args:
3678 force: True to update hooks. False to install hooks if not present.
3679 """
3680 if not settings.GetIsGerrit():
3681 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003682 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003683 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3684 if not os.access(dst, os.X_OK):
3685 if os.path.exists(dst):
3686 if not force:
3687 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003688 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003689 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003690 if not hasSheBang(dst):
3691 DieWithError('Not a script: %s\n'
3692 'You need to download from\n%s\n'
3693 'into .git/hooks/commit-msg and '
3694 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003695 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3696 except Exception:
3697 if os.path.exists(dst):
3698 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003699 DieWithError('\nFailed to download hooks.\n'
3700 'You need to download from\n%s\n'
3701 'into .git/hooks/commit-msg and '
3702 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003703
3704
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003705def GetRietveldCodereviewSettingsInteractively():
3706 """Prompt the user for settings."""
3707 server = settings.GetDefaultServerUrl(error_ok=True)
3708 prompt = 'Rietveld server (host[:port])'
3709 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3710 newserver = ask_for_data(prompt + ':')
3711 if not server and not newserver:
3712 newserver = DEFAULT_SERVER
3713 if newserver:
3714 newserver = gclient_utils.UpgradeToHttps(newserver)
3715 if newserver != server:
3716 RunGit(['config', 'rietveld.server', newserver])
3717
3718 def SetProperty(initial, caption, name, is_url):
3719 prompt = caption
3720 if initial:
3721 prompt += ' ("x" to clear) [%s]' % initial
3722 new_val = ask_for_data(prompt + ':')
3723 if new_val == 'x':
3724 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3725 elif new_val:
3726 if is_url:
3727 new_val = gclient_utils.UpgradeToHttps(new_val)
3728 if new_val != initial:
3729 RunGit(['config', 'rietveld.' + name, new_val])
3730
3731 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3732 SetProperty(settings.GetDefaultPrivateFlag(),
3733 'Private flag (rietveld only)', 'private', False)
3734 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3735 'tree-status-url', False)
3736 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3737 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3738 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3739 'run-post-upload-hook', False)
3740
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003741
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003742class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003743 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003744
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003745 _GOOGLESOURCE = 'googlesource.com'
3746
3747 def __init__(self):
3748 # Cached list of [host, identity, source], where source is either
3749 # .gitcookies or .netrc.
3750 self._all_hosts = None
3751
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003752 def ensure_configured_gitcookies(self):
3753 """Runs checks and suggests fixes to make git use .gitcookies from default
3754 path."""
3755 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3756 configured_path = RunGitSilent(
3757 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003758 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003759 if configured_path:
3760 self._ensure_default_gitcookies_path(configured_path, default)
3761 else:
3762 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003763
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003764 @staticmethod
3765 def _ensure_default_gitcookies_path(configured_path, default_path):
3766 assert configured_path
3767 if configured_path == default_path:
3768 print('git is already configured to use your .gitcookies from %s' %
3769 configured_path)
3770 return
3771
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003772 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003773 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3774 (configured_path, default_path))
3775
3776 if not os.path.exists(configured_path):
3777 print('However, your configured .gitcookies file is missing.')
3778 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3779 action='reconfigure')
3780 RunGit(['config', '--global', 'http.cookiefile', default_path])
3781 return
3782
3783 if os.path.exists(default_path):
3784 print('WARNING: default .gitcookies file already exists %s' %
3785 default_path)
3786 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3787 default_path)
3788
3789 confirm_or_exit('Move existing .gitcookies to default location?',
3790 action='move')
3791 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003792 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003793 print('Moved and reconfigured git to use .gitcookies from %s' %
3794 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003795
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003796 @staticmethod
3797 def _configure_gitcookies_path(default_path):
3798 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3799 if os.path.exists(netrc_path):
3800 print('You seem to be using outdated .netrc for git credentials: %s' %
3801 netrc_path)
3802 print('This tool will guide you through setting up recommended '
3803 '.gitcookies store for git credentials.\n'
3804 '\n'
3805 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3806 ' git config --global --unset http.cookiefile\n'
3807 ' mv %s %s.backup\n\n' % (default_path, default_path))
3808 confirm_or_exit(action='setup .gitcookies')
3809 RunGit(['config', '--global', 'http.cookiefile', default_path])
3810 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003811
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003812 def get_hosts_with_creds(self, include_netrc=False):
3813 if self._all_hosts is None:
3814 a = gerrit_util.CookiesAuthenticator()
3815 self._all_hosts = [
3816 (h, u, s)
3817 for h, u, s in itertools.chain(
3818 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3819 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3820 )
3821 if h.endswith(self._GOOGLESOURCE)
3822 ]
3823
3824 if include_netrc:
3825 return self._all_hosts
3826 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3827
3828 def print_current_creds(self, include_netrc=False):
3829 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3830 if not hosts:
3831 print('No Git/Gerrit credentials found')
3832 return
3833 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3834 header = [('Host', 'User', 'Which file'),
3835 ['=' * l for l in lengths]]
3836 for row in (header + hosts):
3837 print('\t'.join((('%%+%ds' % l) % s)
3838 for l, s in zip(lengths, row)))
3839
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003840 @staticmethod
3841 def _parse_identity(identity):
3842 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003843 # Special case: users whose ldaps contain ".", which are generally not
3844 # distinguishable from sub-domains. But we do know typical domains:
3845 if identity.endswith('.chromium.org'):
3846 domain = 'chromium.org'
3847 username = identity[:-len('.chromium.org')]
3848 else:
3849 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003850 if username.startswith('git-'):
3851 username = username[len('git-'):]
3852 return username, domain
3853
3854 def _get_usernames_of_domain(self, domain):
3855 """Returns list of usernames referenced by .gitcookies in a given domain."""
3856 identities_by_domain = {}
3857 for _, identity, _ in self.get_hosts_with_creds():
3858 username, domain = self._parse_identity(identity)
3859 identities_by_domain.setdefault(domain, []).append(username)
3860 return identities_by_domain.get(domain)
3861
3862 def _canonical_git_googlesource_host(self, host):
3863 """Normalizes Gerrit hosts (with '-review') to Git host."""
3864 assert host.endswith(self._GOOGLESOURCE)
3865 # Prefix doesn't include '.' at the end.
3866 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3867 if prefix.endswith('-review'):
3868 prefix = prefix[:-len('-review')]
3869 return prefix + '.' + self._GOOGLESOURCE
3870
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003871 def _canonical_gerrit_googlesource_host(self, host):
3872 git_host = self._canonical_git_googlesource_host(host)
3873 prefix = git_host.split('.', 1)[0]
3874 return prefix + '-review.' + self._GOOGLESOURCE
3875
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003876 def _get_counterpart_host(self, host):
3877 assert host.endswith(self._GOOGLESOURCE)
3878 git = self._canonical_git_googlesource_host(host)
3879 gerrit = self._canonical_gerrit_googlesource_host(git)
3880 return git if gerrit == host else gerrit
3881
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003882 def has_generic_host(self):
3883 """Returns whether generic .googlesource.com has been configured.
3884
3885 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3886 """
3887 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3888 if host == '.' + self._GOOGLESOURCE:
3889 return True
3890 return False
3891
3892 def _get_git_gerrit_identity_pairs(self):
3893 """Returns map from canonic host to pair of identities (Git, Gerrit).
3894
3895 One of identities might be None, meaning not configured.
3896 """
3897 host_to_identity_pairs = {}
3898 for host, identity, _ in self.get_hosts_with_creds():
3899 canonical = self._canonical_git_googlesource_host(host)
3900 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3901 idx = 0 if canonical == host else 1
3902 pair[idx] = identity
3903 return host_to_identity_pairs
3904
3905 def get_partially_configured_hosts(self):
3906 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003907 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3908 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3909 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003910
3911 def get_conflicting_hosts(self):
3912 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003913 host
3914 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003915 if None not in (i1, i2) and i1 != i2)
3916
3917 def get_duplicated_hosts(self):
3918 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3919 return set(host for host, count in counters.iteritems() if count > 1)
3920
3921 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3922 'chromium.googlesource.com': 'chromium.org',
3923 'chrome-internal.googlesource.com': 'google.com',
3924 }
3925
3926 def get_hosts_with_wrong_identities(self):
3927 """Finds hosts which **likely** reference wrong identities.
3928
3929 Note: skips hosts which have conflicting identities for Git and Gerrit.
3930 """
3931 hosts = set()
3932 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3933 pair = self._get_git_gerrit_identity_pairs().get(host)
3934 if pair and pair[0] == pair[1]:
3935 _, domain = self._parse_identity(pair[0])
3936 if domain != expected:
3937 hosts.add(host)
3938 return hosts
3939
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003940 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003941 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003942 hosts = sorted(hosts)
3943 assert hosts
3944 if extra_column_func is None:
3945 extras = [''] * len(hosts)
3946 else:
3947 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003948 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3949 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003950 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003951 lines.append(tmpl % he)
3952 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003953
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003954 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003955 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003956 yield ('.googlesource.com wildcard record detected',
3957 ['Chrome Infrastructure team recommends to list full host names '
3958 'explicitly.'],
3959 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003960
3961 dups = self.get_duplicated_hosts()
3962 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003963 yield ('The following hosts were defined twice',
3964 self._format_hosts(dups),
3965 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003966
3967 partial = self.get_partially_configured_hosts()
3968 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003969 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3970 'These hosts are missing',
3971 self._format_hosts(partial, lambda host: 'but %s defined' %
3972 self._get_counterpart_host(host)),
3973 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003974
3975 conflicting = self.get_conflicting_hosts()
3976 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003977 yield ('The following Git hosts have differing credentials from their '
3978 'Gerrit counterparts',
3979 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3980 tuple(self._get_git_gerrit_identity_pairs()[host])),
3981 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003982
3983 wrong = self.get_hosts_with_wrong_identities()
3984 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003985 yield ('These hosts likely use wrong identity',
3986 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3987 (self._get_git_gerrit_identity_pairs()[host][0],
3988 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3989 wrong)
3990
3991 def find_and_report_problems(self):
3992 """Returns True if there was at least one problem, else False."""
3993 found = False
3994 bad_hosts = set()
3995 for title, sublines, hosts in self._find_problems():
3996 if not found:
3997 found = True
3998 print('\n\n.gitcookies problem report:\n')
3999 bad_hosts.update(hosts or [])
4000 print(' %s%s' % (title , (':' if sublines else '')))
4001 if sublines:
4002 print()
4003 print(' %s' % '\n '.join(sublines))
4004 print()
4005
4006 if bad_hosts:
4007 assert found
4008 print(' You can manually remove corresponding lines in your %s file and '
4009 'visit the following URLs with correct account to generate '
4010 'correct credential lines:\n' %
4011 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4012 print(' %s' % '\n '.join(sorted(set(
4013 gerrit_util.CookiesAuthenticator().get_new_password_url(
4014 self._canonical_git_googlesource_host(host))
4015 for host in bad_hosts
4016 ))))
4017 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004018
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004019
4020def CMDcreds_check(parser, args):
4021 """Checks credentials and suggests changes."""
4022 _, _ = parser.parse_args(args)
4023
4024 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004025 DieWithError(
4026 'This command is not designed for GCE, are you on a bot?\n'
4027 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004028
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004029 checker = _GitCookiesChecker()
4030 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004031
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004032 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004033 checker.print_current_creds(include_netrc=True)
4034
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004035 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004036 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004037 return 0
4038 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004039
4040
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004041@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004042def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004043 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004044
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004045 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004046 # TODO(tandrii): remove this once we switch to Gerrit.
4047 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004048 parser.add_option('--activate-update', action='store_true',
4049 help='activate auto-updating [rietveld] section in '
4050 '.git/config')
4051 parser.add_option('--deactivate-update', action='store_true',
4052 help='deactivate auto-updating [rietveld] section in '
4053 '.git/config')
4054 options, args = parser.parse_args(args)
4055
4056 if options.deactivate_update:
4057 RunGit(['config', 'rietveld.autoupdate', 'false'])
4058 return
4059
4060 if options.activate_update:
4061 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4062 return
4063
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004064 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004065 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004066 return 0
4067
4068 url = args[0]
4069 if not url.endswith('codereview.settings'):
4070 url = os.path.join(url, 'codereview.settings')
4071
4072 # Load code review settings and download hooks (if available).
4073 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4074 return 0
4075
4076
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004077def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004078 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004079 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4080 branch = ShortBranchName(branchref)
4081 _, args = parser.parse_args(args)
4082 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004084 return RunGit(['config', 'branch.%s.base-url' % branch],
4085 error_ok=False).strip()
4086 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004087 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004088 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4089 error_ok=False).strip()
4090
4091
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004092def color_for_status(status):
4093 """Maps a Changelist status to color, for CMDstatus and other tools."""
4094 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004095 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004096 'waiting': Fore.BLUE,
4097 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004098 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004099 'lgtm': Fore.GREEN,
4100 'commit': Fore.MAGENTA,
4101 'closed': Fore.CYAN,
4102 'error': Fore.WHITE,
4103 }.get(status, Fore.WHITE)
4104
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004105
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004106def get_cl_statuses(changes, fine_grained, max_processes=None):
4107 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004108
4109 If fine_grained is true, this will fetch CL statuses from the server.
4110 Otherwise, simply indicate if there's a matching url for the given branches.
4111
4112 If max_processes is specified, it is used as the maximum number of processes
4113 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4114 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004115
4116 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004117 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004118 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004119 upload.verbosity = 0
4120
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004121 if not changes:
4122 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004123
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004124 if not fine_grained:
4125 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004126 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004127 for cl in changes:
4128 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004129 return
4130
4131 # First, sort out authentication issues.
4132 logging.debug('ensuring credentials exist')
4133 for cl in changes:
4134 cl.EnsureAuthenticated(force=False, refresh=True)
4135
4136 def fetch(cl):
4137 try:
4138 return (cl, cl.GetStatus())
4139 except:
4140 # See http://crbug.com/629863.
4141 logging.exception('failed to fetch status for %s:', cl)
4142 raise
4143
4144 threads_count = len(changes)
4145 if max_processes:
4146 threads_count = max(1, min(threads_count, max_processes))
4147 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4148
4149 pool = ThreadPool(threads_count)
4150 fetched_cls = set()
4151 try:
4152 it = pool.imap_unordered(fetch, changes).__iter__()
4153 while True:
4154 try:
4155 cl, status = it.next(timeout=5)
4156 except multiprocessing.TimeoutError:
4157 break
4158 fetched_cls.add(cl)
4159 yield cl, status
4160 finally:
4161 pool.close()
4162
4163 # Add any branches that failed to fetch.
4164 for cl in set(changes) - fetched_cls:
4165 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004166
rmistry@google.com2dd99862015-06-22 12:22:18 +00004167
4168def upload_branch_deps(cl, args):
4169 """Uploads CLs of local branches that are dependents of the current branch.
4170
4171 If the local branch dependency tree looks like:
4172 test1 -> test2.1 -> test3.1
4173 -> test3.2
4174 -> test2.2 -> test3.3
4175
4176 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4177 run on the dependent branches in this order:
4178 test2.1, test3.1, test3.2, test2.2, test3.3
4179
4180 Note: This function does not rebase your local dependent branches. Use it when
4181 you make a change to the parent branch that will not conflict with its
4182 dependent branches, and you would like their dependencies updated in
4183 Rietveld.
4184 """
4185 if git_common.is_dirty_git_tree('upload-branch-deps'):
4186 return 1
4187
4188 root_branch = cl.GetBranch()
4189 if root_branch is None:
4190 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4191 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004192 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004193 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4194 'patchset dependencies without an uploaded CL.')
4195
4196 branches = RunGit(['for-each-ref',
4197 '--format=%(refname:short) %(upstream:short)',
4198 'refs/heads'])
4199 if not branches:
4200 print('No local branches found.')
4201 return 0
4202
4203 # Create a dictionary of all local branches to the branches that are dependent
4204 # on it.
4205 tracked_to_dependents = collections.defaultdict(list)
4206 for b in branches.splitlines():
4207 tokens = b.split()
4208 if len(tokens) == 2:
4209 branch_name, tracked = tokens
4210 tracked_to_dependents[tracked].append(branch_name)
4211
vapiera7fbd5a2016-06-16 09:17:49 -07004212 print()
4213 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004214 dependents = []
4215 def traverse_dependents_preorder(branch, padding=''):
4216 dependents_to_process = tracked_to_dependents.get(branch, [])
4217 padding += ' '
4218 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004219 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004220 dependents.append(dependent)
4221 traverse_dependents_preorder(dependent, padding)
4222 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004223 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004224
4225 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004226 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004227 return 0
4228
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004229 confirm_or_exit('This command will checkout all dependent branches and run '
4230 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004231
andybons@chromium.org962f9462016-02-03 20:00:42 +00004232 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004233 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004234 args.extend(['-t', 'Updated patchset dependency'])
4235
rmistry@google.com2dd99862015-06-22 12:22:18 +00004236 # Record all dependents that failed to upload.
4237 failures = {}
4238 # Go through all dependents, checkout the branch and upload.
4239 try:
4240 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004241 print()
4242 print('--------------------------------------')
4243 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004244 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004245 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004246 try:
4247 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004248 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004249 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004250 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004251 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004252 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004253 finally:
4254 # Swap back to the original root branch.
4255 RunGit(['checkout', '-q', root_branch])
4256
vapiera7fbd5a2016-06-16 09:17:49 -07004257 print()
4258 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004259 for dependent_branch in dependents:
4260 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004261 print(' %s : %s' % (dependent_branch, upload_status))
4262 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004263
4264 return 0
4265
4266
kmarshall3bff56b2016-06-06 18:31:47 -07004267def CMDarchive(parser, args):
4268 """Archives and deletes branches associated with closed changelists."""
4269 parser.add_option(
4270 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004271 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004272 parser.add_option(
4273 '-f', '--force', action='store_true',
4274 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004275 parser.add_option(
4276 '-d', '--dry-run', action='store_true',
4277 help='Skip the branch tagging and removal steps.')
4278 parser.add_option(
4279 '-t', '--notags', action='store_true',
4280 help='Do not tag archived branches. '
4281 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004282
4283 auth.add_auth_options(parser)
4284 options, args = parser.parse_args(args)
4285 if args:
4286 parser.error('Unsupported args: %s' % ' '.join(args))
4287 auth_config = auth.extract_auth_config_from_options(options)
4288
4289 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4290 if not branches:
4291 return 0
4292
vapiera7fbd5a2016-06-16 09:17:49 -07004293 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004294 changes = [Changelist(branchref=b, auth_config=auth_config)
4295 for b in branches.splitlines()]
4296 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4297 statuses = get_cl_statuses(changes,
4298 fine_grained=True,
4299 max_processes=options.maxjobs)
4300 proposal = [(cl.GetBranch(),
4301 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4302 for cl, status in statuses
4303 if status == 'closed']
4304 proposal.sort()
4305
4306 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004307 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004308 return 0
4309
4310 current_branch = GetCurrentBranch()
4311
vapiera7fbd5a2016-06-16 09:17:49 -07004312 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004313 if options.notags:
4314 for next_item in proposal:
4315 print(' ' + next_item[0])
4316 else:
4317 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4318 for next_item in proposal:
4319 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004320
kmarshall9249e012016-08-23 12:02:16 -07004321 # Quit now on precondition failure or if instructed by the user, either
4322 # via an interactive prompt or by command line flags.
4323 if options.dry_run:
4324 print('\nNo changes were made (dry run).\n')
4325 return 0
4326 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004327 print('You are currently on a branch \'%s\' which is associated with a '
4328 'closed codereview issue, so archive cannot proceed. Please '
4329 'checkout another branch and run this command again.' %
4330 current_branch)
4331 return 1
kmarshall9249e012016-08-23 12:02:16 -07004332 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004333 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4334 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004335 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004336 return 1
4337
4338 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004339 if not options.notags:
4340 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004341 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004342
vapiera7fbd5a2016-06-16 09:17:49 -07004343 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004344
4345 return 0
4346
4347
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004348def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004349 """Show status of changelists.
4350
4351 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004352 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004353 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004354 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004355 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004356 - Magenta in the commit queue
4357 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004358 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004359
4360 Also see 'git cl comments'.
4361 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004362 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004363 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004364 parser.add_option('-f', '--fast', action='store_true',
4365 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004366 parser.add_option(
4367 '-j', '--maxjobs', action='store', type=int,
4368 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004369
4370 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004371 _add_codereview_issue_select_options(
4372 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004373 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004374 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004375 if args:
4376 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004377 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004378
iannuccie53c9352016-08-17 14:40:40 -07004379 if options.issue is not None and not options.field:
4380 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004381
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004382 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004383 cl = Changelist(auth_config=auth_config, issue=options.issue,
4384 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004385 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004386 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004387 elif options.field == 'id':
4388 issueid = cl.GetIssue()
4389 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004390 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004391 elif options.field == 'patch':
4392 patchset = cl.GetPatchset()
4393 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004394 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004395 elif options.field == 'status':
4396 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004397 elif options.field == 'url':
4398 url = cl.GetIssueURL()
4399 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004400 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004401 return 0
4402
4403 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4404 if not branches:
4405 print('No local branch found.')
4406 return 0
4407
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004408 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004409 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004410 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004411 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004412 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004413 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004414 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004415
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004416 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004417 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4418 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4419 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004420 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004421 c, status = output.next()
4422 branch_statuses[c.GetBranch()] = status
4423 status = branch_statuses.pop(branch)
4424 url = cl.GetIssueURL()
4425 if url and (not status or status == 'error'):
4426 # The issue probably doesn't exist anymore.
4427 url += ' (broken)'
4428
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004429 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004430 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004431 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004432 color = ''
4433 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004434 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004435 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004436 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004437 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004438
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004439
4440 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004442 print('Current branch: %s' % branch)
4443 for cl in changes:
4444 if cl.GetBranch() == branch:
4445 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004446 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004447 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004448 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004449 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004450 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004451 print('Issue description:')
4452 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004453 return 0
4454
4455
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004456def colorize_CMDstatus_doc():
4457 """To be called once in main() to add colors to git cl status help."""
4458 colors = [i for i in dir(Fore) if i[0].isupper()]
4459
4460 def colorize_line(line):
4461 for color in colors:
4462 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004463 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004464 indent = len(line) - len(line.lstrip(' ')) + 1
4465 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4466 return line
4467
4468 lines = CMDstatus.__doc__.splitlines()
4469 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4470
4471
phajdan.jre328cf92016-08-22 04:12:17 -07004472def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004473 if path == '-':
4474 json.dump(contents, sys.stdout)
4475 else:
4476 with open(path, 'w') as f:
4477 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004478
4479
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004480@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004481def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004482 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004483
4484 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004485 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004486 parser.add_option('-r', '--reverse', action='store_true',
4487 help='Lookup the branch(es) for the specified issues. If '
4488 'no issues are specified, all branches with mapped '
4489 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004490 parser.add_option('--json',
4491 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004492 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004493 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004494 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004495
dnj@chromium.org406c4402015-03-03 17:22:28 +00004496 if options.reverse:
4497 branches = RunGit(['for-each-ref', 'refs/heads',
4498 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004499 # Reverse issue lookup.
4500 issue_branch_map = {}
4501 for branch in branches:
4502 cl = Changelist(branchref=branch)
4503 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4504 if not args:
4505 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004506 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004507 for issue in args:
4508 if not issue:
4509 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004510 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004511 print('Branch for issue number %s: %s' % (
4512 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004513 if options.json:
4514 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004515 return 0
4516
4517 if len(args) > 0:
4518 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4519 if not issue.valid:
4520 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4521 'or no argument to list it.\n'
4522 'Maybe you want to run git cl status?')
4523 cl = Changelist(codereview=issue.codereview)
4524 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004525 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004526 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004527 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4528 if options.json:
4529 write_json(options.json, {
4530 'issue': cl.GetIssue(),
4531 'issue_url': cl.GetIssueURL(),
4532 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004533 return 0
4534
4535
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004536def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004537 """Shows or posts review comments for any changelist."""
4538 parser.add_option('-a', '--add-comment', dest='comment',
4539 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004540 parser.add_option('-i', '--issue', dest='issue',
4541 help='review issue id (defaults to current issue). '
4542 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004543 parser.add_option('-m', '--machine-readable', dest='readable',
4544 action='store_false', default=True,
4545 help='output comments in a format compatible with '
4546 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004547 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004548 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004549 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004550 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004551 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004552 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004553 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004554
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004555 issue = None
4556 if options.issue:
4557 try:
4558 issue = int(options.issue)
4559 except ValueError:
4560 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004561 if not options.forced_codereview:
4562 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004563
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004564 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004565 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004566 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004567
4568 if options.comment:
4569 cl.AddComment(options.comment)
4570 return 0
4571
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004572 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4573 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004574 for comment in summary:
4575 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004576 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004577 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004578 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004579 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004580 color = Fore.MAGENTA
4581 else:
4582 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004583 print('\n%s%s %s%s\n%s' % (
4584 color,
4585 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4586 comment.sender,
4587 Fore.RESET,
4588 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4589
smut@google.comc85ac942015-09-15 16:34:43 +00004590 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004591 def pre_serialize(c):
4592 dct = c.__dict__.copy()
4593 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4594 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004595 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004596 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004597 return 0
4598
4599
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004600@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004601def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004602 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004603 parser.add_option('-d', '--display', action='store_true',
4604 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004605 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004606 help='New description to set for this issue (- for stdin, '
4607 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004608 parser.add_option('-f', '--force', action='store_true',
4609 help='Delete any unpublished Gerrit edits for this issue '
4610 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004611
4612 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004613 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004614 options, args = parser.parse_args(args)
4615 _process_codereview_select_options(parser, options)
4616
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004617 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004618 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004619 target_issue_arg = ParseIssueNumberArgument(args[0],
4620 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004621 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004622 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004623
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004624 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004625
martiniss6eda05f2016-06-30 10:18:35 -07004626 kwargs = {
4627 'auth_config': auth_config,
4628 'codereview': options.forced_codereview,
4629 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004630 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004631 if target_issue_arg:
4632 kwargs['issue'] = target_issue_arg.issue
4633 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004634 if target_issue_arg.codereview and not options.forced_codereview:
4635 detected_codereview_from_url = True
4636 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004637
4638 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004639 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004640 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004641 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004642
4643 if detected_codereview_from_url:
4644 logging.info('canonical issue/change URL: %s (type: %s)\n',
4645 cl.GetIssueURL(), target_issue_arg.codereview)
4646
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004647 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004648
smut@google.com34fb6b12015-07-13 20:03:26 +00004649 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004650 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004651 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004652
4653 if options.new_description:
4654 text = options.new_description
4655 if text == '-':
4656 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004657 elif text == '+':
4658 base_branch = cl.GetCommonAncestorWithUpstream()
4659 change = cl.GetChange(base_branch, None, local_description=True)
4660 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004661
4662 description.set_description(text)
4663 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004664 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004665
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004666 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004667 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004668 return 0
4669
4670
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004671def CreateDescriptionFromLog(args):
4672 """Pulls out the commit log to use as a base for the CL description."""
4673 log_args = []
4674 if len(args) == 1 and not args[0].endswith('.'):
4675 log_args = [args[0] + '..']
4676 elif len(args) == 1 and args[0].endswith('...'):
4677 log_args = [args[0][:-1]]
4678 elif len(args) == 2:
4679 log_args = [args[0] + '..' + args[1]]
4680 else:
4681 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004682 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683
4684
thestig@chromium.org44202a22014-03-11 19:22:18 +00004685def CMDlint(parser, args):
4686 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004687 parser.add_option('--filter', action='append', metavar='-x,+y',
4688 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004689 auth.add_auth_options(parser)
4690 options, args = parser.parse_args(args)
4691 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004692
4693 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004694 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004695 try:
4696 import cpplint
4697 import cpplint_chromium
4698 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004699 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004700 return 1
4701
4702 # Change the current working directory before calling lint so that it
4703 # shows the correct base.
4704 previous_cwd = os.getcwd()
4705 os.chdir(settings.GetRoot())
4706 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004707 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004708 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4709 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004710 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004711 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004712 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004713
4714 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004715 command = args + files
4716 if options.filter:
4717 command = ['--filter=' + ','.join(options.filter)] + command
4718 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004719
4720 white_regex = re.compile(settings.GetLintRegex())
4721 black_regex = re.compile(settings.GetLintIgnoreRegex())
4722 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4723 for filename in filenames:
4724 if white_regex.match(filename):
4725 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004726 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004727 else:
4728 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4729 extra_check_functions)
4730 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004731 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004732 finally:
4733 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004734 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004735 if cpplint._cpplint_state.error_count != 0:
4736 return 1
4737 return 0
4738
4739
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004740def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004741 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004742 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004743 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004744 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004745 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004746 auth.add_auth_options(parser)
4747 options, args = parser.parse_args(args)
4748 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004749
sbc@chromium.org71437c02015-04-09 19:29:40 +00004750 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004751 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004752 return 1
4753
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004754 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004755 if args:
4756 base_branch = args[0]
4757 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004758 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004759 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004760
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004761 cl.RunHook(
4762 committing=not options.upload,
4763 may_prompt=False,
4764 verbose=options.verbose,
4765 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004766 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004767
4768
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004769def GenerateGerritChangeId(message):
4770 """Returns Ixxxxxx...xxx change id.
4771
4772 Works the same way as
4773 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4774 but can be called on demand on all platforms.
4775
4776 The basic idea is to generate git hash of a state of the tree, original commit
4777 message, author/committer info and timestamps.
4778 """
4779 lines = []
4780 tree_hash = RunGitSilent(['write-tree'])
4781 lines.append('tree %s' % tree_hash.strip())
4782 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4783 if code == 0:
4784 lines.append('parent %s' % parent.strip())
4785 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4786 lines.append('author %s' % author.strip())
4787 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4788 lines.append('committer %s' % committer.strip())
4789 lines.append('')
4790 # Note: Gerrit's commit-hook actually cleans message of some lines and
4791 # whitespace. This code is not doing this, but it clearly won't decrease
4792 # entropy.
4793 lines.append(message)
4794 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4795 stdin='\n'.join(lines))
4796 return 'I%s' % change_hash.strip()
4797
4798
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004799def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004800 """Computes the remote branch ref to use for the CL.
4801
4802 Args:
4803 remote (str): The git remote for the CL.
4804 remote_branch (str): The git remote branch for the CL.
4805 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004806 """
4807 if not (remote and remote_branch):
4808 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004809
wittman@chromium.org455dc922015-01-26 20:15:50 +00004810 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004811 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004812 # refs, which are then translated into the remote full symbolic refs
4813 # below.
4814 if '/' not in target_branch:
4815 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4816 else:
4817 prefix_replacements = (
4818 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4819 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4820 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4821 )
4822 match = None
4823 for regex, replacement in prefix_replacements:
4824 match = re.search(regex, target_branch)
4825 if match:
4826 remote_branch = target_branch.replace(match.group(0), replacement)
4827 break
4828 if not match:
4829 # This is a branch path but not one we recognize; use as-is.
4830 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004831 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4832 # Handle the refs that need to land in different refs.
4833 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004834
wittman@chromium.org455dc922015-01-26 20:15:50 +00004835 # Create the true path to the remote branch.
4836 # Does the following translation:
4837 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4838 # * refs/remotes/origin/master -> refs/heads/master
4839 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4840 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4841 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4842 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4843 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4844 'refs/heads/')
4845 elif remote_branch.startswith('refs/remotes/branch-heads'):
4846 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004847
wittman@chromium.org455dc922015-01-26 20:15:50 +00004848 return remote_branch
4849
4850
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004851def cleanup_list(l):
4852 """Fixes a list so that comma separated items are put as individual items.
4853
4854 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4855 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4856 """
4857 items = sum((i.split(',') for i in l), [])
4858 stripped_items = (i.strip() for i in items)
4859 return sorted(filter(None, stripped_items))
4860
4861
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004862@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004863def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004864 """Uploads the current changelist to codereview.
4865
4866 Can skip dependency patchset uploads for a branch by running:
4867 git config branch.branch_name.skip-deps-uploads True
4868 To unset run:
4869 git config --unset branch.branch_name.skip-deps-uploads
4870 Can also set the above globally by using the --global flag.
4871 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004872 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4873 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004874 parser.add_option('--bypass-watchlists', action='store_true',
4875 dest='bypass_watchlists',
4876 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004877 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004878 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004879 parser.add_option('--message', '-m', dest='message',
4880 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004881 parser.add_option('-b', '--bug',
4882 help='pre-populate the bug number(s) for this issue. '
4883 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004884 parser.add_option('--message-file', dest='message_file',
4885 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004886 parser.add_option('--title', '-t', dest='title',
4887 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004888 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004889 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004890 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004891 parser.add_option('--tbrs',
4892 action='append', default=[],
4893 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004894 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004895 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004896 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004897 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004898 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004899 parser.add_option('--emulate_svn_auto_props',
4900 '--emulate-svn-auto-props',
4901 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004902 dest="emulate_svn_auto_props",
4903 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004904 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004905 help='tell the commit queue to commit this patchset; '
4906 'implies --send-mail')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004907 parser.add_option('--private', action='store_true',
4908 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004909 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004910 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004911 metavar='TARGET',
4912 help='Apply CL to remote ref TARGET. ' +
4913 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004914 parser.add_option('--squash', action='store_true',
4915 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004916 parser.add_option('--no-squash', action='store_true',
4917 help='Don\'t squash multiple commits into one ' +
4918 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004919 parser.add_option('--topic', default=None,
4920 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004921 parser.add_option('--email', default=None,
4922 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004923 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4924 const='TBR', help='add a set of OWNERS to TBR')
4925 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4926 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004927 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4928 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004929 help='Send the patchset to do a CQ dry run right after '
4930 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004931 parser.add_option('--dependencies', action='store_true',
4932 help='Uploads CLs of all the local branches that depend on '
4933 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004934
rmistry@google.com2dd99862015-06-22 12:22:18 +00004935 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004936 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004937 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004938 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004939 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004940 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004941 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004942
sbc@chromium.org71437c02015-04-09 19:29:40 +00004943 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004944 return 1
4945
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004946 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004947 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004948 options.cc = cleanup_list(options.cc)
4949
tandriib80458a2016-06-23 12:20:07 -07004950 if options.message_file:
4951 if options.message:
4952 parser.error('only one of --message and --message-file allowed.')
4953 options.message = gclient_utils.FileRead(options.message_file)
4954 options.message_file = None
4955
tandrii4d0545a2016-07-06 03:56:49 -07004956 if options.cq_dry_run and options.use_commit_queue:
4957 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4958
Aaron Gableedbc4132017-09-11 13:22:28 -07004959 if options.use_commit_queue:
4960 options.send_mail = True
4961
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004962 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4963 settings.GetIsGerrit()
4964
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004965 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004966 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004967
4968
Francois Dorayd42c6812017-05-30 15:10:20 -04004969@subcommand.usage('--description=<description file>')
4970def CMDsplit(parser, args):
4971 """Splits a branch into smaller branches and uploads CLs.
4972
4973 Creates a branch and uploads a CL for each group of files modified in the
4974 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004975 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004976 the shared OWNERS file.
4977 """
4978 parser.add_option("-d", "--description", dest="description_file",
4979 help="A text file containing a CL description. ")
4980 parser.add_option("-c", "--comment", dest="comment_file",
4981 help="A text file containing a CL comment.")
4982 options, _ = parser.parse_args(args)
4983
4984 if not options.description_file:
4985 parser.error('No --description flag specified.')
4986
4987 def WrappedCMDupload(args):
4988 return CMDupload(OptionParser(), args)
4989
4990 return split_cl.SplitCl(options.description_file, options.comment_file,
4991 Changelist, WrappedCMDupload)
4992
4993
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004994@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004995def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004996 """DEPRECATED: Used to commit the current changelist via git-svn."""
4997 message = ('git-cl no longer supports committing to SVN repositories via '
4998 'git-svn. You probably want to use `git cl land` instead.')
4999 print(message)
5000 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005001
5002
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005003# Two special branches used by git cl land.
5004MERGE_BRANCH = 'git-cl-commit'
5005CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5006
5007
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005008@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005009def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005010 """Commits the current changelist via git.
5011
5012 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5013 upstream and closes the issue automatically and atomically.
5014
5015 Otherwise (in case of Rietveld):
5016 Squashes branch into a single commit.
5017 Updates commit message with metadata (e.g. pointer to review).
5018 Pushes the code upstream.
5019 Updates review and closes.
5020 """
5021 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5022 help='bypass upload presubmit hook')
5023 parser.add_option('-m', dest='message',
5024 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005025 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005026 help="force yes to questions (don't prompt)")
5027 parser.add_option('-c', dest='contributor',
5028 help="external contributor for patch (appended to " +
5029 "description and used as author for git). Should be " +
5030 "formatted as 'First Last <email@example.com>'")
5031 add_git_similarity(parser)
5032 auth.add_auth_options(parser)
5033 (options, args) = parser.parse_args(args)
5034 auth_config = auth.extract_auth_config_from_options(options)
5035
5036 cl = Changelist(auth_config=auth_config)
5037
5038 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5039 if cl.IsGerrit():
5040 if options.message:
5041 # This could be implemented, but it requires sending a new patch to
5042 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5043 # Besides, Gerrit has the ability to change the commit message on submit
5044 # automatically, thus there is no need to support this option (so far?).
5045 parser.error('-m MESSAGE option is not supported for Gerrit.')
5046 if options.contributor:
5047 parser.error(
5048 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5049 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5050 'the contributor\'s "name <email>". If you can\'t upload such a '
5051 'commit for review, contact your repository admin and request'
5052 '"Forge-Author" permission.')
5053 if not cl.GetIssue():
5054 DieWithError('You must upload the change first to Gerrit.\n'
5055 ' If you would rather have `git cl land` upload '
5056 'automatically for you, see http://crbug.com/642759')
5057 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5058 options.verbose)
5059
5060 current = cl.GetBranch()
5061 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5062 if remote == '.':
5063 print()
5064 print('Attempting to push branch %r into another local branch!' % current)
5065 print()
5066 print('Either reparent this branch on top of origin/master:')
5067 print(' git reparent-branch --root')
5068 print()
5069 print('OR run `git rebase-update` if you think the parent branch is ')
5070 print('already committed.')
5071 print()
5072 print(' Current parent: %r' % upstream_branch)
5073 return 1
5074
5075 if not args:
5076 # Default to merging against our best guess of the upstream branch.
5077 args = [cl.GetUpstreamBranch()]
5078
5079 if options.contributor:
5080 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005081 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005082 return 1
5083
5084 base_branch = args[0]
5085
5086 if git_common.is_dirty_git_tree('land'):
5087 return 1
5088
5089 # This rev-list syntax means "show all commits not in my branch that
5090 # are in base_branch".
5091 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5092 base_branch]).splitlines()
5093 if upstream_commits:
5094 print('Base branch "%s" has %d commits '
5095 'not in this branch.' % (base_branch, len(upstream_commits)))
5096 print('Run "git merge %s" before attempting to land.' % base_branch)
5097 return 1
5098
5099 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5100 if not options.bypass_hooks:
5101 author = None
5102 if options.contributor:
5103 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5104 hook_results = cl.RunHook(
5105 committing=True,
5106 may_prompt=not options.force,
5107 verbose=options.verbose,
5108 change=cl.GetChange(merge_base, author))
5109 if not hook_results.should_continue():
5110 return 1
5111
5112 # Check the tree status if the tree status URL is set.
5113 status = GetTreeStatus()
5114 if 'closed' == status:
5115 print('The tree is closed. Please wait for it to reopen. Use '
5116 '"git cl land --bypass-hooks" to commit on a closed tree.')
5117 return 1
5118 elif 'unknown' == status:
5119 print('Unable to determine tree status. Please verify manually and '
5120 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5121 return 1
5122
5123 change_desc = ChangeDescription(options.message)
5124 if not change_desc.description and cl.GetIssue():
5125 change_desc = ChangeDescription(cl.GetDescription())
5126
5127 if not change_desc.description:
5128 if not cl.GetIssue() and options.bypass_hooks:
5129 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5130 else:
5131 print('No description set.')
5132 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5133 return 1
5134
5135 # Keep a separate copy for the commit message, because the commit message
5136 # contains the link to the Rietveld issue, while the Rietveld message contains
5137 # the commit viewvc url.
5138 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005139 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005140 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005141
5142 commit_desc = ChangeDescription(change_desc.description)
5143 if cl.GetIssue():
5144 # Xcode won't linkify this URL unless there is a non-whitespace character
5145 # after it. Add a period on a new line to circumvent this. Also add a space
5146 # before the period to make sure that Gitiles continues to correctly resolve
5147 # the URL.
5148 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5149 if options.contributor:
5150 commit_desc.append_footer('Patch from %s.' % options.contributor)
5151
5152 print('Description:')
5153 print(commit_desc.description)
5154
5155 branches = [merge_base, cl.GetBranchRef()]
5156 if not options.force:
5157 print_stats(options.similarity, options.find_copies, branches)
5158
5159 # We want to squash all this branch's commits into one commit with the proper
5160 # description. We do this by doing a "reset --soft" to the base branch (which
5161 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005162 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005163 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5164 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5165 result = RunGitWithCode(showref_cmd)
5166 if result[0] == 0:
5167 RunGit(['branch', '-D', branch])
5168
5169 # We might be in a directory that's present in this branch but not in the
5170 # trunk. Move up to the top of the tree so that git commands that expect a
5171 # valid CWD won't fail after we check out the merge branch.
5172 rel_base_path = settings.GetRelativeRoot()
5173 if rel_base_path:
5174 os.chdir(rel_base_path)
5175
5176 # Stuff our change into the merge branch.
5177 # We wrap in a try...finally block so if anything goes wrong,
5178 # we clean up the branches.
5179 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005180 revision = None
5181 try:
5182 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5183 RunGit(['reset', '--soft', merge_base])
5184 if options.contributor:
5185 RunGit(
5186 [
5187 'commit', '--author', options.contributor,
5188 '-m', commit_desc.description,
5189 ])
5190 else:
5191 RunGit(['commit', '-m', commit_desc.description])
5192
5193 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5194 mirror = settings.GetGitMirror(remote)
5195 if mirror:
5196 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005197 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005198 else:
5199 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005200 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005201 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5202
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005203 retcode = PushToGitWithAutoRebase(
5204 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005205 if retcode == 0:
5206 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005207 if git_numberer_enabled:
5208 change_desc = ChangeDescription(
5209 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005210 except: # pylint: disable=bare-except
5211 if _IS_BEING_TESTED:
5212 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5213 + '-' * 30 + '8<' + '-' * 30)
5214 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5215 raise
5216 finally:
5217 # And then swap back to the original branch and clean up.
5218 RunGit(['checkout', '-q', cl.GetBranch()])
5219 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005220 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005221
5222 if not revision:
5223 print('Failed to push. If this persists, please file a bug.')
5224 return 1
5225
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005226 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005227 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005228 if viewvc_url and revision:
5229 change_desc.append_footer(
5230 'Committed: %s%s' % (viewvc_url, revision))
5231 elif revision:
5232 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005233 print('Closing issue '
5234 '(you may be prompted for your codereview password)...')
5235 cl.UpdateDescription(change_desc.description)
5236 cl.CloseIssue()
5237 props = cl.GetIssueProperties()
5238 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005239 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5240 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005241 if options.bypass_hooks:
5242 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5243 else:
5244 comment += ' (presubmit successful).'
5245 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5246
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005247 if os.path.isfile(POSTUPSTREAM_HOOK):
5248 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5249
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005250 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005251
5252
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005253def PushToGitWithAutoRebase(remote, branch, original_description,
5254 git_numberer_enabled, max_attempts=3):
5255 """Pushes current HEAD commit on top of remote's branch.
5256
5257 Attempts to fetch and autorebase on push failures.
5258 Adds git number footers on the fly.
5259
5260 Returns integer code from last command.
5261 """
5262 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5263 code = 0
5264 attempts_left = max_attempts
5265 while attempts_left:
5266 attempts_left -= 1
5267 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5268
5269 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5270 # If fetch fails, retry.
5271 print('Fetching %s/%s...' % (remote, branch))
5272 code, out = RunGitWithCode(
5273 ['retry', 'fetch', remote,
5274 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5275 if code:
5276 print('Fetch failed with exit code %d.' % code)
5277 print(out.strip())
5278 continue
5279
5280 print('Cherry-picking commit on top of latest %s' % branch)
5281 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5282 suppress_stderr=True)
5283 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5284 code, out = RunGitWithCode(['cherry-pick', cherry])
5285 if code:
5286 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5287 'the following files have merge conflicts:' %
5288 (branch, parent_hash))
5289 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5290 print('Please rebase your patch and try again.')
5291 RunGitWithCode(['cherry-pick', '--abort'])
5292 break
5293
5294 commit_desc = ChangeDescription(original_description)
5295 if git_numberer_enabled:
5296 logging.debug('Adding git number footers')
5297 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5298 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5299 branch)
5300 # Ensure timestamps are monotonically increasing.
5301 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5302 _get_committer_timestamp('HEAD'))
5303 _git_amend_head(commit_desc.description, timestamp)
5304
5305 code, out = RunGitWithCode(
5306 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5307 print(out)
5308 if code == 0:
5309 break
5310 if IsFatalPushFailure(out):
5311 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005312 'user.email are correct and you have push access to the repo.\n'
5313 'Hint: run command below to diangose common Git/Gerrit credential '
5314 'problems:\n'
5315 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005316 break
5317 return code
5318
5319
5320def IsFatalPushFailure(push_stdout):
5321 """True if retrying push won't help."""
5322 return '(prohibited by Gerrit)' in push_stdout
5323
5324
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005325@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005326def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005327 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005328 parser.add_option('-b', dest='newbranch',
5329 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005330 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005331 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005332 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005333 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005334 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005335 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005336 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005337 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005338 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005339 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005340
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005341
5342 group = optparse.OptionGroup(
5343 parser,
5344 'Options for continuing work on the current issue uploaded from a '
5345 'different clone (e.g. different machine). Must be used independently '
5346 'from the other options. No issue number should be specified, and the '
5347 'branch must have an issue number associated with it')
5348 group.add_option('--reapply', action='store_true', dest='reapply',
5349 help='Reset the branch and reapply the issue.\n'
5350 'CAUTION: This will undo any local changes in this '
5351 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005352
5353 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005354 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005355 parser.add_option_group(group)
5356
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005357 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005358 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005359 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005360 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005361 auth_config = auth.extract_auth_config_from_options(options)
5362
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005363 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005364 if options.newbranch:
5365 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005366 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005367 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005368
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005369 cl = Changelist(auth_config=auth_config,
5370 codereview=options.forced_codereview)
5371 if not cl.GetIssue():
5372 parser.error('current branch must have an associated issue')
5373
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005374 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005375 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005376 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005377
5378 RunGit(['reset', '--hard', upstream])
5379 if options.pull:
5380 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005381
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005382 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5383 options.directory)
5384
5385 if len(args) != 1 or not args[0]:
5386 parser.error('Must specify issue number or url')
5387
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005388 target_issue_arg = ParseIssueNumberArgument(args[0],
5389 options.forced_codereview)
5390 if not target_issue_arg.valid:
5391 parser.error('invalid codereview url or CL id')
5392
5393 cl_kwargs = {
5394 'auth_config': auth_config,
5395 'codereview_host': target_issue_arg.hostname,
5396 'codereview': options.forced_codereview,
5397 }
5398 detected_codereview_from_url = False
5399 if target_issue_arg.codereview and not options.forced_codereview:
5400 detected_codereview_from_url = True
5401 cl_kwargs['codereview'] = target_issue_arg.codereview
5402 cl_kwargs['issue'] = target_issue_arg.issue
5403
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005404 # We don't want uncommitted changes mixed up with the patch.
5405 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005406 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005407
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005408 if options.newbranch:
5409 if options.force:
5410 RunGit(['branch', '-D', options.newbranch],
5411 stderr=subprocess2.PIPE, error_ok=True)
5412 RunGit(['new-branch', options.newbranch])
5413
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005414 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005415
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005416 if cl.IsGerrit():
5417 if options.reject:
5418 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005419 if options.directory:
5420 parser.error('--directory is not supported with Gerrit codereview.')
5421
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005422 if detected_codereview_from_url:
5423 print('canonical issue/change URL: %s (type: %s)\n' %
5424 (cl.GetIssueURL(), target_issue_arg.codereview))
5425
5426 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005427 options.nocommit, options.directory,
5428 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005429
5430
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005431def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005432 """Fetches the tree status and returns either 'open', 'closed',
5433 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005434 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005435 if url:
5436 status = urllib2.urlopen(url).read().lower()
5437 if status.find('closed') != -1 or status == '0':
5438 return 'closed'
5439 elif status.find('open') != -1 or status == '1':
5440 return 'open'
5441 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005442 return 'unset'
5443
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005444
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005445def GetTreeStatusReason():
5446 """Fetches the tree status from a json url and returns the message
5447 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005448 url = settings.GetTreeStatusUrl()
5449 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005450 connection = urllib2.urlopen(json_url)
5451 status = json.loads(connection.read())
5452 connection.close()
5453 return status['message']
5454
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005455
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005456def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005457 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005458 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005459 status = GetTreeStatus()
5460 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005461 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005462 return 2
5463
vapiera7fbd5a2016-06-16 09:17:49 -07005464 print('The tree is %s' % status)
5465 print()
5466 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005467 if status != 'open':
5468 return 1
5469 return 0
5470
5471
maruel@chromium.org15192402012-09-06 12:38:29 +00005472def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005473 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005474 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005475 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005476 '-b', '--bot', action='append',
5477 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5478 'times to specify multiple builders. ex: '
5479 '"-b win_rel -b win_layout". See '
5480 'the try server waterfall for the builders name and the tests '
5481 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005482 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005483 '-B', '--bucket', default='',
5484 help=('Buildbucket bucket to send the try requests.'))
5485 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005486 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005487 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005488 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005489 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005490 help='Revision to use for the try job; default: the revision will '
5491 'be determined by the try recipe that builder runs, which usually '
5492 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005493 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005494 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005495 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005496 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005497 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005498 '--project',
5499 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005500 'in recipe to determine to which repository or directory to '
5501 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005502 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005503 '-p', '--property', dest='properties', action='append', default=[],
5504 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005505 'key2=value2 etc. The value will be treated as '
5506 'json if decodable, or as string otherwise. '
5507 'NOTE: using this may make your try job not usable for CQ, '
5508 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005509 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005510 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5511 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005512 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005513 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005514 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005515 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005516
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005517 if options.master and options.master.startswith('luci.'):
5518 parser.error(
5519 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005520 # Make sure that all properties are prop=value pairs.
5521 bad_params = [x for x in options.properties if '=' not in x]
5522 if bad_params:
5523 parser.error('Got properties with missing "=": %s' % bad_params)
5524
maruel@chromium.org15192402012-09-06 12:38:29 +00005525 if args:
5526 parser.error('Unknown arguments: %s' % args)
5527
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005528 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005529 if not cl.GetIssue():
5530 parser.error('Need to upload first')
5531
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005532 if cl.IsGerrit():
5533 # HACK: warm up Gerrit change detail cache to save on RPCs.
5534 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5535
tandriie113dfd2016-10-11 10:20:12 -07005536 error_message = cl.CannotTriggerTryJobReason()
5537 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005538 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005539
borenet6c0efe62016-10-19 08:13:29 -07005540 if options.bucket and options.master:
5541 parser.error('Only one of --bucket and --master may be used.')
5542
qyearsley1fdfcb62016-10-24 13:22:03 -07005543 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005544
qyearsleydd49f942016-10-28 11:57:22 -07005545 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5546 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005547 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005548 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005549 print('git cl try with no bots now defaults to CQ dry run.')
5550 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5551 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005552
borenet6c0efe62016-10-19 08:13:29 -07005553 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005554 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005555 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005556 'of bot requires an initial job from a parent (usually a builder). '
5557 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005558 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005559 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005560
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005561 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005562 # TODO(tandrii): Checking local patchset against remote patchset is only
5563 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5564 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005565 print('Warning: Codereview server has newer patchsets (%s) than most '
5566 'recent upload from local checkout (%s). Did a previous upload '
5567 'fail?\n'
5568 'By default, git cl try uses the latest patchset from '
5569 'codereview, continuing to use patchset %s.\n' %
5570 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005571
tandrii568043b2016-10-11 07:49:18 -07005572 try:
borenet6c0efe62016-10-19 08:13:29 -07005573 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5574 patchset)
tandrii568043b2016-10-11 07:49:18 -07005575 except BuildbucketResponseException as ex:
5576 print('ERROR: %s' % ex)
5577 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005578 return 0
5579
5580
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005581def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005582 """Prints info about try jobs associated with current CL."""
5583 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005584 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005585 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005586 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005587 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005588 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005589 '--color', action='store_true', default=setup_color.IS_TTY,
5590 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005591 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005592 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5593 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005594 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005595 '--json', help=('Path of JSON output file to write try job results to,'
5596 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005597 parser.add_option_group(group)
5598 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005599 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005600 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005601 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005602 if args:
5603 parser.error('Unrecognized args: %s' % ' '.join(args))
5604
5605 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005606 cl = Changelist(
5607 issue=options.issue, codereview=options.forced_codereview,
5608 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005609 if not cl.GetIssue():
5610 parser.error('Need to upload first')
5611
tandrii221ab252016-10-06 08:12:04 -07005612 patchset = options.patchset
5613 if not patchset:
5614 patchset = cl.GetMostRecentPatchset()
5615 if not patchset:
5616 parser.error('Codereview doesn\'t know about issue %s. '
5617 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005618 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005619 cl.GetIssue())
5620
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005621 # TODO(tandrii): Checking local patchset against remote patchset is only
5622 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5623 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005624 print('Warning: Codereview server has newer patchsets (%s) than most '
5625 'recent upload from local checkout (%s). Did a previous upload '
5626 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005627 'By default, git cl try-results uses the latest patchset from '
5628 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005629 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005630 try:
tandrii221ab252016-10-06 08:12:04 -07005631 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005632 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005633 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005634 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005635 if options.json:
5636 write_try_results_json(options.json, jobs)
5637 else:
5638 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005639 return 0
5640
5641
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005642@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005643def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005644 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005645 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005646 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005647 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005648
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005649 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005650 if args:
5651 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005652 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005653 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005654 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005655 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005656
5657 # Clear configured merge-base, if there is one.
5658 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005659 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005660 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005661 return 0
5662
5663
thestig@chromium.org00858c82013-12-02 23:08:03 +00005664def CMDweb(parser, args):
5665 """Opens the current CL in the web browser."""
5666 _, args = parser.parse_args(args)
5667 if args:
5668 parser.error('Unrecognized args: %s' % ' '.join(args))
5669
5670 issue_url = Changelist().GetIssueURL()
5671 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005672 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005673 return 1
5674
5675 webbrowser.open(issue_url)
5676 return 0
5677
5678
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005679def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005680 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005681 parser.add_option('-d', '--dry-run', action='store_true',
5682 help='trigger in dry run mode')
5683 parser.add_option('-c', '--clear', action='store_true',
5684 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005685 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005686 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005687 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005688 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005689 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005690 if args:
5691 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005692 if options.dry_run and options.clear:
5693 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5694
iannuccie53c9352016-08-17 14:40:40 -07005695 cl = Changelist(auth_config=auth_config, issue=options.issue,
5696 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005697 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005698 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005699 elif options.dry_run:
5700 state = _CQState.DRY_RUN
5701 else:
5702 state = _CQState.COMMIT
5703 if not cl.GetIssue():
5704 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005705 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005706 return 0
5707
5708
groby@chromium.org411034a2013-02-26 15:12:01 +00005709def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005710 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005711 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005712 auth.add_auth_options(parser)
5713 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005714 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005715 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005716 if args:
5717 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005718 cl = Changelist(auth_config=auth_config, issue=options.issue,
5719 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005720 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005721 if not cl.GetIssue():
5722 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005723 cl.CloseIssue()
5724 return 0
5725
5726
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005727def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005728 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005729 parser.add_option(
5730 '--stat',
5731 action='store_true',
5732 dest='stat',
5733 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005734 auth.add_auth_options(parser)
5735 options, args = parser.parse_args(args)
5736 auth_config = auth.extract_auth_config_from_options(options)
5737 if args:
5738 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005739
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005740 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005741 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005742 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005743 if not issue:
5744 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005745
Aaron Gablea718c3e2017-08-28 17:47:28 -07005746 base = cl._GitGetBranchConfigValue('last-upload-hash')
5747 if not base:
5748 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5749 if not base:
5750 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5751 revision_info = detail['revisions'][detail['current_revision']]
5752 fetch_info = revision_info['fetch']['http']
5753 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5754 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005755
Aaron Gablea718c3e2017-08-28 17:47:28 -07005756 cmd = ['git', 'diff']
5757 if options.stat:
5758 cmd.append('--stat')
5759 cmd.append(base)
5760 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005761
5762 return 0
5763
5764
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005765def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005766 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005767 parser.add_option(
5768 '--no-color',
5769 action='store_true',
5770 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005771 parser.add_option(
5772 '--batch',
5773 action='store_true',
5774 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005775 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005776 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005777 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005778
5779 author = RunGit(['config', 'user.email']).strip() or None
5780
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005781 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005782
5783 if args:
5784 if len(args) > 1:
5785 parser.error('Unknown args')
5786 base_branch = args[0]
5787 else:
5788 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005789 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005790
5791 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005792 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5793
5794 if options.batch:
5795 db = owners.Database(change.RepositoryRoot(), file, os.path)
5796 print('\n'.join(db.reviewers_for(affected_files, author)))
5797 return 0
5798
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005799 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005800 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005801 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005802 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005803 disable_color=options.no_color,
5804 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005805
5806
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005807def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005808 """Generates a diff command."""
5809 # Generate diff for the current branch's changes.
5810 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005811 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005812
5813 if args:
5814 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005815 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005816 diff_cmd.append(arg)
5817 else:
5818 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005819
5820 return diff_cmd
5821
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005822
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005823def MatchingFileType(file_name, extensions):
5824 """Returns true if the file name ends with one of the given extensions."""
5825 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005826
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005827
enne@chromium.org555cfe42014-01-29 18:21:39 +00005828@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005829def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005830 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005831 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005832 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005833 parser.add_option('--full', action='store_true',
5834 help='Reformat the full content of all touched files')
5835 parser.add_option('--dry-run', action='store_true',
5836 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005837 parser.add_option('--python', action='store_true',
5838 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005839 parser.add_option('--js', action='store_true',
5840 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005841 parser.add_option('--diff', action='store_true',
5842 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005843 parser.add_option('--presubmit', action='store_true',
5844 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005845 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005846
Daniel Chengc55eecf2016-12-30 03:11:02 -08005847 # Normalize any remaining args against the current path, so paths relative to
5848 # the current directory are still resolved as expected.
5849 args = [os.path.join(os.getcwd(), arg) for arg in args]
5850
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005851 # git diff generates paths against the root of the repository. Change
5852 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005853 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005854 if rel_base_path:
5855 os.chdir(rel_base_path)
5856
digit@chromium.org29e47272013-05-17 17:01:46 +00005857 # Grab the merge-base commit, i.e. the upstream commit of the current
5858 # branch when it was created or the last time it was rebased. This is
5859 # to cover the case where the user may have called "git fetch origin",
5860 # moving the origin branch to a newer commit, but hasn't rebased yet.
5861 upstream_commit = None
5862 cl = Changelist()
5863 upstream_branch = cl.GetUpstreamBranch()
5864 if upstream_branch:
5865 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5866 upstream_commit = upstream_commit.strip()
5867
5868 if not upstream_commit:
5869 DieWithError('Could not find base commit for this branch. '
5870 'Are you in detached state?')
5871
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005872 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5873 diff_output = RunGit(changed_files_cmd)
5874 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005875 # Filter out files deleted by this CL
5876 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005877
Christopher Lamc5ba6922017-01-24 11:19:14 +11005878 if opts.js:
5879 CLANG_EXTS.append('.js')
5880
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005881 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5882 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5883 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005884 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005885
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005886 top_dir = os.path.normpath(
5887 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5888
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005889 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5890 # formatted. This is used to block during the presubmit.
5891 return_value = 0
5892
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005893 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005894 # Locate the clang-format binary in the checkout
5895 try:
5896 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005897 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005898 DieWithError(e)
5899
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005900 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005901 cmd = [clang_format_tool]
5902 if not opts.dry_run and not opts.diff:
5903 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005904 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005905 if opts.diff:
5906 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005907 else:
5908 env = os.environ.copy()
5909 env['PATH'] = str(os.path.dirname(clang_format_tool))
5910 try:
5911 script = clang_format.FindClangFormatScriptInChromiumTree(
5912 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005913 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005914 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005915
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005916 cmd = [sys.executable, script, '-p0']
5917 if not opts.dry_run and not opts.diff:
5918 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005919
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005920 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5921 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005922
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005923 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5924 if opts.diff:
5925 sys.stdout.write(stdout)
5926 if opts.dry_run and len(stdout) > 0:
5927 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005928
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005929 # Similar code to above, but using yapf on .py files rather than clang-format
5930 # on C/C++ files
5931 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005932 yapf_tool = gclient_utils.FindExecutable('yapf')
5933 if yapf_tool is None:
5934 DieWithError('yapf not found in PATH')
5935
5936 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005937 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005938 cmd = [yapf_tool]
5939 if not opts.dry_run and not opts.diff:
5940 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005941 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005942 if opts.diff:
5943 sys.stdout.write(stdout)
5944 else:
5945 # TODO(sbc): yapf --lines mode still has some issues.
5946 # https://github.com/google/yapf/issues/154
5947 DieWithError('--python currently only works with --full')
5948
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005949 # Dart's formatter does not have the nice property of only operating on
5950 # modified chunks, so hard code full.
5951 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005952 try:
5953 command = [dart_format.FindDartFmtToolInChromiumTree()]
5954 if not opts.dry_run and not opts.diff:
5955 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005956 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005957
ppi@chromium.org6593d932016-03-03 15:41:15 +00005958 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005959 if opts.dry_run and stdout:
5960 return_value = 2
5961 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005962 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5963 'found in this checkout. Files in other languages are still '
5964 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005965
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005966 # Format GN build files. Always run on full build files for canonical form.
5967 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005968 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005969 if opts.dry_run or opts.diff:
5970 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005971 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005972 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5973 shell=sys.platform == 'win32',
5974 cwd=top_dir)
5975 if opts.dry_run and gn_ret == 2:
5976 return_value = 2 # Not formatted.
5977 elif opts.diff and gn_ret == 2:
5978 # TODO this should compute and print the actual diff.
5979 print("This change has GN build file diff for " + gn_diff_file)
5980 elif gn_ret != 0:
5981 # For non-dry run cases (and non-2 return values for dry-run), a
5982 # nonzero error code indicates a failure, probably because the file
5983 # doesn't parse.
5984 DieWithError("gn format failed on " + gn_diff_file +
5985 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005986
Ilya Shermane081cbe2017-08-15 17:51:04 -07005987 # Skip the metrics formatting from the global presubmit hook. These files have
5988 # a separate presubmit hook that issues an error if the files need formatting,
5989 # whereas the top-level presubmit script merely issues a warning. Formatting
5990 # these files is somewhat slow, so it's important not to duplicate the work.
5991 if not opts.presubmit:
5992 for xml_dir in GetDirtyMetricsDirs(diff_files):
5993 tool_dir = os.path.join(top_dir, xml_dir)
5994 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5995 if opts.dry_run or opts.diff:
5996 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07005997 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07005998 if opts.diff:
5999 sys.stdout.write(stdout)
6000 if opts.dry_run and stdout:
6001 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006002
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006003 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006004
Steven Holte2e664bf2017-04-21 13:10:47 -07006005def GetDirtyMetricsDirs(diff_files):
6006 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6007 metrics_xml_dirs = [
6008 os.path.join('tools', 'metrics', 'actions'),
6009 os.path.join('tools', 'metrics', 'histograms'),
6010 os.path.join('tools', 'metrics', 'rappor'),
6011 os.path.join('tools', 'metrics', 'ukm')]
6012 for xml_dir in metrics_xml_dirs:
6013 if any(file.startswith(xml_dir) for file in xml_diff_files):
6014 yield xml_dir
6015
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006016
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006017@subcommand.usage('<codereview url or issue id>')
6018def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006019 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006020 _, args = parser.parse_args(args)
6021
6022 if len(args) != 1:
6023 parser.print_help()
6024 return 1
6025
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006026 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006027 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006028 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006029
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006030 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006031
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006032 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006033 output = RunGit(['config', '--local', '--get-regexp',
6034 r'branch\..*\.%s' % issueprefix],
6035 error_ok=True)
6036 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006037 if issue == target_issue:
6038 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006039
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006040 branches = []
6041 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006042 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006043 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006044 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006045 return 1
6046 if len(branches) == 1:
6047 RunGit(['checkout', branches[0]])
6048 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006049 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006050 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006051 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006052 which = raw_input('Choose by index: ')
6053 try:
6054 RunGit(['checkout', branches[int(which)]])
6055 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006056 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006057 return 1
6058
6059 return 0
6060
6061
maruel@chromium.org29404b52014-09-08 22:58:00 +00006062def CMDlol(parser, args):
6063 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006064 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006065 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6066 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6067 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006068 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006069 return 0
6070
6071
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006072class OptionParser(optparse.OptionParser):
6073 """Creates the option parse and add --verbose support."""
6074 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006075 optparse.OptionParser.__init__(
6076 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006077 self.add_option(
6078 '-v', '--verbose', action='count', default=0,
6079 help='Use 2 times for more debugging info')
6080
6081 def parse_args(self, args=None, values=None):
6082 options, args = optparse.OptionParser.parse_args(self, args, values)
6083 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006084 logging.basicConfig(
6085 level=levels[min(options.verbose, len(levels) - 1)],
6086 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6087 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006088 return options, args
6089
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006090
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006091def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006092 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006093 print('\nYour python version %s is unsupported, please upgrade.\n' %
6094 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006095 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006096
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006097 # Reload settings.
6098 global settings
6099 settings = Settings()
6100
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006101 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006102 dispatcher = subcommand.CommandDispatcher(__name__)
6103 try:
6104 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006105 except auth.AuthenticationError as e:
6106 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006107 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006108 if e.code != 500:
6109 raise
6110 DieWithError(
6111 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6112 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006113 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006114
6115
6116if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006117 # These affect sys.stdout so do it outside of main() to simplify mocks in
6118 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006119 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006120 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006121 try:
6122 sys.exit(main(sys.argv[1:]))
6123 except KeyboardInterrupt:
6124 sys.stderr.write('interrupted\n')
6125 sys.exit(1)