blob: 335b8d0bc1d5375d878aaef66f6de3e0ec08ae35 [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
Dominic Battre7d1c4842017-10-27 09:17:28 +02002905 # Extract bug number from branch name.
2906 bug = options.bug
2907 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2908 if not bug and match:
2909 bug = match.group(1)
2910
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002911 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002912 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002913 if self.GetIssue():
2914 # Try to get the message from a previous upload.
2915 message = self.GetDescription()
2916 if not message:
2917 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002918 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002919 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002920 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002921 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002922 # When uploading a subsequent patchset, -m|--message is taken
2923 # as the patchset title if --title was not provided.
2924 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002925 else:
2926 default_title = RunGit(
2927 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002928 if options.force:
2929 title = default_title
2930 else:
2931 title = ask_for_data(
2932 'Title for patchset [%s]: ' % default_title) or default_title
2933 if title == default_title:
2934 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002935 change_id = self._GetChangeDetail()['change_id']
2936 while True:
2937 footer_change_ids = git_footers.get_footer_change_id(message)
2938 if footer_change_ids == [change_id]:
2939 break
2940 if not footer_change_ids:
2941 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002942 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002943 continue
2944 # There is already a valid footer but with different or several ids.
2945 # Doing this automatically is non-trivial as we don't want to lose
2946 # existing other footers, yet we want to append just 1 desired
2947 # Change-Id. Thus, just create a new footer, but let user verify the
2948 # new description.
2949 message = '%s\n\nChange-Id: %s' % (message, change_id)
2950 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002951 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002952 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002953 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002954 'Please, check the proposed correction to the description, '
2955 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2956 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2957 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002958 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002959 if not options.force:
2960 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002961 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002962 message = change_desc.description
2963 if not message:
2964 DieWithError("Description is empty. Aborting...")
2965 # Continue the while loop.
2966 # Sanity check of this code - we should end up with proper message
2967 # footer.
2968 assert [change_id] == git_footers.get_footer_change_id(message)
2969 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002970 else: # if not self.GetIssue()
2971 if options.message:
2972 message = options.message
2973 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002974 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002975 if options.title:
2976 message = options.title + '\n\n' + message
2977 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002978
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002979 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002980 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002981 # On first upload, patchset title is always this string, while
2982 # --title flag gets converted to first line of message.
2983 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002984 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002985 if not change_desc.description:
2986 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002987 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002988 if len(change_ids) > 1:
2989 DieWithError('too many Change-Id footers, at most 1 allowed.')
2990 if not change_ids:
2991 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002992 change_desc.set_description(git_footers.add_footer_change_id(
2993 change_desc.description,
2994 GenerateGerritChangeId(change_desc.description)))
2995 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002996 assert len(change_ids) == 1
2997 change_id = change_ids[0]
2998
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002999 if options.reviewers or options.tbrs or options.add_owners_to:
3000 change_desc.update_reviewers(options.reviewers, options.tbrs,
3001 options.add_owners_to, change)
3002
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003003 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003004 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
3005 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003006 tree = RunGit(['rev-parse', 'HEAD:']).strip()
3007 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003008 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003009 else:
3010 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003011 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003012 if not change_desc.description:
3013 DieWithError("Description is empty. Aborting...")
3014
3015 if not git_footers.get_footer_change_id(change_desc.description):
3016 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003017 change_desc.set_description(
3018 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003019 if options.reviewers or options.tbrs or options.add_owners_to:
3020 change_desc.update_reviewers(options.reviewers, options.tbrs,
3021 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003022 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003023 # For no-squash mode, we assume the remote called "origin" is the one we
3024 # want. It is not worthwhile to support different workflows for
3025 # no-squash mode.
3026 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003027 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3028
3029 assert change_desc
3030 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3031 ref_to_push)]).splitlines()
3032 if len(commits) > 1:
3033 print('WARNING: This will upload %d commits. Run the following command '
3034 'to see which commits will be uploaded: ' % len(commits))
3035 print('git log %s..%s' % (parent, ref_to_push))
3036 print('You can also use `git squash-branch` to squash these into a '
3037 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003038 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003039
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003040 if options.reviewers or options.tbrs or options.add_owners_to:
3041 change_desc.update_reviewers(options.reviewers, options.tbrs,
3042 options.add_owners_to, change)
3043
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003044 # Extra options that can be specified at push time. Doc:
3045 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003046 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003047
Aaron Gable844cf292017-06-28 11:32:59 -07003048 # By default, new changes are started in WIP mode, and subsequent patchsets
3049 # don't send email. At any time, passing --send-mail will mark the change
3050 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003051 if options.send_mail:
3052 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003053 refspec_opts.append('notify=ALL')
Aaron Gableafd52772017-06-27 16:40:10 -07003054 else:
Aaron Gable844cf292017-06-28 11:32:59 -07003055 if not self.GetIssue():
3056 refspec_opts.append('wip')
3057 else:
3058 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003059
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003060 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003061 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003062
Aaron Gable9b713dd2016-12-14 16:04:21 -08003063 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003064 if not re.match(r'^[\w ]+$', title):
3065 title = re.sub(r'[^\w ]', '', title)
3066 if not automatic_title:
3067 print('WARNING: Patchset title may only contain alphanumeric chars '
3068 'and spaces. You can edit it in the UI. '
3069 'See https://crbug.com/663787.\n'
3070 'Cleaned up title: %s' % title)
3071 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3072 # reverse on its side.
3073 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003074
agablec6787972016-09-09 16:13:34 -07003075 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003076 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003077
rmistry9eadede2016-09-19 11:22:43 -07003078 if options.topic:
3079 # Documentation on Gerrit topics is here:
3080 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003081 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003082
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003083 refspec_suffix = ''
3084 if refspec_opts:
3085 refspec_suffix = '%' + ','.join(refspec_opts)
3086 assert ' ' not in refspec_suffix, (
3087 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3088 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3089
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003090 try:
3091 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003092 ['git', 'push', self.GetRemoteUrl(), refspec],
3093 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003094 # Flush after every line: useful for seeing progress when running as
3095 # recipe.
3096 filter_fn=lambda _: sys.stdout.flush())
3097 except subprocess2.CalledProcessError:
3098 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003099 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003100 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003101 'credential problems:\n'
3102 ' git cl creds-check\n',
3103 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003104
3105 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003106 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003107 change_numbers = [m.group(1)
3108 for m in map(regex.match, push_stdout.splitlines())
3109 if m]
3110 if len(change_numbers) != 1:
3111 DieWithError(
3112 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003113 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003114 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003115 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003116
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003117 reviewers = sorted(change_desc.get_reviewers())
3118
tandrii88189772016-09-29 04:29:57 -07003119 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003120 if not options.private:
3121 cc = self.GetCCList().split(',')
3122 else:
3123 cc = []
tandrii88189772016-09-29 04:29:57 -07003124 if options.cc:
3125 cc.extend(options.cc)
3126 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003127 if change_desc.get_cced():
3128 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003129
3130 gerrit_util.AddReviewers(
3131 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3132 notify=bool(options.send_mail))
3133
Aaron Gablefd238082017-06-07 13:42:34 -07003134 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003135 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3136 score = 1
3137 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3138 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3139 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003140 gerrit_util.SetReview(
3141 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003142 msg='Self-approving for TBR',
3143 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003144
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003145 return 0
3146
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003147 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3148 change_desc):
3149 """Computes parent of the generated commit to be uploaded to Gerrit.
3150
3151 Returns revision or a ref name.
3152 """
3153 if custom_cl_base:
3154 # Try to avoid creating additional unintended CLs when uploading, unless
3155 # user wants to take this risk.
3156 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3157 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3158 local_ref_of_target_remote])
3159 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003160 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003161 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3162 'If you proceed with upload, more than 1 CL may be created by '
3163 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3164 'If you are certain that specified base `%s` has already been '
3165 'uploaded to Gerrit as another CL, you may proceed.\n' %
3166 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3167 if not force:
3168 confirm_or_exit(
3169 'Do you take responsibility for cleaning up potential mess '
3170 'resulting from proceeding with upload?',
3171 action='upload')
3172 return custom_cl_base
3173
Aaron Gablef97e33d2017-03-30 15:44:27 -07003174 if remote != '.':
3175 return self.GetCommonAncestorWithUpstream()
3176
3177 # If our upstream branch is local, we base our squashed commit on its
3178 # squashed version.
3179 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3180
Aaron Gablef97e33d2017-03-30 15:44:27 -07003181 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003182 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003183
3184 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003185 # TODO(tandrii): consider checking parent change in Gerrit and using its
3186 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3187 # the tree hash of the parent branch. The upside is less likely bogus
3188 # requests to reupload parent change just because it's uploadhash is
3189 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003190 parent = RunGit(['config',
3191 'branch.%s.gerritsquashhash' % upstream_branch_name],
3192 error_ok=True).strip()
3193 # Verify that the upstream branch has been uploaded too, otherwise
3194 # Gerrit will create additional CLs when uploading.
3195 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3196 RunGitSilent(['rev-parse', parent + ':'])):
3197 DieWithError(
3198 '\nUpload upstream branch %s first.\n'
3199 'It is likely that this branch has been rebased since its last '
3200 'upload, so you just need to upload it again.\n'
3201 '(If you uploaded it with --no-squash, then branch dependencies '
3202 'are not supported, and you should reupload with --squash.)'
3203 % upstream_branch_name,
3204 change_desc)
3205 return parent
3206
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003207 def _AddChangeIdToCommitMessage(self, options, args):
3208 """Re-commits using the current message, assumes the commit hook is in
3209 place.
3210 """
3211 log_desc = options.message or CreateDescriptionFromLog(args)
3212 git_command = ['commit', '--amend', '-m', log_desc]
3213 RunGit(git_command)
3214 new_log_desc = CreateDescriptionFromLog(args)
3215 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003216 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003217 return new_log_desc
3218 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003219 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003220
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003221 def SetCQState(self, new_state):
3222 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003223 vote_map = {
3224 _CQState.NONE: 0,
3225 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003226 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003227 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003228 labels = {'Commit-Queue': vote_map[new_state]}
3229 notify = False if new_state == _CQState.DRY_RUN else None
3230 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3231 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003232
tandriie113dfd2016-10-11 10:20:12 -07003233 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003234 try:
3235 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003236 except GerritChangeNotExists:
3237 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003238
3239 if data['status'] in ('ABANDONED', 'MERGED'):
3240 return 'CL %s is closed' % self.GetIssue()
3241
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003242 def GetTryJobProperties(self, patchset=None):
3243 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003244 data = self._GetChangeDetail(['ALL_REVISIONS'])
3245 patchset = int(patchset or self.GetPatchset())
3246 assert patchset
3247 revision_data = None # Pylint wants it to be defined.
3248 for revision_data in data['revisions'].itervalues():
3249 if int(revision_data['_number']) == patchset:
3250 break
3251 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003252 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003253 (patchset, self.GetIssue()))
3254 return {
3255 'patch_issue': self.GetIssue(),
3256 'patch_set': patchset or self.GetPatchset(),
3257 'patch_project': data['project'],
3258 'patch_storage': 'gerrit',
3259 'patch_ref': revision_data['fetch']['http']['ref'],
3260 'patch_repository_url': revision_data['fetch']['http']['url'],
3261 'patch_gerrit_url': self.GetCodereviewServer(),
3262 }
tandriie113dfd2016-10-11 10:20:12 -07003263
tandriide281ae2016-10-12 06:02:30 -07003264 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003265 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003266
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003267
3268_CODEREVIEW_IMPLEMENTATIONS = {
3269 'rietveld': _RietveldChangelistImpl,
3270 'gerrit': _GerritChangelistImpl,
3271}
3272
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003273
iannuccie53c9352016-08-17 14:40:40 -07003274def _add_codereview_issue_select_options(parser, extra=""):
3275 _add_codereview_select_options(parser)
3276
3277 text = ('Operate on this issue number instead of the current branch\'s '
3278 'implicit issue.')
3279 if extra:
3280 text += ' '+extra
3281 parser.add_option('-i', '--issue', type=int, help=text)
3282
3283
3284def _process_codereview_issue_select_options(parser, options):
3285 _process_codereview_select_options(parser, options)
3286 if options.issue is not None and not options.forced_codereview:
3287 parser.error('--issue must be specified with either --rietveld or --gerrit')
3288
3289
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003290def _add_codereview_select_options(parser):
3291 """Appends --gerrit and --rietveld options to force specific codereview."""
3292 parser.codereview_group = optparse.OptionGroup(
3293 parser, 'EXPERIMENTAL! Codereview override options')
3294 parser.add_option_group(parser.codereview_group)
3295 parser.codereview_group.add_option(
3296 '--gerrit', action='store_true',
3297 help='Force the use of Gerrit for codereview')
3298 parser.codereview_group.add_option(
3299 '--rietveld', action='store_true',
3300 help='Force the use of Rietveld for codereview')
3301
3302
3303def _process_codereview_select_options(parser, options):
3304 if options.gerrit and options.rietveld:
3305 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3306 options.forced_codereview = None
3307 if options.gerrit:
3308 options.forced_codereview = 'gerrit'
3309 elif options.rietveld:
3310 options.forced_codereview = 'rietveld'
3311
3312
tandriif9aefb72016-07-01 09:06:51 -07003313def _get_bug_line_values(default_project, bugs):
3314 """Given default_project and comma separated list of bugs, yields bug line
3315 values.
3316
3317 Each bug can be either:
3318 * a number, which is combined with default_project
3319 * string, which is left as is.
3320
3321 This function may produce more than one line, because bugdroid expects one
3322 project per line.
3323
3324 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3325 ['v8:123', 'chromium:789']
3326 """
3327 default_bugs = []
3328 others = []
3329 for bug in bugs.split(','):
3330 bug = bug.strip()
3331 if bug:
3332 try:
3333 default_bugs.append(int(bug))
3334 except ValueError:
3335 others.append(bug)
3336
3337 if default_bugs:
3338 default_bugs = ','.join(map(str, default_bugs))
3339 if default_project:
3340 yield '%s:%s' % (default_project, default_bugs)
3341 else:
3342 yield default_bugs
3343 for other in sorted(others):
3344 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3345 yield other
3346
3347
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003348class ChangeDescription(object):
3349 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003350 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003351 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003352 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003353 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003354
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003355 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003356 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003357
agable@chromium.org42c20792013-09-12 17:34:49 +00003358 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003359 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003360 return '\n'.join(self._description_lines)
3361
3362 def set_description(self, desc):
3363 if isinstance(desc, basestring):
3364 lines = desc.splitlines()
3365 else:
3366 lines = [line.rstrip() for line in desc]
3367 while lines and not lines[0]:
3368 lines.pop(0)
3369 while lines and not lines[-1]:
3370 lines.pop(-1)
3371 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003372
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003373 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3374 """Rewrites the R=/TBR= line(s) as a single line each.
3375
3376 Args:
3377 reviewers (list(str)) - list of additional emails to use for reviewers.
3378 tbrs (list(str)) - list of additional emails to use for TBRs.
3379 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3380 the change that are missing OWNER coverage. If this is not None, you
3381 must also pass a value for `change`.
3382 change (Change) - The Change that should be used for OWNERS lookups.
3383 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003384 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003385 assert isinstance(tbrs, list), tbrs
3386
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003387 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003388 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003389
3390 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003391 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003392
3393 reviewers = set(reviewers)
3394 tbrs = set(tbrs)
3395 LOOKUP = {
3396 'TBR': tbrs,
3397 'R': reviewers,
3398 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003399
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003400 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003401 regexp = re.compile(self.R_LINE)
3402 matches = [regexp.match(line) for line in self._description_lines]
3403 new_desc = [l for i, l in enumerate(self._description_lines)
3404 if not matches[i]]
3405 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003406
agable@chromium.org42c20792013-09-12 17:34:49 +00003407 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003408
3409 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003410 for match in matches:
3411 if not match:
3412 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003413 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3414
3415 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003416 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003417 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003418 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003419 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003420 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003421 LOOKUP[add_owners_to].update(
3422 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003423
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003424 # If any folks ended up in both groups, remove them from tbrs.
3425 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003426
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003427 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3428 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003429
3430 # Put the new lines in the description where the old first R= line was.
3431 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3432 if 0 <= line_loc < len(self._description_lines):
3433 if new_tbr_line:
3434 self._description_lines.insert(line_loc, new_tbr_line)
3435 if new_r_line:
3436 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003437 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003438 if new_r_line:
3439 self.append_footer(new_r_line)
3440 if new_tbr_line:
3441 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003442
Aaron Gable3a16ed12017-03-23 10:51:55 -07003443 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003444 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003445 self.set_description([
3446 '# Enter a description of the change.',
3447 '# This will be displayed on the codereview site.',
3448 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003449 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003450 '--------------------',
3451 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003452
agable@chromium.org42c20792013-09-12 17:34:49 +00003453 regexp = re.compile(self.BUG_LINE)
3454 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003455 prefix = settings.GetBugPrefix()
3456 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003457 if git_footer:
3458 self.append_footer('Bug: %s' % ', '.join(values))
3459 else:
3460 for value in values:
3461 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003462
agable@chromium.org42c20792013-09-12 17:34:49 +00003463 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003464 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003465 if not content:
3466 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003467 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003468
3469 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003470 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3471 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003472 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003473 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003474
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003475 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003476 """Adds a footer line to the description.
3477
3478 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3479 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3480 that Gerrit footers are always at the end.
3481 """
3482 parsed_footer_line = git_footers.parse_footer(line)
3483 if parsed_footer_line:
3484 # Line is a gerrit footer in the form: Footer-Key: any value.
3485 # Thus, must be appended observing Gerrit footer rules.
3486 self.set_description(
3487 git_footers.add_footer(self.description,
3488 key=parsed_footer_line[0],
3489 value=parsed_footer_line[1]))
3490 return
3491
3492 if not self._description_lines:
3493 self._description_lines.append(line)
3494 return
3495
3496 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3497 if gerrit_footers:
3498 # git_footers.split_footers ensures that there is an empty line before
3499 # actual (gerrit) footers, if any. We have to keep it that way.
3500 assert top_lines and top_lines[-1] == ''
3501 top_lines, separator = top_lines[:-1], top_lines[-1:]
3502 else:
3503 separator = [] # No need for separator if there are no gerrit_footers.
3504
3505 prev_line = top_lines[-1] if top_lines else ''
3506 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3507 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3508 top_lines.append('')
3509 top_lines.append(line)
3510 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003511
tandrii99a72f22016-08-17 14:33:24 -07003512 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003513 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003514 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003515 reviewers = [match.group(2).strip()
3516 for match in matches
3517 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003518 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003519
bradnelsond975b302016-10-23 12:20:23 -07003520 def get_cced(self):
3521 """Retrieves the list of reviewers."""
3522 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3523 cced = [match.group(2).strip() for match in matches if match]
3524 return cleanup_list(cced)
3525
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003526 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3527 """Updates this commit description given the parent.
3528
3529 This is essentially what Gnumbd used to do.
3530 Consult https://goo.gl/WMmpDe for more details.
3531 """
3532 assert parent_msg # No, orphan branch creation isn't supported.
3533 assert parent_hash
3534 assert dest_ref
3535 parent_footer_map = git_footers.parse_footers(parent_msg)
3536 # This will also happily parse svn-position, which GnumbD is no longer
3537 # supporting. While we'd generate correct footers, the verifier plugin
3538 # installed in Gerrit will block such commit (ie git push below will fail).
3539 parent_position = git_footers.get_position(parent_footer_map)
3540
3541 # Cherry-picks may have last line obscuring their prior footers,
3542 # from git_footers perspective. This is also what Gnumbd did.
3543 cp_line = None
3544 if (self._description_lines and
3545 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3546 cp_line = self._description_lines.pop()
3547
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003548 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003549
3550 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3551 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003552 for i, line in enumerate(footer_lines):
3553 k, v = git_footers.parse_footer(line) or (None, None)
3554 if k and k.startswith('Cr-'):
3555 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003556
3557 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003558 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003559 if parent_position[0] == dest_ref:
3560 # Same branch as parent.
3561 number = int(parent_position[1]) + 1
3562 else:
3563 number = 1 # New branch, and extra lineage.
3564 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3565 int(parent_position[1])))
3566
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003567 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3568 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003569
3570 self._description_lines = top_lines
3571 if cp_line:
3572 self._description_lines.append(cp_line)
3573 if self._description_lines[-1] != '':
3574 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003575 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003576
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003577
Aaron Gablea1bab272017-04-11 16:38:18 -07003578def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003579 """Retrieves the reviewers that approved a CL from the issue properties with
3580 messages.
3581
3582 Note that the list may contain reviewers that are not committer, thus are not
3583 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003584
3585 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003586 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003587 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003588 return sorted(
3589 set(
3590 message['sender']
3591 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003592 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003593 )
3594 )
3595
3596
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003597def FindCodereviewSettingsFile(filename='codereview.settings'):
3598 """Finds the given file starting in the cwd and going up.
3599
3600 Only looks up to the top of the repository unless an
3601 'inherit-review-settings-ok' file exists in the root of the repository.
3602 """
3603 inherit_ok_file = 'inherit-review-settings-ok'
3604 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003605 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003606 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3607 root = '/'
3608 while True:
3609 if filename in os.listdir(cwd):
3610 if os.path.isfile(os.path.join(cwd, filename)):
3611 return open(os.path.join(cwd, filename))
3612 if cwd == root:
3613 break
3614 cwd = os.path.dirname(cwd)
3615
3616
3617def LoadCodereviewSettingsFromFile(fileobj):
3618 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003619 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003620
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003621 def SetProperty(name, setting, unset_error_ok=False):
3622 fullname = 'rietveld.' + name
3623 if setting in keyvals:
3624 RunGit(['config', fullname, keyvals[setting]])
3625 else:
3626 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3627
tandrii48df5812016-10-17 03:55:37 -07003628 if not keyvals.get('GERRIT_HOST', False):
3629 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003630 # Only server setting is required. Other settings can be absent.
3631 # In that case, we ignore errors raised during option deletion attempt.
3632 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003633 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003634 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3635 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003636 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003637 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3638 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003639 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003640 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3641 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003642
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003643 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003644 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003645
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003646 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003647 RunGit(['config', 'gerrit.squash-uploads',
3648 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003649
tandrii@chromium.org28253532016-04-14 13:46:56 +00003650 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003651 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003652 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3653
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003654 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003655 # should be of the form
3656 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3657 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003658 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3659 keyvals['ORIGIN_URL_CONFIG']])
3660
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003661
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003662def urlretrieve(source, destination):
3663 """urllib is broken for SSL connections via a proxy therefore we
3664 can't use urllib.urlretrieve()."""
3665 with open(destination, 'w') as f:
3666 f.write(urllib2.urlopen(source).read())
3667
3668
ukai@chromium.org712d6102013-11-27 00:52:58 +00003669def hasSheBang(fname):
3670 """Checks fname is a #! script."""
3671 with open(fname) as f:
3672 return f.read(2).startswith('#!')
3673
3674
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003675# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3676def DownloadHooks(*args, **kwargs):
3677 pass
3678
3679
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003680def DownloadGerritHook(force):
3681 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003682
3683 Args:
3684 force: True to update hooks. False to install hooks if not present.
3685 """
3686 if not settings.GetIsGerrit():
3687 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003688 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003689 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3690 if not os.access(dst, os.X_OK):
3691 if os.path.exists(dst):
3692 if not force:
3693 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003694 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003695 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003696 if not hasSheBang(dst):
3697 DieWithError('Not a script: %s\n'
3698 'You need to download from\n%s\n'
3699 'into .git/hooks/commit-msg and '
3700 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003701 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3702 except Exception:
3703 if os.path.exists(dst):
3704 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003705 DieWithError('\nFailed to download hooks.\n'
3706 'You need to download from\n%s\n'
3707 'into .git/hooks/commit-msg and '
3708 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003709
3710
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003711def GetRietveldCodereviewSettingsInteractively():
3712 """Prompt the user for settings."""
3713 server = settings.GetDefaultServerUrl(error_ok=True)
3714 prompt = 'Rietveld server (host[:port])'
3715 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3716 newserver = ask_for_data(prompt + ':')
3717 if not server and not newserver:
3718 newserver = DEFAULT_SERVER
3719 if newserver:
3720 newserver = gclient_utils.UpgradeToHttps(newserver)
3721 if newserver != server:
3722 RunGit(['config', 'rietveld.server', newserver])
3723
3724 def SetProperty(initial, caption, name, is_url):
3725 prompt = caption
3726 if initial:
3727 prompt += ' ("x" to clear) [%s]' % initial
3728 new_val = ask_for_data(prompt + ':')
3729 if new_val == 'x':
3730 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3731 elif new_val:
3732 if is_url:
3733 new_val = gclient_utils.UpgradeToHttps(new_val)
3734 if new_val != initial:
3735 RunGit(['config', 'rietveld.' + name, new_val])
3736
3737 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3738 SetProperty(settings.GetDefaultPrivateFlag(),
3739 'Private flag (rietveld only)', 'private', False)
3740 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3741 'tree-status-url', False)
3742 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3743 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3744 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3745 'run-post-upload-hook', False)
3746
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003747
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003748class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003749 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003750
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003751 _GOOGLESOURCE = 'googlesource.com'
3752
3753 def __init__(self):
3754 # Cached list of [host, identity, source], where source is either
3755 # .gitcookies or .netrc.
3756 self._all_hosts = None
3757
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003758 def ensure_configured_gitcookies(self):
3759 """Runs checks and suggests fixes to make git use .gitcookies from default
3760 path."""
3761 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3762 configured_path = RunGitSilent(
3763 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003764 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003765 if configured_path:
3766 self._ensure_default_gitcookies_path(configured_path, default)
3767 else:
3768 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003769
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003770 @staticmethod
3771 def _ensure_default_gitcookies_path(configured_path, default_path):
3772 assert configured_path
3773 if configured_path == default_path:
3774 print('git is already configured to use your .gitcookies from %s' %
3775 configured_path)
3776 return
3777
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003778 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003779 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3780 (configured_path, default_path))
3781
3782 if not os.path.exists(configured_path):
3783 print('However, your configured .gitcookies file is missing.')
3784 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3785 action='reconfigure')
3786 RunGit(['config', '--global', 'http.cookiefile', default_path])
3787 return
3788
3789 if os.path.exists(default_path):
3790 print('WARNING: default .gitcookies file already exists %s' %
3791 default_path)
3792 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3793 default_path)
3794
3795 confirm_or_exit('Move existing .gitcookies to default location?',
3796 action='move')
3797 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003798 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003799 print('Moved and reconfigured git to use .gitcookies from %s' %
3800 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003801
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003802 @staticmethod
3803 def _configure_gitcookies_path(default_path):
3804 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3805 if os.path.exists(netrc_path):
3806 print('You seem to be using outdated .netrc for git credentials: %s' %
3807 netrc_path)
3808 print('This tool will guide you through setting up recommended '
3809 '.gitcookies store for git credentials.\n'
3810 '\n'
3811 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3812 ' git config --global --unset http.cookiefile\n'
3813 ' mv %s %s.backup\n\n' % (default_path, default_path))
3814 confirm_or_exit(action='setup .gitcookies')
3815 RunGit(['config', '--global', 'http.cookiefile', default_path])
3816 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003817
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003818 def get_hosts_with_creds(self, include_netrc=False):
3819 if self._all_hosts is None:
3820 a = gerrit_util.CookiesAuthenticator()
3821 self._all_hosts = [
3822 (h, u, s)
3823 for h, u, s in itertools.chain(
3824 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3825 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3826 )
3827 if h.endswith(self._GOOGLESOURCE)
3828 ]
3829
3830 if include_netrc:
3831 return self._all_hosts
3832 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3833
3834 def print_current_creds(self, include_netrc=False):
3835 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3836 if not hosts:
3837 print('No Git/Gerrit credentials found')
3838 return
3839 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3840 header = [('Host', 'User', 'Which file'),
3841 ['=' * l for l in lengths]]
3842 for row in (header + hosts):
3843 print('\t'.join((('%%+%ds' % l) % s)
3844 for l, s in zip(lengths, row)))
3845
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003846 @staticmethod
3847 def _parse_identity(identity):
3848 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003849 # Special case: users whose ldaps contain ".", which are generally not
3850 # distinguishable from sub-domains. But we do know typical domains:
3851 if identity.endswith('.chromium.org'):
3852 domain = 'chromium.org'
3853 username = identity[:-len('.chromium.org')]
3854 else:
3855 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003856 if username.startswith('git-'):
3857 username = username[len('git-'):]
3858 return username, domain
3859
3860 def _get_usernames_of_domain(self, domain):
3861 """Returns list of usernames referenced by .gitcookies in a given domain."""
3862 identities_by_domain = {}
3863 for _, identity, _ in self.get_hosts_with_creds():
3864 username, domain = self._parse_identity(identity)
3865 identities_by_domain.setdefault(domain, []).append(username)
3866 return identities_by_domain.get(domain)
3867
3868 def _canonical_git_googlesource_host(self, host):
3869 """Normalizes Gerrit hosts (with '-review') to Git host."""
3870 assert host.endswith(self._GOOGLESOURCE)
3871 # Prefix doesn't include '.' at the end.
3872 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3873 if prefix.endswith('-review'):
3874 prefix = prefix[:-len('-review')]
3875 return prefix + '.' + self._GOOGLESOURCE
3876
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003877 def _canonical_gerrit_googlesource_host(self, host):
3878 git_host = self._canonical_git_googlesource_host(host)
3879 prefix = git_host.split('.', 1)[0]
3880 return prefix + '-review.' + self._GOOGLESOURCE
3881
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003882 def _get_counterpart_host(self, host):
3883 assert host.endswith(self._GOOGLESOURCE)
3884 git = self._canonical_git_googlesource_host(host)
3885 gerrit = self._canonical_gerrit_googlesource_host(git)
3886 return git if gerrit == host else gerrit
3887
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003888 def has_generic_host(self):
3889 """Returns whether generic .googlesource.com has been configured.
3890
3891 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3892 """
3893 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3894 if host == '.' + self._GOOGLESOURCE:
3895 return True
3896 return False
3897
3898 def _get_git_gerrit_identity_pairs(self):
3899 """Returns map from canonic host to pair of identities (Git, Gerrit).
3900
3901 One of identities might be None, meaning not configured.
3902 """
3903 host_to_identity_pairs = {}
3904 for host, identity, _ in self.get_hosts_with_creds():
3905 canonical = self._canonical_git_googlesource_host(host)
3906 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3907 idx = 0 if canonical == host else 1
3908 pair[idx] = identity
3909 return host_to_identity_pairs
3910
3911 def get_partially_configured_hosts(self):
3912 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003913 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3914 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3915 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003916
3917 def get_conflicting_hosts(self):
3918 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003919 host
3920 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003921 if None not in (i1, i2) and i1 != i2)
3922
3923 def get_duplicated_hosts(self):
3924 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3925 return set(host for host, count in counters.iteritems() if count > 1)
3926
3927 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3928 'chromium.googlesource.com': 'chromium.org',
3929 'chrome-internal.googlesource.com': 'google.com',
3930 }
3931
3932 def get_hosts_with_wrong_identities(self):
3933 """Finds hosts which **likely** reference wrong identities.
3934
3935 Note: skips hosts which have conflicting identities for Git and Gerrit.
3936 """
3937 hosts = set()
3938 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3939 pair = self._get_git_gerrit_identity_pairs().get(host)
3940 if pair and pair[0] == pair[1]:
3941 _, domain = self._parse_identity(pair[0])
3942 if domain != expected:
3943 hosts.add(host)
3944 return hosts
3945
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003946 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003947 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003948 hosts = sorted(hosts)
3949 assert hosts
3950 if extra_column_func is None:
3951 extras = [''] * len(hosts)
3952 else:
3953 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003954 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3955 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003956 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003957 lines.append(tmpl % he)
3958 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003959
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003960 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003961 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003962 yield ('.googlesource.com wildcard record detected',
3963 ['Chrome Infrastructure team recommends to list full host names '
3964 'explicitly.'],
3965 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003966
3967 dups = self.get_duplicated_hosts()
3968 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003969 yield ('The following hosts were defined twice',
3970 self._format_hosts(dups),
3971 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003972
3973 partial = self.get_partially_configured_hosts()
3974 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003975 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3976 'These hosts are missing',
3977 self._format_hosts(partial, lambda host: 'but %s defined' %
3978 self._get_counterpart_host(host)),
3979 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003980
3981 conflicting = self.get_conflicting_hosts()
3982 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003983 yield ('The following Git hosts have differing credentials from their '
3984 'Gerrit counterparts',
3985 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3986 tuple(self._get_git_gerrit_identity_pairs()[host])),
3987 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003988
3989 wrong = self.get_hosts_with_wrong_identities()
3990 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003991 yield ('These hosts likely use wrong identity',
3992 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3993 (self._get_git_gerrit_identity_pairs()[host][0],
3994 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3995 wrong)
3996
3997 def find_and_report_problems(self):
3998 """Returns True if there was at least one problem, else False."""
3999 found = False
4000 bad_hosts = set()
4001 for title, sublines, hosts in self._find_problems():
4002 if not found:
4003 found = True
4004 print('\n\n.gitcookies problem report:\n')
4005 bad_hosts.update(hosts or [])
4006 print(' %s%s' % (title , (':' if sublines else '')))
4007 if sublines:
4008 print()
4009 print(' %s' % '\n '.join(sublines))
4010 print()
4011
4012 if bad_hosts:
4013 assert found
4014 print(' You can manually remove corresponding lines in your %s file and '
4015 'visit the following URLs with correct account to generate '
4016 'correct credential lines:\n' %
4017 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4018 print(' %s' % '\n '.join(sorted(set(
4019 gerrit_util.CookiesAuthenticator().get_new_password_url(
4020 self._canonical_git_googlesource_host(host))
4021 for host in bad_hosts
4022 ))))
4023 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004024
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004025
4026def CMDcreds_check(parser, args):
4027 """Checks credentials and suggests changes."""
4028 _, _ = parser.parse_args(args)
4029
4030 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004031 DieWithError(
4032 'This command is not designed for GCE, are you on a bot?\n'
4033 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004034
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004035 checker = _GitCookiesChecker()
4036 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004037
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004038 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004039 checker.print_current_creds(include_netrc=True)
4040
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004041 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004042 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004043 return 0
4044 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004045
4046
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004047@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004048def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004049 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004050
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004051 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004052 # TODO(tandrii): remove this once we switch to Gerrit.
4053 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004054 parser.add_option('--activate-update', action='store_true',
4055 help='activate auto-updating [rietveld] section in '
4056 '.git/config')
4057 parser.add_option('--deactivate-update', action='store_true',
4058 help='deactivate auto-updating [rietveld] section in '
4059 '.git/config')
4060 options, args = parser.parse_args(args)
4061
4062 if options.deactivate_update:
4063 RunGit(['config', 'rietveld.autoupdate', 'false'])
4064 return
4065
4066 if options.activate_update:
4067 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4068 return
4069
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004070 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004071 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004072 return 0
4073
4074 url = args[0]
4075 if not url.endswith('codereview.settings'):
4076 url = os.path.join(url, 'codereview.settings')
4077
4078 # Load code review settings and download hooks (if available).
4079 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4080 return 0
4081
4082
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004083def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004084 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004085 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4086 branch = ShortBranchName(branchref)
4087 _, args = parser.parse_args(args)
4088 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004089 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004090 return RunGit(['config', 'branch.%s.base-url' % branch],
4091 error_ok=False).strip()
4092 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004093 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004094 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4095 error_ok=False).strip()
4096
4097
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004098def color_for_status(status):
4099 """Maps a Changelist status to color, for CMDstatus and other tools."""
4100 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004101 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004102 'waiting': Fore.BLUE,
4103 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004104 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004105 'lgtm': Fore.GREEN,
4106 'commit': Fore.MAGENTA,
4107 'closed': Fore.CYAN,
4108 'error': Fore.WHITE,
4109 }.get(status, Fore.WHITE)
4110
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004111
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004112def get_cl_statuses(changes, fine_grained, max_processes=None):
4113 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004114
4115 If fine_grained is true, this will fetch CL statuses from the server.
4116 Otherwise, simply indicate if there's a matching url for the given branches.
4117
4118 If max_processes is specified, it is used as the maximum number of processes
4119 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4120 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004121
4122 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004123 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004124 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004125 upload.verbosity = 0
4126
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004127 if not changes:
4128 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004129
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004130 if not fine_grained:
4131 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004132 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004133 for cl in changes:
4134 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004135 return
4136
4137 # First, sort out authentication issues.
4138 logging.debug('ensuring credentials exist')
4139 for cl in changes:
4140 cl.EnsureAuthenticated(force=False, refresh=True)
4141
4142 def fetch(cl):
4143 try:
4144 return (cl, cl.GetStatus())
4145 except:
4146 # See http://crbug.com/629863.
4147 logging.exception('failed to fetch status for %s:', cl)
4148 raise
4149
4150 threads_count = len(changes)
4151 if max_processes:
4152 threads_count = max(1, min(threads_count, max_processes))
4153 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4154
4155 pool = ThreadPool(threads_count)
4156 fetched_cls = set()
4157 try:
4158 it = pool.imap_unordered(fetch, changes).__iter__()
4159 while True:
4160 try:
4161 cl, status = it.next(timeout=5)
4162 except multiprocessing.TimeoutError:
4163 break
4164 fetched_cls.add(cl)
4165 yield cl, status
4166 finally:
4167 pool.close()
4168
4169 # Add any branches that failed to fetch.
4170 for cl in set(changes) - fetched_cls:
4171 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004172
rmistry@google.com2dd99862015-06-22 12:22:18 +00004173
4174def upload_branch_deps(cl, args):
4175 """Uploads CLs of local branches that are dependents of the current branch.
4176
4177 If the local branch dependency tree looks like:
4178 test1 -> test2.1 -> test3.1
4179 -> test3.2
4180 -> test2.2 -> test3.3
4181
4182 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4183 run on the dependent branches in this order:
4184 test2.1, test3.1, test3.2, test2.2, test3.3
4185
4186 Note: This function does not rebase your local dependent branches. Use it when
4187 you make a change to the parent branch that will not conflict with its
4188 dependent branches, and you would like their dependencies updated in
4189 Rietveld.
4190 """
4191 if git_common.is_dirty_git_tree('upload-branch-deps'):
4192 return 1
4193
4194 root_branch = cl.GetBranch()
4195 if root_branch is None:
4196 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4197 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004198 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004199 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4200 'patchset dependencies without an uploaded CL.')
4201
4202 branches = RunGit(['for-each-ref',
4203 '--format=%(refname:short) %(upstream:short)',
4204 'refs/heads'])
4205 if not branches:
4206 print('No local branches found.')
4207 return 0
4208
4209 # Create a dictionary of all local branches to the branches that are dependent
4210 # on it.
4211 tracked_to_dependents = collections.defaultdict(list)
4212 for b in branches.splitlines():
4213 tokens = b.split()
4214 if len(tokens) == 2:
4215 branch_name, tracked = tokens
4216 tracked_to_dependents[tracked].append(branch_name)
4217
vapiera7fbd5a2016-06-16 09:17:49 -07004218 print()
4219 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004220 dependents = []
4221 def traverse_dependents_preorder(branch, padding=''):
4222 dependents_to_process = tracked_to_dependents.get(branch, [])
4223 padding += ' '
4224 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004225 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004226 dependents.append(dependent)
4227 traverse_dependents_preorder(dependent, padding)
4228 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004230
4231 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004232 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004233 return 0
4234
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004235 confirm_or_exit('This command will checkout all dependent branches and run '
4236 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004237
andybons@chromium.org962f9462016-02-03 20:00:42 +00004238 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004239 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004240 args.extend(['-t', 'Updated patchset dependency'])
4241
rmistry@google.com2dd99862015-06-22 12:22:18 +00004242 # Record all dependents that failed to upload.
4243 failures = {}
4244 # Go through all dependents, checkout the branch and upload.
4245 try:
4246 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004247 print()
4248 print('--------------------------------------')
4249 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004250 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004251 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004252 try:
4253 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004254 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004255 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004256 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004257 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004258 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004259 finally:
4260 # Swap back to the original root branch.
4261 RunGit(['checkout', '-q', root_branch])
4262
vapiera7fbd5a2016-06-16 09:17:49 -07004263 print()
4264 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004265 for dependent_branch in dependents:
4266 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004267 print(' %s : %s' % (dependent_branch, upload_status))
4268 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004269
4270 return 0
4271
4272
kmarshall3bff56b2016-06-06 18:31:47 -07004273def CMDarchive(parser, args):
4274 """Archives and deletes branches associated with closed changelists."""
4275 parser.add_option(
4276 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004277 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004278 parser.add_option(
4279 '-f', '--force', action='store_true',
4280 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004281 parser.add_option(
4282 '-d', '--dry-run', action='store_true',
4283 help='Skip the branch tagging and removal steps.')
4284 parser.add_option(
4285 '-t', '--notags', action='store_true',
4286 help='Do not tag archived branches. '
4287 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004288
4289 auth.add_auth_options(parser)
4290 options, args = parser.parse_args(args)
4291 if args:
4292 parser.error('Unsupported args: %s' % ' '.join(args))
4293 auth_config = auth.extract_auth_config_from_options(options)
4294
4295 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4296 if not branches:
4297 return 0
4298
vapiera7fbd5a2016-06-16 09:17:49 -07004299 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004300 changes = [Changelist(branchref=b, auth_config=auth_config)
4301 for b in branches.splitlines()]
4302 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4303 statuses = get_cl_statuses(changes,
4304 fine_grained=True,
4305 max_processes=options.maxjobs)
4306 proposal = [(cl.GetBranch(),
4307 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4308 for cl, status in statuses
4309 if status == 'closed']
4310 proposal.sort()
4311
4312 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004313 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004314 return 0
4315
4316 current_branch = GetCurrentBranch()
4317
vapiera7fbd5a2016-06-16 09:17:49 -07004318 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004319 if options.notags:
4320 for next_item in proposal:
4321 print(' ' + next_item[0])
4322 else:
4323 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4324 for next_item in proposal:
4325 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004326
kmarshall9249e012016-08-23 12:02:16 -07004327 # Quit now on precondition failure or if instructed by the user, either
4328 # via an interactive prompt or by command line flags.
4329 if options.dry_run:
4330 print('\nNo changes were made (dry run).\n')
4331 return 0
4332 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004333 print('You are currently on a branch \'%s\' which is associated with a '
4334 'closed codereview issue, so archive cannot proceed. Please '
4335 'checkout another branch and run this command again.' %
4336 current_branch)
4337 return 1
kmarshall9249e012016-08-23 12:02:16 -07004338 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004339 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4340 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004341 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004342 return 1
4343
4344 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004345 if not options.notags:
4346 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004347 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004348
vapiera7fbd5a2016-06-16 09:17:49 -07004349 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004350
4351 return 0
4352
4353
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004354def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004355 """Show status of changelists.
4356
4357 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004358 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004359 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004360 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004361 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004362 - Magenta in the commit queue
4363 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004364 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004365
4366 Also see 'git cl comments'.
4367 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004368 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004369 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004370 parser.add_option('-f', '--fast', action='store_true',
4371 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004372 parser.add_option(
4373 '-j', '--maxjobs', action='store', type=int,
4374 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004375
4376 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004377 _add_codereview_issue_select_options(
4378 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004379 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004380 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004381 if args:
4382 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004383 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004384
iannuccie53c9352016-08-17 14:40:40 -07004385 if options.issue is not None and not options.field:
4386 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004387
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004388 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004389 cl = Changelist(auth_config=auth_config, issue=options.issue,
4390 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004391 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004392 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004393 elif options.field == 'id':
4394 issueid = cl.GetIssue()
4395 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004396 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004397 elif options.field == 'patch':
4398 patchset = cl.GetPatchset()
4399 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004400 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004401 elif options.field == 'status':
4402 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004403 elif options.field == 'url':
4404 url = cl.GetIssueURL()
4405 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004406 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004407 return 0
4408
4409 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4410 if not branches:
4411 print('No local branch found.')
4412 return 0
4413
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004414 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004415 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004416 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004417 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004418 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004419 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004420 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004421
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004422 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004423 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4424 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4425 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004426 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004427 c, status = output.next()
4428 branch_statuses[c.GetBranch()] = status
4429 status = branch_statuses.pop(branch)
4430 url = cl.GetIssueURL()
4431 if url and (not status or status == 'error'):
4432 # The issue probably doesn't exist anymore.
4433 url += ' (broken)'
4434
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004435 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004436 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004437 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004438 color = ''
4439 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004440 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004441 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004442 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004443 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004444
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004445
4446 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004447 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004448 print('Current branch: %s' % branch)
4449 for cl in changes:
4450 if cl.GetBranch() == branch:
4451 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004452 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004453 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004454 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004455 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004456 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004457 print('Issue description:')
4458 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004459 return 0
4460
4461
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004462def colorize_CMDstatus_doc():
4463 """To be called once in main() to add colors to git cl status help."""
4464 colors = [i for i in dir(Fore) if i[0].isupper()]
4465
4466 def colorize_line(line):
4467 for color in colors:
4468 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004469 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004470 indent = len(line) - len(line.lstrip(' ')) + 1
4471 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4472 return line
4473
4474 lines = CMDstatus.__doc__.splitlines()
4475 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4476
4477
phajdan.jre328cf92016-08-22 04:12:17 -07004478def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004479 if path == '-':
4480 json.dump(contents, sys.stdout)
4481 else:
4482 with open(path, 'w') as f:
4483 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004484
4485
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004486@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004487def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004488 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004489
4490 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004491 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004492 parser.add_option('-r', '--reverse', action='store_true',
4493 help='Lookup the branch(es) for the specified issues. If '
4494 'no issues are specified, all branches with mapped '
4495 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004496 parser.add_option('--json',
4497 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004498 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004499 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004500 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501
dnj@chromium.org406c4402015-03-03 17:22:28 +00004502 if options.reverse:
4503 branches = RunGit(['for-each-ref', 'refs/heads',
4504 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004505 # Reverse issue lookup.
4506 issue_branch_map = {}
4507 for branch in branches:
4508 cl = Changelist(branchref=branch)
4509 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4510 if not args:
4511 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004512 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004513 for issue in args:
4514 if not issue:
4515 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004516 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004517 print('Branch for issue number %s: %s' % (
4518 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004519 if options.json:
4520 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004521 return 0
4522
4523 if len(args) > 0:
4524 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4525 if not issue.valid:
4526 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4527 'or no argument to list it.\n'
4528 'Maybe you want to run git cl status?')
4529 cl = Changelist(codereview=issue.codereview)
4530 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004531 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004532 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004533 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4534 if options.json:
4535 write_json(options.json, {
4536 'issue': cl.GetIssue(),
4537 'issue_url': cl.GetIssueURL(),
4538 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004539 return 0
4540
4541
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004542def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004543 """Shows or posts review comments for any changelist."""
4544 parser.add_option('-a', '--add-comment', dest='comment',
4545 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004546 parser.add_option('-i', '--issue', dest='issue',
4547 help='review issue id (defaults to current issue). '
4548 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004549 parser.add_option('-m', '--machine-readable', dest='readable',
4550 action='store_false', default=True,
4551 help='output comments in a format compatible with '
4552 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004553 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004554 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004555 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004556 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004557 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004558 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004559 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004560
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004561 issue = None
4562 if options.issue:
4563 try:
4564 issue = int(options.issue)
4565 except ValueError:
4566 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004567 if not options.forced_codereview:
4568 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004569
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004570 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004571 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004572 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004573
4574 if options.comment:
4575 cl.AddComment(options.comment)
4576 return 0
4577
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004578 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4579 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004580 for comment in summary:
4581 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004582 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004583 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004584 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004585 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004586 color = Fore.MAGENTA
4587 else:
4588 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004589 print('\n%s%s %s%s\n%s' % (
4590 color,
4591 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4592 comment.sender,
4593 Fore.RESET,
4594 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4595
smut@google.comc85ac942015-09-15 16:34:43 +00004596 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004597 def pre_serialize(c):
4598 dct = c.__dict__.copy()
4599 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4600 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004601 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004602 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004603 return 0
4604
4605
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004606@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004607def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004608 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004609 parser.add_option('-d', '--display', action='store_true',
4610 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004611 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004612 help='New description to set for this issue (- for stdin, '
4613 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004614 parser.add_option('-f', '--force', action='store_true',
4615 help='Delete any unpublished Gerrit edits for this issue '
4616 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004617
4618 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004619 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004620 options, args = parser.parse_args(args)
4621 _process_codereview_select_options(parser, options)
4622
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004623 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004624 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004625 target_issue_arg = ParseIssueNumberArgument(args[0],
4626 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004627 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004628 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004629
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004630 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004631
martiniss6eda05f2016-06-30 10:18:35 -07004632 kwargs = {
4633 'auth_config': auth_config,
4634 'codereview': options.forced_codereview,
4635 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004636 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004637 if target_issue_arg:
4638 kwargs['issue'] = target_issue_arg.issue
4639 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004640 if target_issue_arg.codereview and not options.forced_codereview:
4641 detected_codereview_from_url = True
4642 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004643
4644 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004645 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004646 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004647 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004648
4649 if detected_codereview_from_url:
4650 logging.info('canonical issue/change URL: %s (type: %s)\n',
4651 cl.GetIssueURL(), target_issue_arg.codereview)
4652
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004653 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004654
smut@google.com34fb6b12015-07-13 20:03:26 +00004655 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004656 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004657 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004658
4659 if options.new_description:
4660 text = options.new_description
4661 if text == '-':
4662 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004663 elif text == '+':
4664 base_branch = cl.GetCommonAncestorWithUpstream()
4665 change = cl.GetChange(base_branch, None, local_description=True)
4666 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004667
4668 description.set_description(text)
4669 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004670 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004671
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004672 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004673 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004674 return 0
4675
4676
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004677def CreateDescriptionFromLog(args):
4678 """Pulls out the commit log to use as a base for the CL description."""
4679 log_args = []
4680 if len(args) == 1 and not args[0].endswith('.'):
4681 log_args = [args[0] + '..']
4682 elif len(args) == 1 and args[0].endswith('...'):
4683 log_args = [args[0][:-1]]
4684 elif len(args) == 2:
4685 log_args = [args[0] + '..' + args[1]]
4686 else:
4687 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004688 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004689
4690
thestig@chromium.org44202a22014-03-11 19:22:18 +00004691def CMDlint(parser, args):
4692 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004693 parser.add_option('--filter', action='append', metavar='-x,+y',
4694 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004695 auth.add_auth_options(parser)
4696 options, args = parser.parse_args(args)
4697 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004698
4699 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004700 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004701 try:
4702 import cpplint
4703 import cpplint_chromium
4704 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004705 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004706 return 1
4707
4708 # Change the current working directory before calling lint so that it
4709 # shows the correct base.
4710 previous_cwd = os.getcwd()
4711 os.chdir(settings.GetRoot())
4712 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004713 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004714 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4715 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004716 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004717 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004718 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004719
4720 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004721 command = args + files
4722 if options.filter:
4723 command = ['--filter=' + ','.join(options.filter)] + command
4724 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004725
4726 white_regex = re.compile(settings.GetLintRegex())
4727 black_regex = re.compile(settings.GetLintIgnoreRegex())
4728 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4729 for filename in filenames:
4730 if white_regex.match(filename):
4731 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004732 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004733 else:
4734 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4735 extra_check_functions)
4736 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004737 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004738 finally:
4739 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004740 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004741 if cpplint._cpplint_state.error_count != 0:
4742 return 1
4743 return 0
4744
4745
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004746def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004747 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004748 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004749 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004750 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004751 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004752 auth.add_auth_options(parser)
4753 options, args = parser.parse_args(args)
4754 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004755
sbc@chromium.org71437c02015-04-09 19:29:40 +00004756 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004757 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004758 return 1
4759
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004760 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004761 if args:
4762 base_branch = args[0]
4763 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004764 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004765 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004766
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004767 cl.RunHook(
4768 committing=not options.upload,
4769 may_prompt=False,
4770 verbose=options.verbose,
4771 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004772 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004773
4774
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004775def GenerateGerritChangeId(message):
4776 """Returns Ixxxxxx...xxx change id.
4777
4778 Works the same way as
4779 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4780 but can be called on demand on all platforms.
4781
4782 The basic idea is to generate git hash of a state of the tree, original commit
4783 message, author/committer info and timestamps.
4784 """
4785 lines = []
4786 tree_hash = RunGitSilent(['write-tree'])
4787 lines.append('tree %s' % tree_hash.strip())
4788 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4789 if code == 0:
4790 lines.append('parent %s' % parent.strip())
4791 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4792 lines.append('author %s' % author.strip())
4793 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4794 lines.append('committer %s' % committer.strip())
4795 lines.append('')
4796 # Note: Gerrit's commit-hook actually cleans message of some lines and
4797 # whitespace. This code is not doing this, but it clearly won't decrease
4798 # entropy.
4799 lines.append(message)
4800 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4801 stdin='\n'.join(lines))
4802 return 'I%s' % change_hash.strip()
4803
4804
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004805def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004806 """Computes the remote branch ref to use for the CL.
4807
4808 Args:
4809 remote (str): The git remote for the CL.
4810 remote_branch (str): The git remote branch for the CL.
4811 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004812 """
4813 if not (remote and remote_branch):
4814 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004815
wittman@chromium.org455dc922015-01-26 20:15:50 +00004816 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004817 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004818 # refs, which are then translated into the remote full symbolic refs
4819 # below.
4820 if '/' not in target_branch:
4821 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4822 else:
4823 prefix_replacements = (
4824 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4825 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4826 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4827 )
4828 match = None
4829 for regex, replacement in prefix_replacements:
4830 match = re.search(regex, target_branch)
4831 if match:
4832 remote_branch = target_branch.replace(match.group(0), replacement)
4833 break
4834 if not match:
4835 # This is a branch path but not one we recognize; use as-is.
4836 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004837 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4838 # Handle the refs that need to land in different refs.
4839 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004840
wittman@chromium.org455dc922015-01-26 20:15:50 +00004841 # Create the true path to the remote branch.
4842 # Does the following translation:
4843 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4844 # * refs/remotes/origin/master -> refs/heads/master
4845 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4846 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4847 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4848 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4849 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4850 'refs/heads/')
4851 elif remote_branch.startswith('refs/remotes/branch-heads'):
4852 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004853
wittman@chromium.org455dc922015-01-26 20:15:50 +00004854 return remote_branch
4855
4856
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004857def cleanup_list(l):
4858 """Fixes a list so that comma separated items are put as individual items.
4859
4860 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4861 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4862 """
4863 items = sum((i.split(',') for i in l), [])
4864 stripped_items = (i.strip() for i in items)
4865 return sorted(filter(None, stripped_items))
4866
4867
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004868@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004869def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004870 """Uploads the current changelist to codereview.
4871
4872 Can skip dependency patchset uploads for a branch by running:
4873 git config branch.branch_name.skip-deps-uploads True
4874 To unset run:
4875 git config --unset branch.branch_name.skip-deps-uploads
4876 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004877
4878 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4879 a bug number, this bug number is automatically populated in the CL
4880 description.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004881 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004882 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4883 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004884 parser.add_option('--bypass-watchlists', action='store_true',
4885 dest='bypass_watchlists',
4886 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004887 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004888 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004889 parser.add_option('--message', '-m', dest='message',
4890 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004891 parser.add_option('-b', '--bug',
4892 help='pre-populate the bug number(s) for this issue. '
4893 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004894 parser.add_option('--message-file', dest='message_file',
4895 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004896 parser.add_option('--title', '-t', dest='title',
4897 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004898 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004899 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004900 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004901 parser.add_option('--tbrs',
4902 action='append', default=[],
4903 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004904 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004905 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004906 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004907 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004908 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004909 parser.add_option('--emulate_svn_auto_props',
4910 '--emulate-svn-auto-props',
4911 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004912 dest="emulate_svn_auto_props",
4913 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004914 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004915 help='tell the commit queue to commit this patchset; '
4916 'implies --send-mail')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004917 parser.add_option('--private', action='store_true',
4918 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004919 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004920 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004921 metavar='TARGET',
4922 help='Apply CL to remote ref TARGET. ' +
4923 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004924 parser.add_option('--squash', action='store_true',
4925 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004926 parser.add_option('--no-squash', action='store_true',
4927 help='Don\'t squash multiple commits into one ' +
4928 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004929 parser.add_option('--topic', default=None,
4930 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004931 parser.add_option('--email', default=None,
4932 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004933 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4934 const='TBR', help='add a set of OWNERS to TBR')
4935 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4936 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004937 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4938 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004939 help='Send the patchset to do a CQ dry run right after '
4940 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004941 parser.add_option('--dependencies', action='store_true',
4942 help='Uploads CLs of all the local branches that depend on '
4943 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004944
rmistry@google.com2dd99862015-06-22 12:22:18 +00004945 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004946 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004947 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004948 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004949 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004950 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004951 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004952
sbc@chromium.org71437c02015-04-09 19:29:40 +00004953 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004954 return 1
4955
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004956 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004957 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004958 options.cc = cleanup_list(options.cc)
4959
tandriib80458a2016-06-23 12:20:07 -07004960 if options.message_file:
4961 if options.message:
4962 parser.error('only one of --message and --message-file allowed.')
4963 options.message = gclient_utils.FileRead(options.message_file)
4964 options.message_file = None
4965
tandrii4d0545a2016-07-06 03:56:49 -07004966 if options.cq_dry_run and options.use_commit_queue:
4967 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4968
Aaron Gableedbc4132017-09-11 13:22:28 -07004969 if options.use_commit_queue:
4970 options.send_mail = True
4971
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004972 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4973 settings.GetIsGerrit()
4974
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004975 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004976 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004977
4978
Francois Dorayd42c6812017-05-30 15:10:20 -04004979@subcommand.usage('--description=<description file>')
4980def CMDsplit(parser, args):
4981 """Splits a branch into smaller branches and uploads CLs.
4982
4983 Creates a branch and uploads a CL for each group of files modified in the
4984 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004985 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004986 the shared OWNERS file.
4987 """
4988 parser.add_option("-d", "--description", dest="description_file",
4989 help="A text file containing a CL description. ")
4990 parser.add_option("-c", "--comment", dest="comment_file",
4991 help="A text file containing a CL comment.")
4992 options, _ = parser.parse_args(args)
4993
4994 if not options.description_file:
4995 parser.error('No --description flag specified.')
4996
4997 def WrappedCMDupload(args):
4998 return CMDupload(OptionParser(), args)
4999
5000 return split_cl.SplitCl(options.description_file, options.comment_file,
5001 Changelist, WrappedCMDupload)
5002
5003
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005004@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005005def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005006 """DEPRECATED: Used to commit the current changelist via git-svn."""
5007 message = ('git-cl no longer supports committing to SVN repositories via '
5008 'git-svn. You probably want to use `git cl land` instead.')
5009 print(message)
5010 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005011
5012
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005013# Two special branches used by git cl land.
5014MERGE_BRANCH = 'git-cl-commit'
5015CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5016
5017
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005018@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005019def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005020 """Commits the current changelist via git.
5021
5022 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5023 upstream and closes the issue automatically and atomically.
5024
5025 Otherwise (in case of Rietveld):
5026 Squashes branch into a single commit.
5027 Updates commit message with metadata (e.g. pointer to review).
5028 Pushes the code upstream.
5029 Updates review and closes.
5030 """
5031 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5032 help='bypass upload presubmit hook')
5033 parser.add_option('-m', dest='message',
5034 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005035 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005036 help="force yes to questions (don't prompt)")
5037 parser.add_option('-c', dest='contributor',
5038 help="external contributor for patch (appended to " +
5039 "description and used as author for git). Should be " +
5040 "formatted as 'First Last <email@example.com>'")
5041 add_git_similarity(parser)
5042 auth.add_auth_options(parser)
5043 (options, args) = parser.parse_args(args)
5044 auth_config = auth.extract_auth_config_from_options(options)
5045
5046 cl = Changelist(auth_config=auth_config)
5047
5048 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5049 if cl.IsGerrit():
5050 if options.message:
5051 # This could be implemented, but it requires sending a new patch to
5052 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5053 # Besides, Gerrit has the ability to change the commit message on submit
5054 # automatically, thus there is no need to support this option (so far?).
5055 parser.error('-m MESSAGE option is not supported for Gerrit.')
5056 if options.contributor:
5057 parser.error(
5058 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5059 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5060 'the contributor\'s "name <email>". If you can\'t upload such a '
5061 'commit for review, contact your repository admin and request'
5062 '"Forge-Author" permission.')
5063 if not cl.GetIssue():
5064 DieWithError('You must upload the change first to Gerrit.\n'
5065 ' If you would rather have `git cl land` upload '
5066 'automatically for you, see http://crbug.com/642759')
5067 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5068 options.verbose)
5069
5070 current = cl.GetBranch()
5071 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5072 if remote == '.':
5073 print()
5074 print('Attempting to push branch %r into another local branch!' % current)
5075 print()
5076 print('Either reparent this branch on top of origin/master:')
5077 print(' git reparent-branch --root')
5078 print()
5079 print('OR run `git rebase-update` if you think the parent branch is ')
5080 print('already committed.')
5081 print()
5082 print(' Current parent: %r' % upstream_branch)
5083 return 1
5084
5085 if not args:
5086 # Default to merging against our best guess of the upstream branch.
5087 args = [cl.GetUpstreamBranch()]
5088
5089 if options.contributor:
5090 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005091 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005092 return 1
5093
5094 base_branch = args[0]
5095
5096 if git_common.is_dirty_git_tree('land'):
5097 return 1
5098
5099 # This rev-list syntax means "show all commits not in my branch that
5100 # are in base_branch".
5101 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5102 base_branch]).splitlines()
5103 if upstream_commits:
5104 print('Base branch "%s" has %d commits '
5105 'not in this branch.' % (base_branch, len(upstream_commits)))
5106 print('Run "git merge %s" before attempting to land.' % base_branch)
5107 return 1
5108
5109 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5110 if not options.bypass_hooks:
5111 author = None
5112 if options.contributor:
5113 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5114 hook_results = cl.RunHook(
5115 committing=True,
5116 may_prompt=not options.force,
5117 verbose=options.verbose,
5118 change=cl.GetChange(merge_base, author))
5119 if not hook_results.should_continue():
5120 return 1
5121
5122 # Check the tree status if the tree status URL is set.
5123 status = GetTreeStatus()
5124 if 'closed' == status:
5125 print('The tree is closed. Please wait for it to reopen. Use '
5126 '"git cl land --bypass-hooks" to commit on a closed tree.')
5127 return 1
5128 elif 'unknown' == status:
5129 print('Unable to determine tree status. Please verify manually and '
5130 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5131 return 1
5132
5133 change_desc = ChangeDescription(options.message)
5134 if not change_desc.description and cl.GetIssue():
5135 change_desc = ChangeDescription(cl.GetDescription())
5136
5137 if not change_desc.description:
5138 if not cl.GetIssue() and options.bypass_hooks:
5139 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5140 else:
5141 print('No description set.')
5142 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5143 return 1
5144
5145 # Keep a separate copy for the commit message, because the commit message
5146 # contains the link to the Rietveld issue, while the Rietveld message contains
5147 # the commit viewvc url.
5148 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005149 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005150 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005151
5152 commit_desc = ChangeDescription(change_desc.description)
5153 if cl.GetIssue():
5154 # Xcode won't linkify this URL unless there is a non-whitespace character
5155 # after it. Add a period on a new line to circumvent this. Also add a space
5156 # before the period to make sure that Gitiles continues to correctly resolve
5157 # the URL.
5158 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5159 if options.contributor:
5160 commit_desc.append_footer('Patch from %s.' % options.contributor)
5161
5162 print('Description:')
5163 print(commit_desc.description)
5164
5165 branches = [merge_base, cl.GetBranchRef()]
5166 if not options.force:
5167 print_stats(options.similarity, options.find_copies, branches)
5168
5169 # We want to squash all this branch's commits into one commit with the proper
5170 # description. We do this by doing a "reset --soft" to the base branch (which
5171 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005172 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005173 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5174 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5175 result = RunGitWithCode(showref_cmd)
5176 if result[0] == 0:
5177 RunGit(['branch', '-D', branch])
5178
5179 # We might be in a directory that's present in this branch but not in the
5180 # trunk. Move up to the top of the tree so that git commands that expect a
5181 # valid CWD won't fail after we check out the merge branch.
5182 rel_base_path = settings.GetRelativeRoot()
5183 if rel_base_path:
5184 os.chdir(rel_base_path)
5185
5186 # Stuff our change into the merge branch.
5187 # We wrap in a try...finally block so if anything goes wrong,
5188 # we clean up the branches.
5189 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005190 revision = None
5191 try:
5192 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5193 RunGit(['reset', '--soft', merge_base])
5194 if options.contributor:
5195 RunGit(
5196 [
5197 'commit', '--author', options.contributor,
5198 '-m', commit_desc.description,
5199 ])
5200 else:
5201 RunGit(['commit', '-m', commit_desc.description])
5202
5203 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5204 mirror = settings.GetGitMirror(remote)
5205 if mirror:
5206 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005207 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005208 else:
5209 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005210 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005211 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5212
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005213 retcode = PushToGitWithAutoRebase(
5214 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005215 if retcode == 0:
5216 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005217 if git_numberer_enabled:
5218 change_desc = ChangeDescription(
5219 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005220 except: # pylint: disable=bare-except
5221 if _IS_BEING_TESTED:
5222 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5223 + '-' * 30 + '8<' + '-' * 30)
5224 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5225 raise
5226 finally:
5227 # And then swap back to the original branch and clean up.
5228 RunGit(['checkout', '-q', cl.GetBranch()])
5229 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005230 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005231
5232 if not revision:
5233 print('Failed to push. If this persists, please file a bug.')
5234 return 1
5235
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005236 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005237 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005238 if viewvc_url and revision:
5239 change_desc.append_footer(
5240 'Committed: %s%s' % (viewvc_url, revision))
5241 elif revision:
5242 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005243 print('Closing issue '
5244 '(you may be prompted for your codereview password)...')
5245 cl.UpdateDescription(change_desc.description)
5246 cl.CloseIssue()
5247 props = cl.GetIssueProperties()
5248 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005249 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5250 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005251 if options.bypass_hooks:
5252 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5253 else:
5254 comment += ' (presubmit successful).'
5255 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5256
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005257 if os.path.isfile(POSTUPSTREAM_HOOK):
5258 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5259
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005260 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005261
5262
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005263def PushToGitWithAutoRebase(remote, branch, original_description,
5264 git_numberer_enabled, max_attempts=3):
5265 """Pushes current HEAD commit on top of remote's branch.
5266
5267 Attempts to fetch and autorebase on push failures.
5268 Adds git number footers on the fly.
5269
5270 Returns integer code from last command.
5271 """
5272 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5273 code = 0
5274 attempts_left = max_attempts
5275 while attempts_left:
5276 attempts_left -= 1
5277 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5278
5279 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5280 # If fetch fails, retry.
5281 print('Fetching %s/%s...' % (remote, branch))
5282 code, out = RunGitWithCode(
5283 ['retry', 'fetch', remote,
5284 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5285 if code:
5286 print('Fetch failed with exit code %d.' % code)
5287 print(out.strip())
5288 continue
5289
5290 print('Cherry-picking commit on top of latest %s' % branch)
5291 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5292 suppress_stderr=True)
5293 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5294 code, out = RunGitWithCode(['cherry-pick', cherry])
5295 if code:
5296 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5297 'the following files have merge conflicts:' %
5298 (branch, parent_hash))
5299 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5300 print('Please rebase your patch and try again.')
5301 RunGitWithCode(['cherry-pick', '--abort'])
5302 break
5303
5304 commit_desc = ChangeDescription(original_description)
5305 if git_numberer_enabled:
5306 logging.debug('Adding git number footers')
5307 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5308 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5309 branch)
5310 # Ensure timestamps are monotonically increasing.
5311 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5312 _get_committer_timestamp('HEAD'))
5313 _git_amend_head(commit_desc.description, timestamp)
5314
5315 code, out = RunGitWithCode(
5316 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5317 print(out)
5318 if code == 0:
5319 break
5320 if IsFatalPushFailure(out):
5321 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005322 'user.email are correct and you have push access to the repo.\n'
5323 'Hint: run command below to diangose common Git/Gerrit credential '
5324 'problems:\n'
5325 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005326 break
5327 return code
5328
5329
5330def IsFatalPushFailure(push_stdout):
5331 """True if retrying push won't help."""
5332 return '(prohibited by Gerrit)' in push_stdout
5333
5334
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005335@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005336def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005337 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005338 parser.add_option('-b', dest='newbranch',
5339 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005340 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005341 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005342 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005343 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005344 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005345 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005346 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005347 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005348 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005349 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005350
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005351
5352 group = optparse.OptionGroup(
5353 parser,
5354 'Options for continuing work on the current issue uploaded from a '
5355 'different clone (e.g. different machine). Must be used independently '
5356 'from the other options. No issue number should be specified, and the '
5357 'branch must have an issue number associated with it')
5358 group.add_option('--reapply', action='store_true', dest='reapply',
5359 help='Reset the branch and reapply the issue.\n'
5360 'CAUTION: This will undo any local changes in this '
5361 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005362
5363 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005364 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005365 parser.add_option_group(group)
5366
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005367 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005368 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005369 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005370 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005371 auth_config = auth.extract_auth_config_from_options(options)
5372
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005373 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005374 if options.newbranch:
5375 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005376 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005377 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005378
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005379 cl = Changelist(auth_config=auth_config,
5380 codereview=options.forced_codereview)
5381 if not cl.GetIssue():
5382 parser.error('current branch must have an associated issue')
5383
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005384 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005385 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005386 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005387
5388 RunGit(['reset', '--hard', upstream])
5389 if options.pull:
5390 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005391
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005392 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5393 options.directory)
5394
5395 if len(args) != 1 or not args[0]:
5396 parser.error('Must specify issue number or url')
5397
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005398 target_issue_arg = ParseIssueNumberArgument(args[0],
5399 options.forced_codereview)
5400 if not target_issue_arg.valid:
5401 parser.error('invalid codereview url or CL id')
5402
5403 cl_kwargs = {
5404 'auth_config': auth_config,
5405 'codereview_host': target_issue_arg.hostname,
5406 'codereview': options.forced_codereview,
5407 }
5408 detected_codereview_from_url = False
5409 if target_issue_arg.codereview and not options.forced_codereview:
5410 detected_codereview_from_url = True
5411 cl_kwargs['codereview'] = target_issue_arg.codereview
5412 cl_kwargs['issue'] = target_issue_arg.issue
5413
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005414 # We don't want uncommitted changes mixed up with the patch.
5415 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005416 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005417
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005418 if options.newbranch:
5419 if options.force:
5420 RunGit(['branch', '-D', options.newbranch],
5421 stderr=subprocess2.PIPE, error_ok=True)
5422 RunGit(['new-branch', options.newbranch])
5423
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005424 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005425
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005426 if cl.IsGerrit():
5427 if options.reject:
5428 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005429 if options.directory:
5430 parser.error('--directory is not supported with Gerrit codereview.')
5431
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005432 if detected_codereview_from_url:
5433 print('canonical issue/change URL: %s (type: %s)\n' %
5434 (cl.GetIssueURL(), target_issue_arg.codereview))
5435
5436 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005437 options.nocommit, options.directory,
5438 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005439
5440
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005441def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005442 """Fetches the tree status and returns either 'open', 'closed',
5443 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005444 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005445 if url:
5446 status = urllib2.urlopen(url).read().lower()
5447 if status.find('closed') != -1 or status == '0':
5448 return 'closed'
5449 elif status.find('open') != -1 or status == '1':
5450 return 'open'
5451 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005452 return 'unset'
5453
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005454
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005455def GetTreeStatusReason():
5456 """Fetches the tree status from a json url and returns the message
5457 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005458 url = settings.GetTreeStatusUrl()
5459 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005460 connection = urllib2.urlopen(json_url)
5461 status = json.loads(connection.read())
5462 connection.close()
5463 return status['message']
5464
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005465
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005466def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005467 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005468 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005469 status = GetTreeStatus()
5470 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005471 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005472 return 2
5473
vapiera7fbd5a2016-06-16 09:17:49 -07005474 print('The tree is %s' % status)
5475 print()
5476 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005477 if status != 'open':
5478 return 1
5479 return 0
5480
5481
maruel@chromium.org15192402012-09-06 12:38:29 +00005482def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005483 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005484 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005485 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005486 '-b', '--bot', action='append',
5487 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5488 'times to specify multiple builders. ex: '
5489 '"-b win_rel -b win_layout". See '
5490 'the try server waterfall for the builders name and the tests '
5491 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005492 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005493 '-B', '--bucket', default='',
5494 help=('Buildbucket bucket to send the try requests.'))
5495 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005496 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005497 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005498 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005499 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005500 help='Revision to use for the try job; default: the revision will '
5501 'be determined by the try recipe that builder runs, which usually '
5502 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005503 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005504 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005505 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005506 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005507 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005508 '--project',
5509 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005510 'in recipe to determine to which repository or directory to '
5511 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005512 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005513 '-p', '--property', dest='properties', action='append', default=[],
5514 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005515 'key2=value2 etc. The value will be treated as '
5516 'json if decodable, or as string otherwise. '
5517 'NOTE: using this may make your try job not usable for CQ, '
5518 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005519 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005520 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5521 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005522 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005523 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005524 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005525 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005526
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005527 if options.master and options.master.startswith('luci.'):
5528 parser.error(
5529 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005530 # Make sure that all properties are prop=value pairs.
5531 bad_params = [x for x in options.properties if '=' not in x]
5532 if bad_params:
5533 parser.error('Got properties with missing "=": %s' % bad_params)
5534
maruel@chromium.org15192402012-09-06 12:38:29 +00005535 if args:
5536 parser.error('Unknown arguments: %s' % args)
5537
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005538 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005539 if not cl.GetIssue():
5540 parser.error('Need to upload first')
5541
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005542 if cl.IsGerrit():
5543 # HACK: warm up Gerrit change detail cache to save on RPCs.
5544 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5545
tandriie113dfd2016-10-11 10:20:12 -07005546 error_message = cl.CannotTriggerTryJobReason()
5547 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005548 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005549
borenet6c0efe62016-10-19 08:13:29 -07005550 if options.bucket and options.master:
5551 parser.error('Only one of --bucket and --master may be used.')
5552
qyearsley1fdfcb62016-10-24 13:22:03 -07005553 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005554
qyearsleydd49f942016-10-28 11:57:22 -07005555 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5556 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005557 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005558 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005559 print('git cl try with no bots now defaults to CQ dry run.')
5560 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5561 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005562
borenet6c0efe62016-10-19 08:13:29 -07005563 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005564 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005565 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005566 'of bot requires an initial job from a parent (usually a builder). '
5567 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005568 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005569 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005570
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005571 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005572 # TODO(tandrii): Checking local patchset against remote patchset is only
5573 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5574 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005575 print('Warning: Codereview server has newer patchsets (%s) than most '
5576 'recent upload from local checkout (%s). Did a previous upload '
5577 'fail?\n'
5578 'By default, git cl try uses the latest patchset from '
5579 'codereview, continuing to use patchset %s.\n' %
5580 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005581
tandrii568043b2016-10-11 07:49:18 -07005582 try:
borenet6c0efe62016-10-19 08:13:29 -07005583 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5584 patchset)
tandrii568043b2016-10-11 07:49:18 -07005585 except BuildbucketResponseException as ex:
5586 print('ERROR: %s' % ex)
5587 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005588 return 0
5589
5590
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005591def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005592 """Prints info about try jobs associated with current CL."""
5593 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005594 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005595 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005596 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005597 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005598 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005599 '--color', action='store_true', default=setup_color.IS_TTY,
5600 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005601 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005602 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5603 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005604 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005605 '--json', help=('Path of JSON output file to write try job results to,'
5606 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005607 parser.add_option_group(group)
5608 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005609 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005610 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005611 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005612 if args:
5613 parser.error('Unrecognized args: %s' % ' '.join(args))
5614
5615 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005616 cl = Changelist(
5617 issue=options.issue, codereview=options.forced_codereview,
5618 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005619 if not cl.GetIssue():
5620 parser.error('Need to upload first')
5621
tandrii221ab252016-10-06 08:12:04 -07005622 patchset = options.patchset
5623 if not patchset:
5624 patchset = cl.GetMostRecentPatchset()
5625 if not patchset:
5626 parser.error('Codereview doesn\'t know about issue %s. '
5627 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005628 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005629 cl.GetIssue())
5630
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005631 # TODO(tandrii): Checking local patchset against remote patchset is only
5632 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5633 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005634 print('Warning: Codereview server has newer patchsets (%s) than most '
5635 'recent upload from local checkout (%s). Did a previous upload '
5636 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005637 'By default, git cl try-results uses the latest patchset from '
5638 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005639 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005640 try:
tandrii221ab252016-10-06 08:12:04 -07005641 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005642 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005643 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005644 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005645 if options.json:
5646 write_try_results_json(options.json, jobs)
5647 else:
5648 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005649 return 0
5650
5651
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005652@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005653def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005654 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005655 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005656 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005657 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005658
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005659 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005660 if args:
5661 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005662 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005663 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005664 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005665 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005666
5667 # Clear configured merge-base, if there is one.
5668 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005669 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005670 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005671 return 0
5672
5673
thestig@chromium.org00858c82013-12-02 23:08:03 +00005674def CMDweb(parser, args):
5675 """Opens the current CL in the web browser."""
5676 _, args = parser.parse_args(args)
5677 if args:
5678 parser.error('Unrecognized args: %s' % ' '.join(args))
5679
5680 issue_url = Changelist().GetIssueURL()
5681 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005682 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005683 return 1
5684
5685 webbrowser.open(issue_url)
5686 return 0
5687
5688
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005689def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005690 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005691 parser.add_option('-d', '--dry-run', action='store_true',
5692 help='trigger in dry run mode')
5693 parser.add_option('-c', '--clear', action='store_true',
5694 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005695 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005696 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005697 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005698 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005699 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005700 if args:
5701 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005702 if options.dry_run and options.clear:
5703 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5704
iannuccie53c9352016-08-17 14:40:40 -07005705 cl = Changelist(auth_config=auth_config, issue=options.issue,
5706 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005707 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005708 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005709 elif options.dry_run:
5710 state = _CQState.DRY_RUN
5711 else:
5712 state = _CQState.COMMIT
5713 if not cl.GetIssue():
5714 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005715 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005716 return 0
5717
5718
groby@chromium.org411034a2013-02-26 15:12:01 +00005719def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005720 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005721 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005722 auth.add_auth_options(parser)
5723 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005724 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005725 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005726 if args:
5727 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005728 cl = Changelist(auth_config=auth_config, issue=options.issue,
5729 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005730 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005731 if not cl.GetIssue():
5732 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005733 cl.CloseIssue()
5734 return 0
5735
5736
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005737def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005738 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005739 parser.add_option(
5740 '--stat',
5741 action='store_true',
5742 dest='stat',
5743 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005744 auth.add_auth_options(parser)
5745 options, args = parser.parse_args(args)
5746 auth_config = auth.extract_auth_config_from_options(options)
5747 if args:
5748 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005749
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005750 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005751 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005752 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005753 if not issue:
5754 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005755
Aaron Gablea718c3e2017-08-28 17:47:28 -07005756 base = cl._GitGetBranchConfigValue('last-upload-hash')
5757 if not base:
5758 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5759 if not base:
5760 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5761 revision_info = detail['revisions'][detail['current_revision']]
5762 fetch_info = revision_info['fetch']['http']
5763 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5764 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005765
Aaron Gablea718c3e2017-08-28 17:47:28 -07005766 cmd = ['git', 'diff']
5767 if options.stat:
5768 cmd.append('--stat')
5769 cmd.append(base)
5770 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005771
5772 return 0
5773
5774
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005775def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005776 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005777 parser.add_option(
5778 '--no-color',
5779 action='store_true',
5780 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005781 parser.add_option(
5782 '--batch',
5783 action='store_true',
5784 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005785 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005786 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005787 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005788
5789 author = RunGit(['config', 'user.email']).strip() or None
5790
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005791 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005792
5793 if args:
5794 if len(args) > 1:
5795 parser.error('Unknown args')
5796 base_branch = args[0]
5797 else:
5798 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005799 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005800
5801 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005802 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5803
5804 if options.batch:
5805 db = owners.Database(change.RepositoryRoot(), file, os.path)
5806 print('\n'.join(db.reviewers_for(affected_files, author)))
5807 return 0
5808
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005809 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005810 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005811 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005812 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005813 disable_color=options.no_color,
5814 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005815
5816
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005817def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005818 """Generates a diff command."""
5819 # Generate diff for the current branch's changes.
5820 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005821 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005822
5823 if args:
5824 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005825 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005826 diff_cmd.append(arg)
5827 else:
5828 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005829
5830 return diff_cmd
5831
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005832
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005833def MatchingFileType(file_name, extensions):
5834 """Returns true if the file name ends with one of the given extensions."""
5835 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005836
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005837
enne@chromium.org555cfe42014-01-29 18:21:39 +00005838@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005839def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005840 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005841 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005842 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005843 parser.add_option('--full', action='store_true',
5844 help='Reformat the full content of all touched files')
5845 parser.add_option('--dry-run', action='store_true',
5846 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005847 parser.add_option('--python', action='store_true',
5848 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005849 parser.add_option('--js', action='store_true',
5850 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005851 parser.add_option('--diff', action='store_true',
5852 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005853 parser.add_option('--presubmit', action='store_true',
5854 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005855 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005856
Daniel Chengc55eecf2016-12-30 03:11:02 -08005857 # Normalize any remaining args against the current path, so paths relative to
5858 # the current directory are still resolved as expected.
5859 args = [os.path.join(os.getcwd(), arg) for arg in args]
5860
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005861 # git diff generates paths against the root of the repository. Change
5862 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005863 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005864 if rel_base_path:
5865 os.chdir(rel_base_path)
5866
digit@chromium.org29e47272013-05-17 17:01:46 +00005867 # Grab the merge-base commit, i.e. the upstream commit of the current
5868 # branch when it was created or the last time it was rebased. This is
5869 # to cover the case where the user may have called "git fetch origin",
5870 # moving the origin branch to a newer commit, but hasn't rebased yet.
5871 upstream_commit = None
5872 cl = Changelist()
5873 upstream_branch = cl.GetUpstreamBranch()
5874 if upstream_branch:
5875 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5876 upstream_commit = upstream_commit.strip()
5877
5878 if not upstream_commit:
5879 DieWithError('Could not find base commit for this branch. '
5880 'Are you in detached state?')
5881
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005882 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5883 diff_output = RunGit(changed_files_cmd)
5884 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005885 # Filter out files deleted by this CL
5886 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005887
Christopher Lamc5ba6922017-01-24 11:19:14 +11005888 if opts.js:
5889 CLANG_EXTS.append('.js')
5890
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005891 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5892 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5893 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005894 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005895
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005896 top_dir = os.path.normpath(
5897 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5898
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005899 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5900 # formatted. This is used to block during the presubmit.
5901 return_value = 0
5902
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005903 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005904 # Locate the clang-format binary in the checkout
5905 try:
5906 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005907 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005908 DieWithError(e)
5909
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005910 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005911 cmd = [clang_format_tool]
5912 if not opts.dry_run and not opts.diff:
5913 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005914 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005915 if opts.diff:
5916 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005917 else:
5918 env = os.environ.copy()
5919 env['PATH'] = str(os.path.dirname(clang_format_tool))
5920 try:
5921 script = clang_format.FindClangFormatScriptInChromiumTree(
5922 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005923 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005924 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005925
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005926 cmd = [sys.executable, script, '-p0']
5927 if not opts.dry_run and not opts.diff:
5928 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005929
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005930 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5931 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005932
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005933 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5934 if opts.diff:
5935 sys.stdout.write(stdout)
5936 if opts.dry_run and len(stdout) > 0:
5937 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005938
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005939 # Similar code to above, but using yapf on .py files rather than clang-format
5940 # on C/C++ files
5941 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005942 yapf_tool = gclient_utils.FindExecutable('yapf')
5943 if yapf_tool is None:
5944 DieWithError('yapf not found in PATH')
5945
5946 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005947 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005948 cmd = [yapf_tool]
5949 if not opts.dry_run and not opts.diff:
5950 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005951 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005952 if opts.diff:
5953 sys.stdout.write(stdout)
5954 else:
5955 # TODO(sbc): yapf --lines mode still has some issues.
5956 # https://github.com/google/yapf/issues/154
5957 DieWithError('--python currently only works with --full')
5958
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005959 # Dart's formatter does not have the nice property of only operating on
5960 # modified chunks, so hard code full.
5961 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005962 try:
5963 command = [dart_format.FindDartFmtToolInChromiumTree()]
5964 if not opts.dry_run and not opts.diff:
5965 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005966 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005967
ppi@chromium.org6593d932016-03-03 15:41:15 +00005968 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005969 if opts.dry_run and stdout:
5970 return_value = 2
5971 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005972 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5973 'found in this checkout. Files in other languages are still '
5974 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005975
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005976 # Format GN build files. Always run on full build files for canonical form.
5977 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005978 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005979 if opts.dry_run or opts.diff:
5980 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005981 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005982 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5983 shell=sys.platform == 'win32',
5984 cwd=top_dir)
5985 if opts.dry_run and gn_ret == 2:
5986 return_value = 2 # Not formatted.
5987 elif opts.diff and gn_ret == 2:
5988 # TODO this should compute and print the actual diff.
5989 print("This change has GN build file diff for " + gn_diff_file)
5990 elif gn_ret != 0:
5991 # For non-dry run cases (and non-2 return values for dry-run), a
5992 # nonzero error code indicates a failure, probably because the file
5993 # doesn't parse.
5994 DieWithError("gn format failed on " + gn_diff_file +
5995 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005996
Ilya Shermane081cbe2017-08-15 17:51:04 -07005997 # Skip the metrics formatting from the global presubmit hook. These files have
5998 # a separate presubmit hook that issues an error if the files need formatting,
5999 # whereas the top-level presubmit script merely issues a warning. Formatting
6000 # these files is somewhat slow, so it's important not to duplicate the work.
6001 if not opts.presubmit:
6002 for xml_dir in GetDirtyMetricsDirs(diff_files):
6003 tool_dir = os.path.join(top_dir, xml_dir)
6004 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
6005 if opts.dry_run or opts.diff:
6006 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07006007 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07006008 if opts.diff:
6009 sys.stdout.write(stdout)
6010 if opts.dry_run and stdout:
6011 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006012
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006013 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006014
Steven Holte2e664bf2017-04-21 13:10:47 -07006015def GetDirtyMetricsDirs(diff_files):
6016 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6017 metrics_xml_dirs = [
6018 os.path.join('tools', 'metrics', 'actions'),
6019 os.path.join('tools', 'metrics', 'histograms'),
6020 os.path.join('tools', 'metrics', 'rappor'),
6021 os.path.join('tools', 'metrics', 'ukm')]
6022 for xml_dir in metrics_xml_dirs:
6023 if any(file.startswith(xml_dir) for file in xml_diff_files):
6024 yield xml_dir
6025
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006026
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006027@subcommand.usage('<codereview url or issue id>')
6028def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006029 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006030 _, args = parser.parse_args(args)
6031
6032 if len(args) != 1:
6033 parser.print_help()
6034 return 1
6035
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006036 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006037 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006038 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006039
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006040 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006041
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006042 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006043 output = RunGit(['config', '--local', '--get-regexp',
6044 r'branch\..*\.%s' % issueprefix],
6045 error_ok=True)
6046 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006047 if issue == target_issue:
6048 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006049
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006050 branches = []
6051 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006052 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006053 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006054 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006055 return 1
6056 if len(branches) == 1:
6057 RunGit(['checkout', branches[0]])
6058 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006059 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006060 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006061 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006062 which = raw_input('Choose by index: ')
6063 try:
6064 RunGit(['checkout', branches[int(which)]])
6065 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006066 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006067 return 1
6068
6069 return 0
6070
6071
maruel@chromium.org29404b52014-09-08 22:58:00 +00006072def CMDlol(parser, args):
6073 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006074 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006075 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6076 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6077 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006078 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006079 return 0
6080
6081
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006082class OptionParser(optparse.OptionParser):
6083 """Creates the option parse and add --verbose support."""
6084 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006085 optparse.OptionParser.__init__(
6086 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006087 self.add_option(
6088 '-v', '--verbose', action='count', default=0,
6089 help='Use 2 times for more debugging info')
6090
6091 def parse_args(self, args=None, values=None):
6092 options, args = optparse.OptionParser.parse_args(self, args, values)
6093 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006094 logging.basicConfig(
6095 level=levels[min(options.verbose, len(levels) - 1)],
6096 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6097 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006098 return options, args
6099
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006100
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006101def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006102 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006103 print('\nYour python version %s is unsupported, please upgrade.\n' %
6104 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006105 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006106
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006107 # Reload settings.
6108 global settings
6109 settings = Settings()
6110
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006111 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006112 dispatcher = subcommand.CommandDispatcher(__name__)
6113 try:
6114 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006115 except auth.AuthenticationError as e:
6116 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006117 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006118 if e.code != 500:
6119 raise
6120 DieWithError(
6121 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6122 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006123 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006124
6125
6126if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006127 # These affect sys.stdout so do it outside of main() to simplify mocks in
6128 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006129 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006130 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006131 try:
6132 sys.exit(main(sys.argv[1:]))
6133 except KeyboardInterrupt:
6134 sys.stderr.write('interrupted\n')
6135 sys.exit(1)