blob: 073410b7e81982875c6e594be66ac0abf008ef55 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
38try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080039 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000040except ImportError:
41 pass
42
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000043from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000044from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000045from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000046import auth
skobes6468b902016-10-24 08:45:10 -070047import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000048import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000049import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000050import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000051import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000052import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000053import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000054import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000056import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000057import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000058import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000060import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import scm
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:
152 logging.debug('Failed running %s', args)
153 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',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100969 ]
970
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100971 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
972 url_parts = urlparse.urlparse(remote_url)
973 project_name = url_parts.path.lstrip('/').rstrip('git./')
974 for known in KNOWN_PROJECTS_WHITELIST:
975 if project_name.endswith(known):
976 break
977 else:
978 # Early exit to avoid extra fetches for repos that aren't using Git
979 # Numberer.
980 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100981
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100982 with _get_gerrit_project_config_file(remote_url) as project_config_file:
983 if project_config_file is None:
984 # Failed to fetch project.config, which shouldn't happen on open source
985 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100986 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100987 def get_opts(x):
988 code, out = RunGitWithCode(
989 ['config', '-f', project_config_file, '--get-all',
990 'plugin.git-numberer.validate-%s-refglob' % x])
991 if code == 0:
992 return out.strip().splitlines()
993 return []
994 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100995
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100996 logging.info('validator config enabled %s disabled %s refglobs for '
997 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000998
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100999 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001000 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001001 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001002 return True
1003 return False
1004
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001005 if match_refglobs(disabled):
1006 return False
1007 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001008
1009
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001010def ShortBranchName(branch):
1011 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 return branch.replace('refs/heads/', '', 1)
1013
1014
1015def GetCurrentBranchRef():
1016 """Returns branch ref (e.g., refs/heads/master) or None."""
1017 return RunGit(['symbolic-ref', 'HEAD'],
1018 stderr=subprocess2.VOID, error_ok=True).strip() or None
1019
1020
1021def GetCurrentBranch():
1022 """Returns current branch or None.
1023
1024 For refs/heads/* branches, returns just last part. For others, full ref.
1025 """
1026 branchref = GetCurrentBranchRef()
1027 if branchref:
1028 return ShortBranchName(branchref)
1029 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030
1031
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001032class _CQState(object):
1033 """Enum for states of CL with respect to Commit Queue."""
1034 NONE = 'none'
1035 DRY_RUN = 'dry_run'
1036 COMMIT = 'commit'
1037
1038 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1039
1040
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001041class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001042 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001043 self.issue = issue
1044 self.patchset = patchset
1045 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001046 assert codereview in (None, 'rietveld', 'gerrit')
1047 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001048
1049 @property
1050 def valid(self):
1051 return self.issue is not None
1052
1053
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001054def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1056 fail_result = _ParsedIssueNumberArgument()
1057
1058 if arg.isdigit():
1059 return _ParsedIssueNumberArgument(issue=int(arg))
1060 if not arg.startswith('http'):
1061 return fail_result
1062 url = gclient_utils.UpgradeToHttps(arg)
1063 try:
1064 parsed_url = urlparse.urlparse(url)
1065 except ValueError:
1066 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001067
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001068 if codereview is not None:
1069 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1070 return parsed or fail_result
1071
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001072 results = {}
1073 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1074 parsed = cls.ParseIssueURL(parsed_url)
1075 if parsed is not None:
1076 results[name] = parsed
1077
1078 if not results:
1079 return fail_result
1080 if len(results) == 1:
1081 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001082
1083 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1084 # This is likely Gerrit.
1085 return results['gerrit']
1086 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001087 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001088
1089
Aaron Gablea45ee112016-11-22 15:14:38 -08001090class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001091 def __init__(self, issue, url):
1092 self.issue = issue
1093 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001094 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001095
1096 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001097 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001098 self.issue, self.url)
1099
1100
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001101_CommentSummary = collections.namedtuple(
1102 '_CommentSummary', ['date', 'message', 'sender',
1103 # TODO(tandrii): these two aren't known in Gerrit.
1104 'approval', 'disapproval'])
1105
1106
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001107class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001108 """Changelist works with one changelist in local branch.
1109
1110 Supports two codereview backends: Rietveld or Gerrit, selected at object
1111 creation.
1112
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001113 Notes:
1114 * Not safe for concurrent multi-{thread,process} use.
1115 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001116 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001117 """
1118
1119 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1120 """Create a new ChangeList instance.
1121
1122 If issue is given, the codereview must be given too.
1123
1124 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1125 Otherwise, it's decided based on current configuration of the local branch,
1126 with default being 'rietveld' for backwards compatibility.
1127 See _load_codereview_impl for more details.
1128
1129 **kwargs will be passed directly to codereview implementation.
1130 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001132 global settings
1133 if not settings:
1134 # Happens when git_cl.py is used as a utility library.
1135 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001136
1137 if issue:
1138 assert codereview, 'codereview must be known, if issue is known'
1139
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001140 self.branchref = branchref
1141 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001142 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001143 self.branch = ShortBranchName(self.branchref)
1144 else:
1145 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001146 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001147 self.lookedup_issue = False
1148 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001149 self.has_description = False
1150 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001151 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001152 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001153 self.cc = None
1154 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001155 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001156
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001157 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001158 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001159 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001160 assert self._codereview_impl
1161 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001162
1163 def _load_codereview_impl(self, codereview=None, **kwargs):
1164 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001165 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1166 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1167 self._codereview = codereview
1168 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001169 return
1170
1171 # Automatic selection based on issue number set for a current branch.
1172 # Rietveld takes precedence over Gerrit.
1173 assert not self.issue
1174 # Whether we find issue or not, we are doing the lookup.
1175 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001176 if self.GetBranch():
1177 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1178 issue = _git_get_branch_config_value(
1179 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1180 if issue:
1181 self._codereview = codereview
1182 self._codereview_impl = cls(self, **kwargs)
1183 self.issue = int(issue)
1184 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001185
1186 # No issue is set for this branch, so decide based on repo-wide settings.
1187 return self._load_codereview_impl(
1188 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1189 **kwargs)
1190
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001191 def IsGerrit(self):
1192 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001193
1194 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001195 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001196
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001197 The return value is a string suitable for passing to git cl with the --cc
1198 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001199 """
1200 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001201 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001202 more_cc = ','.join(self.watchers)
1203 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1204 return self.cc
1205
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001206 def GetCCListWithoutDefault(self):
1207 """Return the users cc'd on this CL excluding default ones."""
1208 if self.cc is None:
1209 self.cc = ','.join(self.watchers)
1210 return self.cc
1211
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001212 def SetWatchers(self, watchers):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001213 """Sets the list of email addresses that should be cc'd based on the changed
1214 files in this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001215 """
1216 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001217
1218 def GetBranch(self):
1219 """Returns the short branch name, e.g. 'master'."""
1220 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001221 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001222 if not branchref:
1223 return None
1224 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001225 self.branch = ShortBranchName(self.branchref)
1226 return self.branch
1227
1228 def GetBranchRef(self):
1229 """Returns the full branch name, e.g. 'refs/heads/master'."""
1230 self.GetBranch() # Poke the lazy loader.
1231 return self.branchref
1232
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001233 def ClearBranch(self):
1234 """Clears cached branch data of this object."""
1235 self.branch = self.branchref = None
1236
tandrii5d48c322016-08-18 16:19:37 -07001237 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1238 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1239 kwargs['branch'] = self.GetBranch()
1240 return _git_get_branch_config_value(key, default, **kwargs)
1241
1242 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1243 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1244 assert self.GetBranch(), (
1245 'this CL must have an associated branch to %sset %s%s' %
1246 ('un' if value is None else '',
1247 key,
1248 '' if value is None else ' to %r' % value))
1249 kwargs['branch'] = self.GetBranch()
1250 return _git_set_branch_config_value(key, value, **kwargs)
1251
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001252 @staticmethod
1253 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001254 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 e.g. 'origin', 'refs/heads/master'
1256 """
1257 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001258 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1259
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001261 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001262 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001263 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1264 error_ok=True).strip()
1265 if upstream_branch:
1266 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001268 # Else, try to guess the origin remote.
1269 remote_branches = RunGit(['branch', '-r']).split()
1270 if 'origin/master' in remote_branches:
1271 # Fall back on origin/master if it exits.
1272 remote = 'origin'
1273 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001274 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001275 DieWithError(
1276 'Unable to determine default branch to diff against.\n'
1277 'Either pass complete "git diff"-style arguments, like\n'
1278 ' git cl upload origin/master\n'
1279 'or verify this branch is set up to track another \n'
1280 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001281
1282 return remote, upstream_branch
1283
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001284 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001285 upstream_branch = self.GetUpstreamBranch()
1286 if not BranchExists(upstream_branch):
1287 DieWithError('The upstream for the current branch (%s) does not exist '
1288 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001289 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001290 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001291
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001292 def GetUpstreamBranch(self):
1293 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001294 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001296 upstream_branch = upstream_branch.replace('refs/heads/',
1297 'refs/remotes/%s/' % remote)
1298 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1299 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001300 self.upstream_branch = upstream_branch
1301 return self.upstream_branch
1302
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001303 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001304 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001305 remote, branch = None, self.GetBranch()
1306 seen_branches = set()
1307 while branch not in seen_branches:
1308 seen_branches.add(branch)
1309 remote, branch = self.FetchUpstreamTuple(branch)
1310 branch = ShortBranchName(branch)
1311 if remote != '.' or branch.startswith('refs/remotes'):
1312 break
1313 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001314 remotes = RunGit(['remote'], error_ok=True).split()
1315 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001316 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001317 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001318 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001319 logging.warn('Could not determine which remote this change is '
1320 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001321 else:
1322 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001323 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001324 branch = 'HEAD'
1325 if branch.startswith('refs/remotes'):
1326 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001327 elif branch.startswith('refs/branch-heads/'):
1328 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001329 else:
1330 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001331 return self._remote
1332
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001333 def GitSanityChecks(self, upstream_git_obj):
1334 """Checks git repo status and ensures diff is from local commits."""
1335
sbc@chromium.org79706062015-01-14 21:18:12 +00001336 if upstream_git_obj is None:
1337 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001338 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001339 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001340 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001341 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001342 return False
1343
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001344 # Verify the commit we're diffing against is in our current branch.
1345 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1346 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1347 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001348 print('ERROR: %s is not in the current branch. You may need to rebase '
1349 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001350 return False
1351
1352 # List the commits inside the diff, and verify they are all local.
1353 commits_in_diff = RunGit(
1354 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1355 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1356 remote_branch = remote_branch.strip()
1357 if code != 0:
1358 _, remote_branch = self.GetRemoteBranch()
1359
1360 commits_in_remote = RunGit(
1361 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1362
1363 common_commits = set(commits_in_diff) & set(commits_in_remote)
1364 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001365 print('ERROR: Your diff contains %d commits already in %s.\n'
1366 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1367 'the diff. If you are using a custom git flow, you can override'
1368 ' the reference used for this check with "git config '
1369 'gitcl.remotebranch <git-ref>".' % (
1370 len(common_commits), remote_branch, upstream_git_obj),
1371 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001372 return False
1373 return True
1374
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001375 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001376 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001377
1378 Returns None if it is not set.
1379 """
tandrii5d48c322016-08-18 16:19:37 -07001380 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001381
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001382 def GetRemoteUrl(self):
1383 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1384
1385 Returns None if there is no remote.
1386 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001387 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001388 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1389
1390 # If URL is pointing to a local directory, it is probably a git cache.
1391 if os.path.isdir(url):
1392 url = RunGit(['config', 'remote.%s.url' % remote],
1393 error_ok=True,
1394 cwd=url).strip()
1395 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001396
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001397 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001398 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001399 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001400 self.issue = self._GitGetBranchConfigValue(
1401 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001402 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001403 return self.issue
1404
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001405 def GetIssueURL(self):
1406 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001407 issue = self.GetIssue()
1408 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001409 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001410 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001411
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001412 def GetDescription(self, pretty=False, force=False):
1413 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001414 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001415 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001416 self.has_description = True
1417 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001418 # Set width to 72 columns + 2 space indent.
1419 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001420 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001421 lines = self.description.splitlines()
1422 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001423 return self.description
1424
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001425 def GetDescriptionFooters(self):
1426 """Returns (non_footer_lines, footers) for the commit message.
1427
1428 Returns:
1429 non_footer_lines (list(str)) - Simple list of description lines without
1430 any footer. The lines do not contain newlines, nor does the list contain
1431 the empty line between the message and the footers.
1432 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1433 [("Change-Id", "Ideadbeef...."), ...]
1434 """
1435 raw_description = self.GetDescription()
1436 msg_lines, _, footers = git_footers.split_footers(raw_description)
1437 if footers:
1438 msg_lines = msg_lines[:len(msg_lines)-1]
1439 return msg_lines, footers
1440
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001441 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001442 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001443 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001444 self.patchset = self._GitGetBranchConfigValue(
1445 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001446 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001447 return self.patchset
1448
1449 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001450 """Set this branch's patchset. If patchset=0, clears the patchset."""
1451 assert self.GetBranch()
1452 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001453 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001454 else:
1455 self.patchset = int(patchset)
1456 self._GitSetBranchConfigValue(
1457 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001458
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001459 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001460 """Set this branch's issue. If issue isn't given, clears the issue."""
1461 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001462 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001463 issue = int(issue)
1464 self._GitSetBranchConfigValue(
1465 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001466 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001467 codereview_server = self._codereview_impl.GetCodereviewServer()
1468 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001469 self._GitSetBranchConfigValue(
1470 self._codereview_impl.CodereviewServerConfigKey(),
1471 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001472 else:
tandrii5d48c322016-08-18 16:19:37 -07001473 # Reset all of these just to be clean.
1474 reset_suffixes = [
1475 'last-upload-hash',
1476 self._codereview_impl.IssueConfigKey(),
1477 self._codereview_impl.PatchsetConfigKey(),
1478 self._codereview_impl.CodereviewServerConfigKey(),
1479 ] + self._PostUnsetIssueProperties()
1480 for prop in reset_suffixes:
1481 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001482 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001483 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001484
dnjba1b0f32016-09-02 12:37:42 -07001485 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001486 if not self.GitSanityChecks(upstream_branch):
1487 DieWithError('\nGit sanity check failure')
1488
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001489 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001490 if not root:
1491 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001492 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001493
1494 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001495 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001496 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001497 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001498 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001499 except subprocess2.CalledProcessError:
1500 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001501 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001502 'This branch probably doesn\'t exist anymore. To reset the\n'
1503 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001504 ' git branch --set-upstream-to origin/master %s\n'
1505 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001506 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001507
maruel@chromium.org52424302012-08-29 15:14:30 +00001508 issue = self.GetIssue()
1509 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001510 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001511 description = self.GetDescription()
1512 else:
1513 # If the change was never uploaded, use the log messages of all commits
1514 # up to the branch point, as git cl upload will prefill the description
1515 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001516 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1517 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001518
1519 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001520 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001521 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001522 name,
1523 description,
1524 absroot,
1525 files,
1526 issue,
1527 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001528 author,
1529 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001530
dsansomee2d6fd92016-09-08 00:10:47 -07001531 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001532 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001533 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001534 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001535
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001536 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1537 """Sets the description for this CL remotely.
1538
1539 You can get description_lines and footers with GetDescriptionFooters.
1540
1541 Args:
1542 description_lines (list(str)) - List of CL description lines without
1543 newline characters.
1544 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1545 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1546 `List-Of-Tokens`). It will be case-normalized so that each token is
1547 title-cased.
1548 """
1549 new_description = '\n'.join(description_lines)
1550 if footers:
1551 new_description += '\n'
1552 for k, v in footers:
1553 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1554 if not git_footers.FOOTER_PATTERN.match(foot):
1555 raise ValueError('Invalid footer %r' % foot)
1556 new_description += foot + '\n'
1557 self.UpdateDescription(new_description, force)
1558
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001559 def RunHook(self, committing, may_prompt, verbose, change):
1560 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1561 try:
1562 return presubmit_support.DoPresubmitChecks(change, committing,
1563 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1564 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001565 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001566 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001567 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001568 DieWithError(
1569 ('%s\nMaybe your depot_tools is out of date?\n'
1570 'If all fails, contact maruel@') % e)
1571
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001572 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1573 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001574 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1575 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001576 else:
1577 # Assume url.
1578 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1579 urlparse.urlparse(issue_arg))
1580 if not parsed_issue_arg or not parsed_issue_arg.valid:
1581 DieWithError('Failed to parse issue argument "%s". '
1582 'Must be an issue number or a valid URL.' % issue_arg)
1583 return self._codereview_impl.CMDPatchWithParsedIssue(
1584 parsed_issue_arg, reject, nocommit, directory)
1585
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001586 def CMDUpload(self, options, git_diff_args, orig_args):
1587 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001588 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001589 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001590 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001591 else:
1592 if self.GetBranch() is None:
1593 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1594
1595 # Default to diffing against common ancestor of upstream branch
1596 base_branch = self.GetCommonAncestorWithUpstream()
1597 git_diff_args = [base_branch, 'HEAD']
1598
Aaron Gablec4c40d12017-05-22 11:49:53 -07001599 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1600 if not self.IsGerrit() and not self.GetIssue():
1601 print('=====================================')
1602 print('NOTICE: Rietveld is being deprecated. '
1603 'You can upload changes to Gerrit with')
1604 print(' git cl upload --gerrit')
1605 print('or set Gerrit to be your default code review tool with')
1606 print(' git config gerrit.host true')
1607 print('=====================================')
1608
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001609 # Fast best-effort checks to abort before running potentially
1610 # expensive hooks if uploading is likely to fail anyway. Passing these
1611 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001612 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001613 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001614
1615 # Apply watchlists on upload.
1616 change = self.GetChange(base_branch, None)
1617 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1618 files = [f.LocalPath() for f in change.AffectedFiles()]
1619 if not options.bypass_watchlists:
1620 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1621
1622 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001623 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001624 # Set the reviewer list now so that presubmit checks can access it.
1625 change_description = ChangeDescription(change.FullDescriptionText())
1626 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001627 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001628 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001629 change)
1630 change.SetDescriptionText(change_description.description)
1631 hook_results = self.RunHook(committing=False,
1632 may_prompt=not options.force,
1633 verbose=options.verbose,
1634 change=change)
1635 if not hook_results.should_continue():
1636 return 1
1637 if not options.reviewers and hook_results.reviewers:
1638 options.reviewers = hook_results.reviewers.split(',')
1639
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001640 # TODO(tandrii): Checking local patchset against remote patchset is only
1641 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1642 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001643 latest_patchset = self.GetMostRecentPatchset()
1644 local_patchset = self.GetPatchset()
1645 if (latest_patchset and local_patchset and
1646 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001647 print('The last upload made from this repository was patchset #%d but '
1648 'the most recent patchset on the server is #%d.'
1649 % (local_patchset, latest_patchset))
1650 print('Uploading will still work, but if you\'ve uploaded to this '
1651 'issue from another machine or branch the patch you\'re '
1652 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001653 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001654
1655 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001656 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001657 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001658 if options.use_commit_queue:
1659 self.SetCQState(_CQState.COMMIT)
1660 elif options.cq_dry_run:
1661 self.SetCQState(_CQState.DRY_RUN)
1662
tandrii5d48c322016-08-18 16:19:37 -07001663 _git_set_branch_config_value('last-upload-hash',
1664 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001665 # Run post upload hooks, if specified.
1666 if settings.GetRunPostUploadHook():
1667 presubmit_support.DoPostUploadExecuter(
1668 change,
1669 self,
1670 settings.GetRoot(),
1671 options.verbose,
1672 sys.stdout)
1673
1674 # Upload all dependencies if specified.
1675 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001676 print()
1677 print('--dependencies has been specified.')
1678 print('All dependent local branches will be re-uploaded.')
1679 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001680 # Remove the dependencies flag from args so that we do not end up in a
1681 # loop.
1682 orig_args.remove('--dependencies')
1683 ret = upload_branch_deps(self, orig_args)
1684 return ret
1685
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001686 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001687 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001688
1689 Issue must have been already uploaded and known.
1690 """
1691 assert new_state in _CQState.ALL_STATES
1692 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001693 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001694 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001695 return 0
1696 except KeyboardInterrupt:
1697 raise
1698 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001699 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001700 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001701 ' * Your project has no CQ,\n'
1702 ' * You don\'t have permission to change the CQ state,\n'
1703 ' * There\'s a bug in this code (see stack trace below).\n'
1704 'Consider specifying which bots to trigger manually or asking your '
1705 'project owners for permissions or contacting Chrome Infra at:\n'
1706 'https://www.chromium.org/infra\n\n' %
1707 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001708 # Still raise exception so that stack trace is printed.
1709 raise
1710
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001711 # Forward methods to codereview specific implementation.
1712
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001713 def AddComment(self, message):
1714 return self._codereview_impl.AddComment(message)
1715
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001716 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001717 """Returns list of _CommentSummary for each comment.
1718
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001719 args:
1720 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001721 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001722 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001723
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001724 def CloseIssue(self):
1725 return self._codereview_impl.CloseIssue()
1726
1727 def GetStatus(self):
1728 return self._codereview_impl.GetStatus()
1729
1730 def GetCodereviewServer(self):
1731 return self._codereview_impl.GetCodereviewServer()
1732
tandriide281ae2016-10-12 06:02:30 -07001733 def GetIssueOwner(self):
1734 """Get owner from codereview, which may differ from this checkout."""
1735 return self._codereview_impl.GetIssueOwner()
1736
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737 def GetMostRecentPatchset(self):
1738 return self._codereview_impl.GetMostRecentPatchset()
1739
tandriide281ae2016-10-12 06:02:30 -07001740 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001741 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001742 return self._codereview_impl.CannotTriggerTryJobReason()
1743
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001744 def GetTryJobProperties(self, patchset=None):
1745 """Returns dictionary of properties to launch try job."""
1746 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001747
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001748 def __getattr__(self, attr):
1749 # This is because lots of untested code accesses Rietveld-specific stuff
1750 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001751 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001752 # Note that child method defines __getattr__ as well, and forwards it here,
1753 # because _RietveldChangelistImpl is not cleaned up yet, and given
1754 # deprecation of Rietveld, it should probably be just removed.
1755 # Until that time, avoid infinite recursion by bypassing __getattr__
1756 # of implementation class.
1757 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001758
1759
1760class _ChangelistCodereviewBase(object):
1761 """Abstract base class encapsulating codereview specifics of a changelist."""
1762 def __init__(self, changelist):
1763 self._changelist = changelist # instance of Changelist
1764
1765 def __getattr__(self, attr):
1766 # Forward methods to changelist.
1767 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1768 # _RietveldChangelistImpl to avoid this hack?
1769 return getattr(self._changelist, attr)
1770
1771 def GetStatus(self):
1772 """Apply a rough heuristic to give a simple summary of an issue's review
1773 or CQ status, assuming adherence to a common workflow.
1774
1775 Returns None if no issue for this branch, or specific string keywords.
1776 """
1777 raise NotImplementedError()
1778
1779 def GetCodereviewServer(self):
1780 """Returns server URL without end slash, like "https://codereview.com"."""
1781 raise NotImplementedError()
1782
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001783 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001784 """Fetches and returns description from the codereview server."""
1785 raise NotImplementedError()
1786
tandrii5d48c322016-08-18 16:19:37 -07001787 @classmethod
1788 def IssueConfigKey(cls):
1789 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001790 raise NotImplementedError()
1791
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001792 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001793 def PatchsetConfigKey(cls):
1794 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001795 raise NotImplementedError()
1796
tandrii5d48c322016-08-18 16:19:37 -07001797 @classmethod
1798 def CodereviewServerConfigKey(cls):
1799 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001800 raise NotImplementedError()
1801
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001802 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001803 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001804 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001805
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001806 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001808 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001809 raise NotImplementedError()
1810
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001811 def GetGerritObjForPresubmit(self):
1812 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1813 return None
1814
dsansomee2d6fd92016-09-08 00:10:47 -07001815 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 """Update the description on codereview site."""
1817 raise NotImplementedError()
1818
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001819 def AddComment(self, message):
1820 """Posts a comment to the codereview site."""
1821 raise NotImplementedError()
1822
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001823 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001824 raise NotImplementedError()
1825
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826 def CloseIssue(self):
1827 """Closes the issue."""
1828 raise NotImplementedError()
1829
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001830 def GetMostRecentPatchset(self):
1831 """Returns the most recent patchset number from the codereview site."""
1832 raise NotImplementedError()
1833
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001834 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1835 directory):
1836 """Fetches and applies the issue.
1837
1838 Arguments:
1839 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1840 reject: if True, reject the failed patch instead of switching to 3-way
1841 merge. Rietveld only.
1842 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1843 only.
1844 directory: switch to directory before applying the patch. Rietveld only.
1845 """
1846 raise NotImplementedError()
1847
1848 @staticmethod
1849 def ParseIssueURL(parsed_url):
1850 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1851 failed."""
1852 raise NotImplementedError()
1853
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001854 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001855 """Best effort check that user is authenticated with codereview server.
1856
1857 Arguments:
1858 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001859 refresh: whether to attempt to refresh credentials. Ignored if not
1860 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001861 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001862 raise NotImplementedError()
1863
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001864 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001865 """Best effort check that uploading isn't supposed to fail for predictable
1866 reasons.
1867
1868 This method should raise informative exception if uploading shouldn't
1869 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001870
1871 Arguments:
1872 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001873 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001874 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001875
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001876 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001877 """Uploads a change to codereview."""
1878 raise NotImplementedError()
1879
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001880 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001881 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001882
1883 Issue must have been already uploaded and known.
1884 """
1885 raise NotImplementedError()
1886
tandriie113dfd2016-10-11 10:20:12 -07001887 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001888 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001889 raise NotImplementedError()
1890
tandriide281ae2016-10-12 06:02:30 -07001891 def GetIssueOwner(self):
1892 raise NotImplementedError()
1893
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001894 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001895 raise NotImplementedError()
1896
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001897
1898class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001899
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001900 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001901 super(_RietveldChangelistImpl, self).__init__(changelist)
1902 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001903 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001904 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001906 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001907 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001908 self._props = None
1909 self._rpc_server = None
1910
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001911 def GetCodereviewServer(self):
1912 if not self._rietveld_server:
1913 # If we're on a branch then get the server potentially associated
1914 # with that branch.
1915 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001916 self._rietveld_server = gclient_utils.UpgradeToHttps(
1917 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001918 if not self._rietveld_server:
1919 self._rietveld_server = settings.GetDefaultServerUrl()
1920 return self._rietveld_server
1921
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001922 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001923 """Best effort check that user is authenticated with Rietveld server."""
1924 if self._auth_config.use_oauth2:
1925 authenticator = auth.get_authenticator_for_host(
1926 self.GetCodereviewServer(), self._auth_config)
1927 if not authenticator.has_cached_credentials():
1928 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001929 if refresh:
1930 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001931
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001932 def EnsureCanUploadPatchset(self, force):
1933 # No checks for Rietveld because we are deprecating Rietveld.
1934 pass
1935
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001936 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001937 issue = self.GetIssue()
1938 assert issue
1939 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001940 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001941 except urllib2.HTTPError as e:
1942 if e.code == 404:
1943 DieWithError(
1944 ('\nWhile fetching the description for issue %d, received a '
1945 '404 (not found)\n'
1946 'error. It is likely that you deleted this '
1947 'issue on the server. If this is the\n'
1948 'case, please run\n\n'
1949 ' git cl issue 0\n\n'
1950 'to clear the association with the deleted issue. Then run '
1951 'this command again.') % issue)
1952 else:
1953 DieWithError(
1954 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1955 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001956 print('Warning: Failed to retrieve CL description due to network '
1957 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001958 return ''
1959
1960 def GetMostRecentPatchset(self):
1961 return self.GetIssueProperties()['patchsets'][-1]
1962
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001963 def GetIssueProperties(self):
1964 if self._props is None:
1965 issue = self.GetIssue()
1966 if not issue:
1967 self._props = {}
1968 else:
1969 self._props = self.RpcServer().get_issue_properties(issue, True)
1970 return self._props
1971
tandriie113dfd2016-10-11 10:20:12 -07001972 def CannotTriggerTryJobReason(self):
1973 props = self.GetIssueProperties()
1974 if not props:
1975 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1976 if props.get('closed'):
1977 return 'CL %s is closed' % self.GetIssue()
1978 if props.get('private'):
1979 return 'CL %s is private' % self.GetIssue()
1980 return None
1981
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001982 def GetTryJobProperties(self, patchset=None):
1983 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001984 project = (self.GetIssueProperties() or {}).get('project')
1985 return {
1986 'issue': self.GetIssue(),
1987 'patch_project': project,
1988 'patch_storage': 'rietveld',
1989 'patchset': patchset or self.GetPatchset(),
1990 'rietveld': self.GetCodereviewServer(),
1991 }
1992
tandriide281ae2016-10-12 06:02:30 -07001993 def GetIssueOwner(self):
1994 return (self.GetIssueProperties() or {}).get('owner_email')
1995
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001996 def AddComment(self, message):
1997 return self.RpcServer().add_comment(self.GetIssue(), message)
1998
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001999 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002000 summary = []
2001 for message in self.GetIssueProperties().get('messages', []):
2002 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2003 summary.append(_CommentSummary(
2004 date=date,
2005 disapproval=bool(message['disapproval']),
2006 approval=bool(message['approval']),
2007 sender=message['sender'],
2008 message=message['text'],
2009 ))
2010 return summary
2011
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002012 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002013 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002014 or CQ status, assuming adherence to a common workflow.
2015
2016 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002017 * 'error' - error from review tool (including deleted issues)
2018 * 'unsent' - not sent for review
2019 * 'waiting' - waiting for review
2020 * 'reply' - waiting for owner to reply to review
2021 * 'not lgtm' - Code-Review label has been set negatively
2022 * 'lgtm' - LGTM from at least one approved reviewer
2023 * 'commit' - in the commit queue
2024 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002025 """
2026 if not self.GetIssue():
2027 return None
2028
2029 try:
2030 props = self.GetIssueProperties()
2031 except urllib2.HTTPError:
2032 return 'error'
2033
2034 if props.get('closed'):
2035 # Issue is closed.
2036 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002037 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002038 # Issue is in the commit queue.
2039 return 'commit'
2040
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002041 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002042 if not messages:
2043 # No message was sent.
2044 return 'unsent'
2045
2046 if get_approving_reviewers(props):
2047 return 'lgtm'
2048 elif get_approving_reviewers(props, disapproval=True):
2049 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002050
tandrii9d2c7a32016-06-22 03:42:45 -07002051 # Skip CQ messages that don't require owner's action.
2052 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2053 if 'Dry run:' in messages[-1]['text']:
2054 messages.pop()
2055 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2056 # This message always follows prior messages from CQ,
2057 # so skip this too.
2058 messages.pop()
2059 else:
2060 # This is probably a CQ messages warranting user attention.
2061 break
2062
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002063 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002064 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002065 return 'reply'
2066 return 'waiting'
2067
dsansomee2d6fd92016-09-08 00:10:47 -07002068 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002069 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002070
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002071 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002072 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002073
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002074 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002075 return self.SetFlags({flag: value})
2076
2077 def SetFlags(self, flags):
2078 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002079 """
phajdan.jr68598232016-08-10 03:28:28 -07002080 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002081 try:
tandrii4b233bd2016-07-06 03:50:29 -07002082 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002083 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002084 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002085 if e.code == 404:
2086 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2087 if e.code == 403:
2088 DieWithError(
2089 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002090 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002091 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002092
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002093 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002094 """Returns an upload.RpcServer() to access this review's rietveld instance.
2095 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002096 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002097 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002098 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002099 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002100 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002101
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002102 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002103 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002104 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002105
tandrii5d48c322016-08-18 16:19:37 -07002106 @classmethod
2107 def PatchsetConfigKey(cls):
2108 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002109
tandrii5d48c322016-08-18 16:19:37 -07002110 @classmethod
2111 def CodereviewServerConfigKey(cls):
2112 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002113
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002114 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002115 return self.RpcServer()
2116
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002117 def SetCQState(self, new_state):
2118 props = self.GetIssueProperties()
2119 if props.get('private'):
2120 DieWithError('Cannot set-commit on private issue')
2121
2122 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002123 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002124 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002125 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002126 else:
tandrii4b233bd2016-07-06 03:50:29 -07002127 assert new_state == _CQState.DRY_RUN
2128 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002129
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2131 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002132 # PatchIssue should never be called with a dirty tree. It is up to the
2133 # caller to check this, but just in case we assert here since the
2134 # consequences of the caller not checking this could be dire.
2135 assert(not git_common.is_dirty_git_tree('apply'))
2136 assert(parsed_issue_arg.valid)
2137 self._changelist.issue = parsed_issue_arg.issue
2138 if parsed_issue_arg.hostname:
2139 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2140
skobes6468b902016-10-24 08:45:10 -07002141 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2142 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2143 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002144 try:
skobes6468b902016-10-24 08:45:10 -07002145 scm_obj.apply_patch(patchset_object)
2146 except Exception as e:
2147 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002148 return 1
2149
2150 # If we had an issue, commit the current state and register the issue.
2151 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002152 self.SetIssue(self.GetIssue())
2153 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002154 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2155 'patch from issue %(i)s at patchset '
2156 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2157 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002158 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002160 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 return 0
2162
2163 @staticmethod
2164 def ParseIssueURL(parsed_url):
2165 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2166 return None
wychen3c1c1722016-08-04 11:46:36 -07002167 # Rietveld patch: https://domain/<number>/#ps<patchset>
2168 match = re.match(r'/(\d+)/$', parsed_url.path)
2169 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2170 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002171 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002172 issue=int(match.group(1)),
2173 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002174 hostname=parsed_url.netloc,
2175 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 # Typical url: https://domain/<issue_number>[/[other]]
2177 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2178 if match:
skobes6468b902016-10-24 08:45:10 -07002179 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002180 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002181 hostname=parsed_url.netloc,
2182 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002183 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2184 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2185 if match:
skobes6468b902016-10-24 08:45:10 -07002186 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 issue=int(match.group(1)),
2188 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002189 hostname=parsed_url.netloc,
2190 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 return None
2192
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002193 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002194 """Upload the patch to Rietveld."""
2195 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2196 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002197 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2198 if options.emulate_svn_auto_props:
2199 upload_args.append('--emulate_svn_auto_props')
2200
2201 change_desc = None
2202
2203 if options.email is not None:
2204 upload_args.extend(['--email', options.email])
2205
2206 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002207 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 upload_args.extend(['--title', options.title])
2209 if options.message:
2210 upload_args.extend(['--message', options.message])
2211 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002212 print('This branch is associated with issue %s. '
2213 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002214 else:
nodirca166002016-06-27 10:59:51 -07002215 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002216 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002217 if options.message:
2218 message = options.message
2219 else:
2220 message = CreateDescriptionFromLog(args)
2221 if options.title:
2222 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002223 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002224 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002225 change_desc.update_reviewers(options.reviewers, options.tbrs,
2226 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002227 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002228 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002229
2230 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002231 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002232 return 1
2233
2234 upload_args.extend(['--message', change_desc.description])
2235 if change_desc.get_reviewers():
2236 upload_args.append('--reviewers=%s' % ','.join(
2237 change_desc.get_reviewers()))
2238 if options.send_mail:
2239 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002240 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002241 upload_args.append('--send_mail')
2242
2243 # We check this before applying rietveld.private assuming that in
2244 # rietveld.cc only addresses which we can send private CLs to are listed
2245 # if rietveld.private is set, and so we should ignore rietveld.cc only
2246 # when --private is specified explicitly on the command line.
2247 if options.private:
2248 logging.warn('rietveld.cc is ignored since private flag is specified. '
2249 'You need to review and add them manually if necessary.')
2250 cc = self.GetCCListWithoutDefault()
2251 else:
2252 cc = self.GetCCList()
2253 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002254 if change_desc.get_cced():
2255 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002256 if cc:
2257 upload_args.extend(['--cc', cc])
2258
2259 if options.private or settings.GetDefaultPrivateFlag() == "True":
2260 upload_args.append('--private')
2261
2262 upload_args.extend(['--git_similarity', str(options.similarity)])
2263 if not options.find_copies:
2264 upload_args.extend(['--git_no_find_copies'])
2265
2266 # Include the upstream repo's URL in the change -- this is useful for
2267 # projects that have their source spread across multiple repos.
2268 remote_url = self.GetGitBaseUrlFromConfig()
2269 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002270 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2271 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2272 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002273 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002274 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002275 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002276 if target_ref:
2277 upload_args.extend(['--target_ref', target_ref])
2278
2279 # Look for dependent patchsets. See crbug.com/480453 for more details.
2280 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2281 upstream_branch = ShortBranchName(upstream_branch)
2282 if remote is '.':
2283 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002284 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002286 print()
2287 print('Skipping dependency patchset upload because git config '
2288 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2289 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002290 else:
2291 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002292 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002293 auth_config=auth_config)
2294 branch_cl_issue_url = branch_cl.GetIssueURL()
2295 branch_cl_issue = branch_cl.GetIssue()
2296 branch_cl_patchset = branch_cl.GetPatchset()
2297 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2298 upload_args.extend(
2299 ['--depends_on_patchset', '%s:%s' % (
2300 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002301 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002302 '\n'
2303 'The current branch (%s) is tracking a local branch (%s) with '
2304 'an associated CL.\n'
2305 'Adding %s/#ps%s as a dependency patchset.\n'
2306 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2307 branch_cl_patchset))
2308
2309 project = settings.GetProject()
2310 if project:
2311 upload_args.extend(['--project', project])
2312
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002313 try:
2314 upload_args = ['upload'] + upload_args + args
2315 logging.info('upload.RealMain(%s)', upload_args)
2316 issue, patchset = upload.RealMain(upload_args)
2317 issue = int(issue)
2318 patchset = int(patchset)
2319 except KeyboardInterrupt:
2320 sys.exit(1)
2321 except:
2322 # If we got an exception after the user typed a description for their
2323 # change, back up the description before re-raising.
2324 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002325 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 raise
2327
2328 if not self.GetIssue():
2329 self.SetIssue(issue)
2330 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002331 return 0
2332
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002333
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002334class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002335 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002336 # auth_config is Rietveld thing, kept here to preserve interface only.
2337 super(_GerritChangelistImpl, self).__init__(changelist)
2338 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002339 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002340 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002341 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002342 # Map from change number (issue) to its detail cache.
2343 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002344
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002345 if codereview_host is not None:
2346 assert not codereview_host.startswith('https://'), codereview_host
2347 self._gerrit_host = codereview_host
2348 self._gerrit_server = 'https://%s' % codereview_host
2349
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002350 def _GetGerritHost(self):
2351 # Lazy load of configs.
2352 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002353 if self._gerrit_host and '.' not in self._gerrit_host:
2354 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2355 # This happens for internal stuff http://crbug.com/614312.
2356 parsed = urlparse.urlparse(self.GetRemoteUrl())
2357 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002358 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002359 ' Your current remote is: %s' % self.GetRemoteUrl())
2360 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2361 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002362 return self._gerrit_host
2363
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002364 def _GetGitHost(self):
2365 """Returns git host to be used when uploading change to Gerrit."""
2366 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2367
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002368 def GetCodereviewServer(self):
2369 if not self._gerrit_server:
2370 # If we're on a branch then get the server potentially associated
2371 # with that branch.
2372 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002373 self._gerrit_server = self._GitGetBranchConfigValue(
2374 self.CodereviewServerConfigKey())
2375 if self._gerrit_server:
2376 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002377 if not self._gerrit_server:
2378 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2379 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002380 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002381 parts[0] = parts[0] + '-review'
2382 self._gerrit_host = '.'.join(parts)
2383 self._gerrit_server = 'https://%s' % self._gerrit_host
2384 return self._gerrit_server
2385
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002386 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002387 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002388 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002389
tandrii5d48c322016-08-18 16:19:37 -07002390 @classmethod
2391 def PatchsetConfigKey(cls):
2392 return 'gerritpatchset'
2393
2394 @classmethod
2395 def CodereviewServerConfigKey(cls):
2396 return 'gerritserver'
2397
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002398 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002399 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002400 if settings.GetGerritSkipEnsureAuthenticated():
2401 # For projects with unusual authentication schemes.
2402 # See http://crbug.com/603378.
2403 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002404 # Lazy-loader to identify Gerrit and Git hosts.
2405 if gerrit_util.GceAuthenticator.is_gce():
2406 return
2407 self.GetCodereviewServer()
2408 git_host = self._GetGitHost()
2409 assert self._gerrit_server and self._gerrit_host
2410 cookie_auth = gerrit_util.CookiesAuthenticator()
2411
2412 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2413 git_auth = cookie_auth.get_auth_header(git_host)
2414 if gerrit_auth and git_auth:
2415 if gerrit_auth == git_auth:
2416 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002417 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002418 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002419 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002420 ' %s\n'
2421 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002422 ' Consider running the following command:\n'
2423 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002424 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002425 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002426 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002427 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002428 cookie_auth.get_new_password_message(git_host)))
2429 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002430 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002431 return
2432 else:
2433 missing = (
2434 [] if gerrit_auth else [self._gerrit_host] +
2435 [] if git_auth else [git_host])
2436 DieWithError('Credentials for the following hosts are required:\n'
2437 ' %s\n'
2438 'These are read from %s (or legacy %s)\n'
2439 '%s' % (
2440 '\n '.join(missing),
2441 cookie_auth.get_gitcookies_path(),
2442 cookie_auth.get_netrc_path(),
2443 cookie_auth.get_new_password_message(git_host)))
2444
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002445 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002446 if not self.GetIssue():
2447 return
2448
2449 # Warm change details cache now to avoid RPCs later, reducing latency for
2450 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002451 self._GetChangeDetail(
2452 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002453
2454 status = self._GetChangeDetail()['status']
2455 if status in ('MERGED', 'ABANDONED'):
2456 DieWithError('Change %s has been %s, new uploads are not allowed' %
2457 (self.GetIssueURL(),
2458 'submitted' if status == 'MERGED' else 'abandoned'))
2459
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002460 if gerrit_util.GceAuthenticator.is_gce():
2461 return
2462 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2463 self._GetGerritHost())
2464 if self.GetIssueOwner() == cookies_user:
2465 return
2466 logging.debug('change %s owner is %s, cookies user is %s',
2467 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002468 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002469 # so ask what Gerrit thinks of this user.
2470 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2471 if details['email'] == self.GetIssueOwner():
2472 return
2473 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002474 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002475 'as %s.\n'
2476 'Uploading may fail due to lack of permissions.' %
2477 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2478 confirm_or_exit(action='upload')
2479
2480
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002481 def _PostUnsetIssueProperties(self):
2482 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002483 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002484
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002485 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002486 class ThisIsNotRietveldIssue(object):
2487 def __nonzero__(self):
2488 # This is a hack to make presubmit_support think that rietveld is not
2489 # defined, yet still ensure that calls directly result in a decent
2490 # exception message below.
2491 return False
2492
2493 def __getattr__(self, attr):
2494 print(
2495 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2496 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002497 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002498 'or use Rietveld for codereview.\n'
2499 'See also http://crbug.com/579160.' % attr)
2500 raise NotImplementedError()
2501 return ThisIsNotRietveldIssue()
2502
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002503 def GetGerritObjForPresubmit(self):
2504 return presubmit_support.GerritAccessor(self._GetGerritHost())
2505
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002506 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002507 """Apply a rough heuristic to give a simple summary of an issue's review
2508 or CQ status, assuming adherence to a common workflow.
2509
2510 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002511 * 'error' - error from review tool (including deleted issues)
2512 * 'unsent' - no reviewers added
2513 * 'waiting' - waiting for review
2514 * 'reply' - waiting for uploader to reply to review
2515 * 'lgtm' - Code-Review label has been set
2516 * 'commit' - in the commit queue
2517 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002518 """
2519 if not self.GetIssue():
2520 return None
2521
2522 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002523 data = self._GetChangeDetail([
2524 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002525 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002526 return 'error'
2527
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002528 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002529 return 'closed'
2530
Aaron Gable9ab38c62017-04-06 14:36:33 -07002531 if data['labels'].get('Commit-Queue', {}).get('approved'):
2532 # The section will have an "approved" subsection if anyone has voted
2533 # the maximum value on the label.
2534 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002535
Aaron Gable9ab38c62017-04-06 14:36:33 -07002536 if data['labels'].get('Code-Review', {}).get('approved'):
2537 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002538
2539 if not data.get('reviewers', {}).get('REVIEWER', []):
2540 return 'unsent'
2541
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002542 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002543 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2544 last_message_author = messages.pop().get('author', {})
2545 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002546 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2547 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002548 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002549 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002550 if last_message_author.get('_account_id') == owner:
2551 # Most recent message was by owner.
2552 return 'waiting'
2553 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554 # Some reply from non-owner.
2555 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002556
2557 # Somehow there are no messages even though there are reviewers.
2558 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002559
2560 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002561 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002562 return data['revisions'][data['current_revision']]['_number']
2563
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002564 def FetchDescription(self, force=False):
2565 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2566 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002567 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002568 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002569
dsansomee2d6fd92016-09-08 00:10:47 -07002570 def UpdateDescriptionRemote(self, description, force=False):
2571 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2572 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002573 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002574 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002575 'unpublished edit. Either publish the edit in the Gerrit web UI '
2576 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002577
2578 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2579 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002580 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002581 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002582
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002583 def AddComment(self, message):
2584 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2585 msg=message)
2586
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002587 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002588 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002589 messages = self._GetChangeDetail(
2590 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2591 file_comments = gerrit_util.GetChangeComments(
2592 self._GetGerritHost(), self.GetIssue())
2593
2594 # Build dictionary of file comments for easy access and sorting later.
2595 # {author+date: {path: {patchset: {line: url+message}}}}
2596 comments = collections.defaultdict(
2597 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2598 for path, line_comments in file_comments.iteritems():
2599 for comment in line_comments:
2600 if comment.get('tag', '').startswith('autogenerated'):
2601 continue
2602 key = (comment['author']['email'], comment['updated'])
2603 if comment.get('side', 'REVISION') == 'PARENT':
2604 patchset = 'Base'
2605 else:
2606 patchset = 'PS%d' % comment['patch_set']
2607 line = comment.get('line', 0)
2608 url = ('https://%s/c/%s/%s/%s#%s%s' %
2609 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2610 'b' if comment.get('side') == 'PARENT' else '',
2611 str(line) if line else ''))
2612 comments[key][path][patchset][line] = (url, comment['message'])
2613
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002614 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002615 for msg in messages:
2616 # Don't bother showing autogenerated messages.
2617 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2618 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002619 # Gerrit spits out nanoseconds.
2620 assert len(msg['date'].split('.')[-1]) == 9
2621 date = datetime.datetime.strptime(msg['date'][:-3],
2622 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002623 message = msg['message']
2624 key = (msg['author']['email'], msg['date'])
2625 if key in comments:
2626 message += '\n'
2627 for path, patchsets in sorted(comments.get(key, {}).items()):
2628 if readable:
2629 message += '\n%s' % path
2630 for patchset, lines in sorted(patchsets.items()):
2631 for line, (url, content) in sorted(lines.items()):
2632 if line:
2633 line_str = 'Line %d' % line
2634 path_str = '%s:%d:' % (path, line)
2635 else:
2636 line_str = 'File comment'
2637 path_str = '%s:0:' % path
2638 if readable:
2639 message += '\n %s, %s: %s' % (patchset, line_str, url)
2640 message += '\n %s\n' % content
2641 else:
2642 message += '\n%s ' % path_str
2643 message += '\n%s\n' % content
2644
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002645 summary.append(_CommentSummary(
2646 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002647 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002648 sender=msg['author']['email'],
2649 # These could be inferred from the text messages and correlated with
2650 # Code-Review label maximum, however this is not reliable.
2651 # Leaving as is until the need arises.
2652 approval=False,
2653 disapproval=False,
2654 ))
2655 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002656
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002657 def CloseIssue(self):
2658 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2659
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002660 def SubmitIssue(self, wait_for_merge=True):
2661 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2662 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002663
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002664 def _GetChangeDetail(self, options=None, issue=None,
2665 no_cache=False):
2666 """Returns details of the issue by querying Gerrit and caching results.
2667
2668 If fresh data is needed, set no_cache=True which will clear cache and
2669 thus new data will be fetched from Gerrit.
2670 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002671 options = options or []
2672 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002673 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002674
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002675 # Optimization to avoid multiple RPCs:
2676 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2677 'CURRENT_COMMIT' not in options):
2678 options.append('CURRENT_COMMIT')
2679
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002680 # Normalize issue and options for consistent keys in cache.
2681 issue = str(issue)
2682 options = [o.upper() for o in options]
2683
2684 # Check in cache first unless no_cache is True.
2685 if no_cache:
2686 self._detail_cache.pop(issue, None)
2687 else:
2688 options_set = frozenset(options)
2689 for cached_options_set, data in self._detail_cache.get(issue, []):
2690 # Assumption: data fetched before with extra options is suitable
2691 # for return for a smaller set of options.
2692 # For example, if we cached data for
2693 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2694 # and request is for options=[CURRENT_REVISION],
2695 # THEN we can return prior cached data.
2696 if options_set.issubset(cached_options_set):
2697 return data
2698
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002699 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002700 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002701 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002702 except gerrit_util.GerritError as e:
2703 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002704 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002705 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002706
2707 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002708 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002709
agable32978d92016-11-01 12:55:02 -07002710 def _GetChangeCommit(self, issue=None):
2711 issue = issue or self.GetIssue()
2712 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002713 try:
2714 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2715 except gerrit_util.GerritError as e:
2716 if e.http_status == 404:
2717 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2718 raise
agable32978d92016-11-01 12:55:02 -07002719 return data
2720
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002721 def CMDLand(self, force, bypass_hooks, verbose):
2722 if git_common.is_dirty_git_tree('land'):
2723 return 1
tandriid60367b2016-06-22 05:25:12 -07002724 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2725 if u'Commit-Queue' in detail.get('labels', {}):
2726 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002727 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2728 'which can test and land changes for you. '
2729 'Are you sure you wish to bypass it?\n',
2730 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002731
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002732 differs = True
tandriic4344b52016-08-29 06:04:54 -07002733 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002734 # Note: git diff outputs nothing if there is no diff.
2735 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002736 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002737 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002738 if detail['current_revision'] == last_upload:
2739 differs = False
2740 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002741 print('WARNING: Local branch contents differ from latest uploaded '
2742 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002743 if differs:
2744 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002745 confirm_or_exit(
2746 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2747 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002748 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002749 elif not bypass_hooks:
2750 hook_results = self.RunHook(
2751 committing=True,
2752 may_prompt=not force,
2753 verbose=verbose,
2754 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2755 if not hook_results.should_continue():
2756 return 1
2757
2758 self.SubmitIssue(wait_for_merge=True)
2759 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002760 links = self._GetChangeCommit().get('web_links', [])
2761 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002762 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002763 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002764 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002765 return 0
2766
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002767 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2768 directory):
2769 assert not reject
2770 assert not nocommit
2771 assert not directory
2772 assert parsed_issue_arg.valid
2773
2774 self._changelist.issue = parsed_issue_arg.issue
2775
2776 if parsed_issue_arg.hostname:
2777 self._gerrit_host = parsed_issue_arg.hostname
2778 self._gerrit_server = 'https://%s' % self._gerrit_host
2779
tandriic2405f52016-10-10 08:13:15 -07002780 try:
2781 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002782 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002783 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002784
2785 if not parsed_issue_arg.patchset:
2786 # Use current revision by default.
2787 revision_info = detail['revisions'][detail['current_revision']]
2788 patchset = int(revision_info['_number'])
2789 else:
2790 patchset = parsed_issue_arg.patchset
2791 for revision_info in detail['revisions'].itervalues():
2792 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2793 break
2794 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002795 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002796 (parsed_issue_arg.patchset, self.GetIssue()))
2797
2798 fetch_info = revision_info['fetch']['http']
2799 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002800
2801 clean, _ = RunGitWithCode(
Aaron Gablebacbdb92017-06-09 10:31:41 -07002802 ['merge-base', '--is-ancestor', 'HEAD', 'origin/master'])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002803 if clean != 0:
2804 clean, _ = RunGitWithCode(
Aaron Gablebacbdb92017-06-09 10:31:41 -07002805 ['merge-base', '--is-ancestor', 'HEAD', 'FETCH_HEAD'])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002806 if clean != 0:
2807 confirm_or_exit(
2808 'It looks like you\'re on a branch with some local commits.\n'
2809 'If you apply this patch on top of your local content, you will not '
2810 'be able to easily upload further changes based on it.\n'
2811 'Would you like to proceed with applying this patch anyway?\n')
2812 RunGit(['cherry-pick', 'FETCH_HEAD'])
2813 print('Committed patch for change %i patchset %i locally.' %
2814 (self._changelist.issue, patchset))
2815 else:
2816 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2817 self.SetIssue(self.GetIssue())
2818 self.SetPatchset(patchset)
2819 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2820 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2821 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2822 print('Checked out commit for change %i patchset %i locally' %
2823 (self.GetIssue(), self.GetPatchset()))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002824 return 0
2825
2826 @staticmethod
2827 def ParseIssueURL(parsed_url):
2828 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2829 return None
2830 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2831 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2832 # Short urls like https://domain/<issue_number> can be used, but don't allow
2833 # specifying the patchset (you'd 404), but we allow that here.
2834 if parsed_url.path == '/':
2835 part = parsed_url.fragment
2836 else:
2837 part = parsed_url.path
2838 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2839 if match:
2840 return _ParsedIssueNumberArgument(
2841 issue=int(match.group(2)),
2842 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002843 hostname=parsed_url.netloc,
2844 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002845 return None
2846
tandrii16e0b4e2016-06-07 10:34:28 -07002847 def _GerritCommitMsgHookCheck(self, offer_removal):
2848 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2849 if not os.path.exists(hook):
2850 return
2851 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2852 # custom developer made one.
2853 data = gclient_utils.FileRead(hook)
2854 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2855 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002856 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002857 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002858 'and may interfere with it in subtle ways.\n'
2859 'We recommend you remove the commit-msg hook.')
2860 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002861 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002862 gclient_utils.rm_file_or_tree(hook)
2863 print('Gerrit commit-msg hook removed.')
2864 else:
2865 print('OK, will keep Gerrit commit-msg hook in place.')
2866
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002867 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002868 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002869 if options.squash and options.no_squash:
2870 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002871
2872 if not options.squash and not options.no_squash:
2873 # Load default for user, repo, squash=true, in this order.
2874 options.squash = settings.GetSquashGerritUploads()
2875 elif options.no_squash:
2876 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002877
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002878 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002879 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002880
Aaron Gableb56ad332017-01-06 15:24:31 -08002881 # This may be None; default fallback value is determined in logic below.
2882 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002883 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002884
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002885 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002886 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002887 if self.GetIssue():
2888 # Try to get the message from a previous upload.
2889 message = self.GetDescription()
2890 if not message:
2891 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002892 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002893 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002894 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002895 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002896 # When uploading a subsequent patchset, -m|--message is taken
2897 # as the patchset title if --title was not provided.
2898 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002899 else:
2900 default_title = RunGit(
2901 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002902 if options.force:
2903 title = default_title
2904 else:
2905 title = ask_for_data(
2906 'Title for patchset [%s]: ' % default_title) or default_title
2907 if title == default_title:
2908 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002909 change_id = self._GetChangeDetail()['change_id']
2910 while True:
2911 footer_change_ids = git_footers.get_footer_change_id(message)
2912 if footer_change_ids == [change_id]:
2913 break
2914 if not footer_change_ids:
2915 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002916 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002917 continue
2918 # There is already a valid footer but with different or several ids.
2919 # Doing this automatically is non-trivial as we don't want to lose
2920 # existing other footers, yet we want to append just 1 desired
2921 # Change-Id. Thus, just create a new footer, but let user verify the
2922 # new description.
2923 message = '%s\n\nChange-Id: %s' % (message, change_id)
2924 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002925 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002926 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002927 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002928 'Please, check the proposed correction to the description, '
2929 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2930 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2931 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002932 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002933 if not options.force:
2934 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002935 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002936 message = change_desc.description
2937 if not message:
2938 DieWithError("Description is empty. Aborting...")
2939 # Continue the while loop.
2940 # Sanity check of this code - we should end up with proper message
2941 # footer.
2942 assert [change_id] == git_footers.get_footer_change_id(message)
2943 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002944 else: # if not self.GetIssue()
2945 if options.message:
2946 message = options.message
2947 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002948 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002949 if options.title:
2950 message = options.title + '\n\n' + message
2951 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002952
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002953 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002954 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002955 # On first upload, patchset title is always this string, while
2956 # --title flag gets converted to first line of message.
2957 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002958 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002959 if not change_desc.description:
2960 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002961 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002962 if len(change_ids) > 1:
2963 DieWithError('too many Change-Id footers, at most 1 allowed.')
2964 if not change_ids:
2965 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002966 change_desc.set_description(git_footers.add_footer_change_id(
2967 change_desc.description,
2968 GenerateGerritChangeId(change_desc.description)))
2969 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002970 assert len(change_ids) == 1
2971 change_id = change_ids[0]
2972
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002973 if options.reviewers or options.tbrs or options.add_owners_to:
2974 change_desc.update_reviewers(options.reviewers, options.tbrs,
2975 options.add_owners_to, change)
2976
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002977 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002978 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2979 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002980 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2981 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002982 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002983 else:
2984 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002985 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002986 if not change_desc.description:
2987 DieWithError("Description is empty. Aborting...")
2988
2989 if not git_footers.get_footer_change_id(change_desc.description):
2990 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002991 change_desc.set_description(
2992 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002993 if options.reviewers or options.tbrs or options.add_owners_to:
2994 change_desc.update_reviewers(options.reviewers, options.tbrs,
2995 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002996 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002997 # For no-squash mode, we assume the remote called "origin" is the one we
2998 # want. It is not worthwhile to support different workflows for
2999 # no-squash mode.
3000 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003001 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3002
3003 assert change_desc
3004 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3005 ref_to_push)]).splitlines()
3006 if len(commits) > 1:
3007 print('WARNING: This will upload %d commits. Run the following command '
3008 'to see which commits will be uploaded: ' % len(commits))
3009 print('git log %s..%s' % (parent, ref_to_push))
3010 print('You can also use `git squash-branch` to squash these into a '
3011 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003012 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003013
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003014 if options.reviewers or options.tbrs or options.add_owners_to:
3015 change_desc.update_reviewers(options.reviewers, options.tbrs,
3016 options.add_owners_to, change)
3017
3018 if options.send_mail:
3019 if not change_desc.get_reviewers():
3020 DieWithError('Must specify reviewers to send email.', change_desc)
3021
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003022 # Extra options that can be specified at push time. Doc:
3023 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003024 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003025
3026 # TODO(tandrii): options.message should be posted as a comment
3027 # if --send-email is set on non-initial upload as Rietveld used to do it.
3028
Aaron Gable9b713dd2016-12-14 16:04:21 -08003029 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003030 if not re.match(r'^[\w ]+$', title):
3031 title = re.sub(r'[^\w ]', '', title)
3032 if not automatic_title:
3033 print('WARNING: Patchset title may only contain alphanumeric chars '
3034 'and spaces. You can edit it in the UI. '
3035 'See https://crbug.com/663787.\n'
3036 'Cleaned up title: %s' % title)
3037 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3038 # reverse on its side.
3039 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003040
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003041 # Never notify now because no one is on the review. Notify when we add
3042 # reviewers and CCs below.
3043 refspec_opts.append('notify=NONE')
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00003044
agablec6787972016-09-09 16:13:34 -07003045 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003046 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003047
rmistry9eadede2016-09-19 11:22:43 -07003048 if options.topic:
3049 # Documentation on Gerrit topics is here:
3050 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003051 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003052
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003053 refspec_suffix = ''
3054 if refspec_opts:
3055 refspec_suffix = '%' + ','.join(refspec_opts)
3056 assert ' ' not in refspec_suffix, (
3057 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3058 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3059
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003060 try:
3061 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003062 ['git', 'push', self.GetRemoteUrl(), refspec],
3063 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003064 # Flush after every line: useful for seeing progress when running as
3065 # recipe.
3066 filter_fn=lambda _: sys.stdout.flush())
3067 except subprocess2.CalledProcessError:
3068 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003069 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003070 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003071 'credential problems:\n'
3072 ' git cl creds-check\n',
3073 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003074
3075 if options.squash:
3076 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3077 change_numbers = [m.group(1)
3078 for m in map(regex.match, push_stdout.splitlines())
3079 if m]
3080 if len(change_numbers) != 1:
3081 DieWithError(
3082 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003083 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003084 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003085 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003086
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003087 reviewers = sorted(change_desc.get_reviewers())
3088
tandrii88189772016-09-29 04:29:57 -07003089 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003090 if not options.private:
3091 cc = self.GetCCList().split(',')
3092 else:
3093 cc = []
tandrii88189772016-09-29 04:29:57 -07003094 if options.cc:
3095 cc.extend(options.cc)
3096 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003097 if change_desc.get_cced():
3098 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003099
3100 gerrit_util.AddReviewers(
3101 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3102 notify=bool(options.send_mail))
3103
Aaron Gablefd238082017-06-07 13:42:34 -07003104 if change_desc.get_reviewers(tbr_only=True):
3105 print('Adding self-LGTM (Code-Review +1) because of TBRs.')
3106 gerrit_util.SetReview(
3107 self._GetGerritHost(), self.GetIssue(),
Aaron Gable75e78722017-06-09 10:40:16 -07003108 labels={'Code-Review': 1}, notify=bool(options.send_mail))
Aaron Gablefd238082017-06-07 13:42:34 -07003109
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003110 return 0
3111
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003112 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3113 change_desc):
3114 """Computes parent of the generated commit to be uploaded to Gerrit.
3115
3116 Returns revision or a ref name.
3117 """
3118 if custom_cl_base:
3119 # Try to avoid creating additional unintended CLs when uploading, unless
3120 # user wants to take this risk.
3121 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3122 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3123 local_ref_of_target_remote])
3124 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003125 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003126 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3127 'If you proceed with upload, more than 1 CL may be created by '
3128 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3129 'If you are certain that specified base `%s` has already been '
3130 'uploaded to Gerrit as another CL, you may proceed.\n' %
3131 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3132 if not force:
3133 confirm_or_exit(
3134 'Do you take responsibility for cleaning up potential mess '
3135 'resulting from proceeding with upload?',
3136 action='upload')
3137 return custom_cl_base
3138
Aaron Gablef97e33d2017-03-30 15:44:27 -07003139 if remote != '.':
3140 return self.GetCommonAncestorWithUpstream()
3141
3142 # If our upstream branch is local, we base our squashed commit on its
3143 # squashed version.
3144 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3145
Aaron Gablef97e33d2017-03-30 15:44:27 -07003146 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003147 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003148
3149 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003150 # TODO(tandrii): consider checking parent change in Gerrit and using its
3151 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3152 # the tree hash of the parent branch. The upside is less likely bogus
3153 # requests to reupload parent change just because it's uploadhash is
3154 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003155 parent = RunGit(['config',
3156 'branch.%s.gerritsquashhash' % upstream_branch_name],
3157 error_ok=True).strip()
3158 # Verify that the upstream branch has been uploaded too, otherwise
3159 # Gerrit will create additional CLs when uploading.
3160 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3161 RunGitSilent(['rev-parse', parent + ':'])):
3162 DieWithError(
3163 '\nUpload upstream branch %s first.\n'
3164 'It is likely that this branch has been rebased since its last '
3165 'upload, so you just need to upload it again.\n'
3166 '(If you uploaded it with --no-squash, then branch dependencies '
3167 'are not supported, and you should reupload with --squash.)'
3168 % upstream_branch_name,
3169 change_desc)
3170 return parent
3171
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003172 def _AddChangeIdToCommitMessage(self, options, args):
3173 """Re-commits using the current message, assumes the commit hook is in
3174 place.
3175 """
3176 log_desc = options.message or CreateDescriptionFromLog(args)
3177 git_command = ['commit', '--amend', '-m', log_desc]
3178 RunGit(git_command)
3179 new_log_desc = CreateDescriptionFromLog(args)
3180 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003181 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003182 return new_log_desc
3183 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003184 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003185
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003186 def SetCQState(self, new_state):
3187 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003188 vote_map = {
3189 _CQState.NONE: 0,
3190 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003191 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003192 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003193 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3194 if new_state == _CQState.DRY_RUN:
3195 # Don't spam everybody reviewer/owner.
Aaron Gable75e78722017-06-09 10:40:16 -07003196 kwargs['notify'] = False
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003197 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003198
tandriie113dfd2016-10-11 10:20:12 -07003199 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003200 try:
3201 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003202 except GerritChangeNotExists:
3203 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003204
3205 if data['status'] in ('ABANDONED', 'MERGED'):
3206 return 'CL %s is closed' % self.GetIssue()
3207
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003208 def GetTryJobProperties(self, patchset=None):
3209 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003210 data = self._GetChangeDetail(['ALL_REVISIONS'])
3211 patchset = int(patchset or self.GetPatchset())
3212 assert patchset
3213 revision_data = None # Pylint wants it to be defined.
3214 for revision_data in data['revisions'].itervalues():
3215 if int(revision_data['_number']) == patchset:
3216 break
3217 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003218 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003219 (patchset, self.GetIssue()))
3220 return {
3221 'patch_issue': self.GetIssue(),
3222 'patch_set': patchset or self.GetPatchset(),
3223 'patch_project': data['project'],
3224 'patch_storage': 'gerrit',
3225 'patch_ref': revision_data['fetch']['http']['ref'],
3226 'patch_repository_url': revision_data['fetch']['http']['url'],
3227 'patch_gerrit_url': self.GetCodereviewServer(),
3228 }
tandriie113dfd2016-10-11 10:20:12 -07003229
tandriide281ae2016-10-12 06:02:30 -07003230 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003231 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003232
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003233
3234_CODEREVIEW_IMPLEMENTATIONS = {
3235 'rietveld': _RietveldChangelistImpl,
3236 'gerrit': _GerritChangelistImpl,
3237}
3238
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003239
iannuccie53c9352016-08-17 14:40:40 -07003240def _add_codereview_issue_select_options(parser, extra=""):
3241 _add_codereview_select_options(parser)
3242
3243 text = ('Operate on this issue number instead of the current branch\'s '
3244 'implicit issue.')
3245 if extra:
3246 text += ' '+extra
3247 parser.add_option('-i', '--issue', type=int, help=text)
3248
3249
3250def _process_codereview_issue_select_options(parser, options):
3251 _process_codereview_select_options(parser, options)
3252 if options.issue is not None and not options.forced_codereview:
3253 parser.error('--issue must be specified with either --rietveld or --gerrit')
3254
3255
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003256def _add_codereview_select_options(parser):
3257 """Appends --gerrit and --rietveld options to force specific codereview."""
3258 parser.codereview_group = optparse.OptionGroup(
3259 parser, 'EXPERIMENTAL! Codereview override options')
3260 parser.add_option_group(parser.codereview_group)
3261 parser.codereview_group.add_option(
3262 '--gerrit', action='store_true',
3263 help='Force the use of Gerrit for codereview')
3264 parser.codereview_group.add_option(
3265 '--rietveld', action='store_true',
3266 help='Force the use of Rietveld for codereview')
3267
3268
3269def _process_codereview_select_options(parser, options):
3270 if options.gerrit and options.rietveld:
3271 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3272 options.forced_codereview = None
3273 if options.gerrit:
3274 options.forced_codereview = 'gerrit'
3275 elif options.rietveld:
3276 options.forced_codereview = 'rietveld'
3277
3278
tandriif9aefb72016-07-01 09:06:51 -07003279def _get_bug_line_values(default_project, bugs):
3280 """Given default_project and comma separated list of bugs, yields bug line
3281 values.
3282
3283 Each bug can be either:
3284 * a number, which is combined with default_project
3285 * string, which is left as is.
3286
3287 This function may produce more than one line, because bugdroid expects one
3288 project per line.
3289
3290 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3291 ['v8:123', 'chromium:789']
3292 """
3293 default_bugs = []
3294 others = []
3295 for bug in bugs.split(','):
3296 bug = bug.strip()
3297 if bug:
3298 try:
3299 default_bugs.append(int(bug))
3300 except ValueError:
3301 others.append(bug)
3302
3303 if default_bugs:
3304 default_bugs = ','.join(map(str, default_bugs))
3305 if default_project:
3306 yield '%s:%s' % (default_project, default_bugs)
3307 else:
3308 yield default_bugs
3309 for other in sorted(others):
3310 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3311 yield other
3312
3313
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003314class ChangeDescription(object):
3315 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003316 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003317 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003318 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003319 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003320
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003321 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003322 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003323
agable@chromium.org42c20792013-09-12 17:34:49 +00003324 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003325 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003326 return '\n'.join(self._description_lines)
3327
3328 def set_description(self, desc):
3329 if isinstance(desc, basestring):
3330 lines = desc.splitlines()
3331 else:
3332 lines = [line.rstrip() for line in desc]
3333 while lines and not lines[0]:
3334 lines.pop(0)
3335 while lines and not lines[-1]:
3336 lines.pop(-1)
3337 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003338
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003339 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3340 """Rewrites the R=/TBR= line(s) as a single line each.
3341
3342 Args:
3343 reviewers (list(str)) - list of additional emails to use for reviewers.
3344 tbrs (list(str)) - list of additional emails to use for TBRs.
3345 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3346 the change that are missing OWNER coverage. If this is not None, you
3347 must also pass a value for `change`.
3348 change (Change) - The Change that should be used for OWNERS lookups.
3349 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003350 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003351 assert isinstance(tbrs, list), tbrs
3352
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003353 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003354 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003355
3356 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003357 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003358
3359 reviewers = set(reviewers)
3360 tbrs = set(tbrs)
3361 LOOKUP = {
3362 'TBR': tbrs,
3363 'R': reviewers,
3364 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003365
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003366 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003367 regexp = re.compile(self.R_LINE)
3368 matches = [regexp.match(line) for line in self._description_lines]
3369 new_desc = [l for i, l in enumerate(self._description_lines)
3370 if not matches[i]]
3371 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003372
agable@chromium.org42c20792013-09-12 17:34:49 +00003373 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003374
3375 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003376 for match in matches:
3377 if not match:
3378 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003379 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3380
3381 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003382 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003383 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003384 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003385 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003386 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003387 LOOKUP[add_owners_to].update(
3388 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003389
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003390 # If any folks ended up in both groups, remove them from tbrs.
3391 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003392
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003393 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3394 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003395
3396 # Put the new lines in the description where the old first R= line was.
3397 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3398 if 0 <= line_loc < len(self._description_lines):
3399 if new_tbr_line:
3400 self._description_lines.insert(line_loc, new_tbr_line)
3401 if new_r_line:
3402 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003403 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003404 if new_r_line:
3405 self.append_footer(new_r_line)
3406 if new_tbr_line:
3407 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003408
Aaron Gable3a16ed12017-03-23 10:51:55 -07003409 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003410 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003411 self.set_description([
3412 '# Enter a description of the change.',
3413 '# This will be displayed on the codereview site.',
3414 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003415 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003416 '--------------------',
3417 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003418
agable@chromium.org42c20792013-09-12 17:34:49 +00003419 regexp = re.compile(self.BUG_LINE)
3420 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003421 prefix = settings.GetBugPrefix()
3422 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003423 if git_footer:
3424 self.append_footer('Bug: %s' % ', '.join(values))
3425 else:
3426 for value in values:
3427 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003428
agable@chromium.org42c20792013-09-12 17:34:49 +00003429 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003430 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003431 if not content:
3432 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003433 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003434
3435 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003436 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3437 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003438 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003439 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003440
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003441 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003442 """Adds a footer line to the description.
3443
3444 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3445 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3446 that Gerrit footers are always at the end.
3447 """
3448 parsed_footer_line = git_footers.parse_footer(line)
3449 if parsed_footer_line:
3450 # Line is a gerrit footer in the form: Footer-Key: any value.
3451 # Thus, must be appended observing Gerrit footer rules.
3452 self.set_description(
3453 git_footers.add_footer(self.description,
3454 key=parsed_footer_line[0],
3455 value=parsed_footer_line[1]))
3456 return
3457
3458 if not self._description_lines:
3459 self._description_lines.append(line)
3460 return
3461
3462 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3463 if gerrit_footers:
3464 # git_footers.split_footers ensures that there is an empty line before
3465 # actual (gerrit) footers, if any. We have to keep it that way.
3466 assert top_lines and top_lines[-1] == ''
3467 top_lines, separator = top_lines[:-1], top_lines[-1:]
3468 else:
3469 separator = [] # No need for separator if there are no gerrit_footers.
3470
3471 prev_line = top_lines[-1] if top_lines else ''
3472 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3473 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3474 top_lines.append('')
3475 top_lines.append(line)
3476 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003477
tandrii99a72f22016-08-17 14:33:24 -07003478 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003479 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003480 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003481 reviewers = [match.group(2).strip()
3482 for match in matches
3483 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003484 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003485
bradnelsond975b302016-10-23 12:20:23 -07003486 def get_cced(self):
3487 """Retrieves the list of reviewers."""
3488 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3489 cced = [match.group(2).strip() for match in matches if match]
3490 return cleanup_list(cced)
3491
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003492 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3493 """Updates this commit description given the parent.
3494
3495 This is essentially what Gnumbd used to do.
3496 Consult https://goo.gl/WMmpDe for more details.
3497 """
3498 assert parent_msg # No, orphan branch creation isn't supported.
3499 assert parent_hash
3500 assert dest_ref
3501 parent_footer_map = git_footers.parse_footers(parent_msg)
3502 # This will also happily parse svn-position, which GnumbD is no longer
3503 # supporting. While we'd generate correct footers, the verifier plugin
3504 # installed in Gerrit will block such commit (ie git push below will fail).
3505 parent_position = git_footers.get_position(parent_footer_map)
3506
3507 # Cherry-picks may have last line obscuring their prior footers,
3508 # from git_footers perspective. This is also what Gnumbd did.
3509 cp_line = None
3510 if (self._description_lines and
3511 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3512 cp_line = self._description_lines.pop()
3513
3514 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3515
3516 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3517 # user interference with actual footers we'd insert below.
3518 for i, (k, v) in enumerate(parsed_footers):
3519 if k.startswith('Cr-'):
3520 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3521
3522 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003523 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003524 if parent_position[0] == dest_ref:
3525 # Same branch as parent.
3526 number = int(parent_position[1]) + 1
3527 else:
3528 number = 1 # New branch, and extra lineage.
3529 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3530 int(parent_position[1])))
3531
3532 parsed_footers.append(('Cr-Commit-Position',
3533 '%s@{#%d}' % (dest_ref, number)))
3534 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3535
3536 self._description_lines = top_lines
3537 if cp_line:
3538 self._description_lines.append(cp_line)
3539 if self._description_lines[-1] != '':
3540 self._description_lines.append('') # Ensure footer separator.
3541 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3542
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003543
Aaron Gablea1bab272017-04-11 16:38:18 -07003544def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003545 """Retrieves the reviewers that approved a CL from the issue properties with
3546 messages.
3547
3548 Note that the list may contain reviewers that are not committer, thus are not
3549 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003550
3551 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003552 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003553 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003554 return sorted(
3555 set(
3556 message['sender']
3557 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003558 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003559 )
3560 )
3561
3562
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003563def FindCodereviewSettingsFile(filename='codereview.settings'):
3564 """Finds the given file starting in the cwd and going up.
3565
3566 Only looks up to the top of the repository unless an
3567 'inherit-review-settings-ok' file exists in the root of the repository.
3568 """
3569 inherit_ok_file = 'inherit-review-settings-ok'
3570 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003571 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003572 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3573 root = '/'
3574 while True:
3575 if filename in os.listdir(cwd):
3576 if os.path.isfile(os.path.join(cwd, filename)):
3577 return open(os.path.join(cwd, filename))
3578 if cwd == root:
3579 break
3580 cwd = os.path.dirname(cwd)
3581
3582
3583def LoadCodereviewSettingsFromFile(fileobj):
3584 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003585 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003586
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003587 def SetProperty(name, setting, unset_error_ok=False):
3588 fullname = 'rietveld.' + name
3589 if setting in keyvals:
3590 RunGit(['config', fullname, keyvals[setting]])
3591 else:
3592 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3593
tandrii48df5812016-10-17 03:55:37 -07003594 if not keyvals.get('GERRIT_HOST', False):
3595 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003596 # Only server setting is required. Other settings can be absent.
3597 # In that case, we ignore errors raised during option deletion attempt.
3598 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003599 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3601 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003602 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003603 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3604 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003605 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003606 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3607 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003608
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003609 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003610 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003611
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003612 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003613 RunGit(['config', 'gerrit.squash-uploads',
3614 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003615
tandrii@chromium.org28253532016-04-14 13:46:56 +00003616 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003617 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003618 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3619
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003620 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003621 # should be of the form
3622 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3623 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003624 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3625 keyvals['ORIGIN_URL_CONFIG']])
3626
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003627
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003628def urlretrieve(source, destination):
3629 """urllib is broken for SSL connections via a proxy therefore we
3630 can't use urllib.urlretrieve()."""
3631 with open(destination, 'w') as f:
3632 f.write(urllib2.urlopen(source).read())
3633
3634
ukai@chromium.org712d6102013-11-27 00:52:58 +00003635def hasSheBang(fname):
3636 """Checks fname is a #! script."""
3637 with open(fname) as f:
3638 return f.read(2).startswith('#!')
3639
3640
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003641# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3642def DownloadHooks(*args, **kwargs):
3643 pass
3644
3645
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003646def DownloadGerritHook(force):
3647 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003648
3649 Args:
3650 force: True to update hooks. False to install hooks if not present.
3651 """
3652 if not settings.GetIsGerrit():
3653 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003654 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003655 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3656 if not os.access(dst, os.X_OK):
3657 if os.path.exists(dst):
3658 if not force:
3659 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003660 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003661 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003662 if not hasSheBang(dst):
3663 DieWithError('Not a script: %s\n'
3664 'You need to download from\n%s\n'
3665 'into .git/hooks/commit-msg and '
3666 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003667 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3668 except Exception:
3669 if os.path.exists(dst):
3670 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003671 DieWithError('\nFailed to download hooks.\n'
3672 'You need to download from\n%s\n'
3673 'into .git/hooks/commit-msg and '
3674 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003675
3676
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003677def GetRietveldCodereviewSettingsInteractively():
3678 """Prompt the user for settings."""
3679 server = settings.GetDefaultServerUrl(error_ok=True)
3680 prompt = 'Rietveld server (host[:port])'
3681 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3682 newserver = ask_for_data(prompt + ':')
3683 if not server and not newserver:
3684 newserver = DEFAULT_SERVER
3685 if newserver:
3686 newserver = gclient_utils.UpgradeToHttps(newserver)
3687 if newserver != server:
3688 RunGit(['config', 'rietveld.server', newserver])
3689
3690 def SetProperty(initial, caption, name, is_url):
3691 prompt = caption
3692 if initial:
3693 prompt += ' ("x" to clear) [%s]' % initial
3694 new_val = ask_for_data(prompt + ':')
3695 if new_val == 'x':
3696 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3697 elif new_val:
3698 if is_url:
3699 new_val = gclient_utils.UpgradeToHttps(new_val)
3700 if new_val != initial:
3701 RunGit(['config', 'rietveld.' + name, new_val])
3702
3703 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3704 SetProperty(settings.GetDefaultPrivateFlag(),
3705 'Private flag (rietveld only)', 'private', False)
3706 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3707 'tree-status-url', False)
3708 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3709 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3710 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3711 'run-post-upload-hook', False)
3712
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003713
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003714class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003715 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003716
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003717 _GOOGLESOURCE = 'googlesource.com'
3718
3719 def __init__(self):
3720 # Cached list of [host, identity, source], where source is either
3721 # .gitcookies or .netrc.
3722 self._all_hosts = None
3723
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003724 def ensure_configured_gitcookies(self):
3725 """Runs checks and suggests fixes to make git use .gitcookies from default
3726 path."""
3727 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3728 configured_path = RunGitSilent(
3729 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003730 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003731 if configured_path:
3732 self._ensure_default_gitcookies_path(configured_path, default)
3733 else:
3734 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003735
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003736 @staticmethod
3737 def _ensure_default_gitcookies_path(configured_path, default_path):
3738 assert configured_path
3739 if configured_path == default_path:
3740 print('git is already configured to use your .gitcookies from %s' %
3741 configured_path)
3742 return
3743
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003744 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003745 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3746 (configured_path, default_path))
3747
3748 if not os.path.exists(configured_path):
3749 print('However, your configured .gitcookies file is missing.')
3750 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3751 action='reconfigure')
3752 RunGit(['config', '--global', 'http.cookiefile', default_path])
3753 return
3754
3755 if os.path.exists(default_path):
3756 print('WARNING: default .gitcookies file already exists %s' %
3757 default_path)
3758 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3759 default_path)
3760
3761 confirm_or_exit('Move existing .gitcookies to default location?',
3762 action='move')
3763 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003764 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003765 print('Moved and reconfigured git to use .gitcookies from %s' %
3766 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003767
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003768 @staticmethod
3769 def _configure_gitcookies_path(default_path):
3770 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3771 if os.path.exists(netrc_path):
3772 print('You seem to be using outdated .netrc for git credentials: %s' %
3773 netrc_path)
3774 print('This tool will guide you through setting up recommended '
3775 '.gitcookies store for git credentials.\n'
3776 '\n'
3777 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3778 ' git config --global --unset http.cookiefile\n'
3779 ' mv %s %s.backup\n\n' % (default_path, default_path))
3780 confirm_or_exit(action='setup .gitcookies')
3781 RunGit(['config', '--global', 'http.cookiefile', default_path])
3782 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003783
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003784 def get_hosts_with_creds(self, include_netrc=False):
3785 if self._all_hosts is None:
3786 a = gerrit_util.CookiesAuthenticator()
3787 self._all_hosts = [
3788 (h, u, s)
3789 for h, u, s in itertools.chain(
3790 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3791 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3792 )
3793 if h.endswith(self._GOOGLESOURCE)
3794 ]
3795
3796 if include_netrc:
3797 return self._all_hosts
3798 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3799
3800 def print_current_creds(self, include_netrc=False):
3801 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3802 if not hosts:
3803 print('No Git/Gerrit credentials found')
3804 return
3805 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3806 header = [('Host', 'User', 'Which file'),
3807 ['=' * l for l in lengths]]
3808 for row in (header + hosts):
3809 print('\t'.join((('%%+%ds' % l) % s)
3810 for l, s in zip(lengths, row)))
3811
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003812 @staticmethod
3813 def _parse_identity(identity):
3814 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3815 username, domain = identity.split('.', 1)
3816 if username.startswith('git-'):
3817 username = username[len('git-'):]
3818 return username, domain
3819
3820 def _get_usernames_of_domain(self, domain):
3821 """Returns list of usernames referenced by .gitcookies in a given domain."""
3822 identities_by_domain = {}
3823 for _, identity, _ in self.get_hosts_with_creds():
3824 username, domain = self._parse_identity(identity)
3825 identities_by_domain.setdefault(domain, []).append(username)
3826 return identities_by_domain.get(domain)
3827
3828 def _canonical_git_googlesource_host(self, host):
3829 """Normalizes Gerrit hosts (with '-review') to Git host."""
3830 assert host.endswith(self._GOOGLESOURCE)
3831 # Prefix doesn't include '.' at the end.
3832 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3833 if prefix.endswith('-review'):
3834 prefix = prefix[:-len('-review')]
3835 return prefix + '.' + self._GOOGLESOURCE
3836
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003837 def _canonical_gerrit_googlesource_host(self, host):
3838 git_host = self._canonical_git_googlesource_host(host)
3839 prefix = git_host.split('.', 1)[0]
3840 return prefix + '-review.' + self._GOOGLESOURCE
3841
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003842 def has_generic_host(self):
3843 """Returns whether generic .googlesource.com has been configured.
3844
3845 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3846 """
3847 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3848 if host == '.' + self._GOOGLESOURCE:
3849 return True
3850 return False
3851
3852 def _get_git_gerrit_identity_pairs(self):
3853 """Returns map from canonic host to pair of identities (Git, Gerrit).
3854
3855 One of identities might be None, meaning not configured.
3856 """
3857 host_to_identity_pairs = {}
3858 for host, identity, _ in self.get_hosts_with_creds():
3859 canonical = self._canonical_git_googlesource_host(host)
3860 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3861 idx = 0 if canonical == host else 1
3862 pair[idx] = identity
3863 return host_to_identity_pairs
3864
3865 def get_partially_configured_hosts(self):
3866 return set(
3867 host for host, identities_pair in
3868 self._get_git_gerrit_identity_pairs().iteritems()
3869 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3870
3871 def get_conflicting_hosts(self):
3872 return set(
3873 host for host, (i1, i2) in
3874 self._get_git_gerrit_identity_pairs().iteritems()
3875 if None not in (i1, i2) and i1 != i2)
3876
3877 def get_duplicated_hosts(self):
3878 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3879 return set(host for host, count in counters.iteritems() if count > 1)
3880
3881 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3882 'chromium.googlesource.com': 'chromium.org',
3883 'chrome-internal.googlesource.com': 'google.com',
3884 }
3885
3886 def get_hosts_with_wrong_identities(self):
3887 """Finds hosts which **likely** reference wrong identities.
3888
3889 Note: skips hosts which have conflicting identities for Git and Gerrit.
3890 """
3891 hosts = set()
3892 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3893 pair = self._get_git_gerrit_identity_pairs().get(host)
3894 if pair and pair[0] == pair[1]:
3895 _, domain = self._parse_identity(pair[0])
3896 if domain != expected:
3897 hosts.add(host)
3898 return hosts
3899
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003900 @staticmethod
3901 def print_hosts(hosts, extra_column_func=None):
3902 hosts = sorted(hosts)
3903 assert hosts
3904 if extra_column_func is None:
3905 extras = [''] * len(hosts)
3906 else:
3907 extras = [extra_column_func(host) for host in hosts]
3908 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3909 for he in zip(hosts, extras):
3910 print(tmpl % he)
3911 print()
3912
3913 def find_and_report_problems(self):
3914 """Returns True if there was at least one problem, else False."""
3915 problems = [False]
3916 def add_problem():
3917 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003918 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003919 problems[0] = True
3920
3921 if self.has_generic_host():
3922 add_problem()
3923 print(' .googlesource.com record detected\n'
3924 ' Chrome Infrastructure team recommends to list full host names '
3925 'explicitly.\n')
3926
3927 dups = self.get_duplicated_hosts()
3928 if dups:
3929 add_problem()
3930 print(' The following hosts were defined twice:\n')
3931 self.print_hosts(dups)
3932
3933 partial = self.get_partially_configured_hosts()
3934 if partial:
3935 add_problem()
3936 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3937 'These hosts are missing:')
3938 self.print_hosts(partial)
3939
3940 conflicting = self.get_conflicting_hosts()
3941 if conflicting:
3942 add_problem()
3943 print(' The following Git hosts have differing credentials from their '
3944 'Gerrit counterparts:\n')
3945 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3946 tuple(self._get_git_gerrit_identity_pairs()[host]))
3947
3948 wrong = self.get_hosts_with_wrong_identities()
3949 if wrong:
3950 add_problem()
3951 print(' These hosts likely use wrong identity:\n')
3952 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3953 (self._get_git_gerrit_identity_pairs()[host][0],
3954 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3955 return problems[0]
3956
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003957
3958def CMDcreds_check(parser, args):
3959 """Checks credentials and suggests changes."""
3960 _, _ = parser.parse_args(args)
3961
3962 if gerrit_util.GceAuthenticator.is_gce():
3963 DieWithError('this command is not designed for GCE, are you on a bot?')
3964
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003965 checker = _GitCookiesChecker()
3966 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003967
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003968 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003969 checker.print_current_creds(include_netrc=True)
3970
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003971 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003972 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003973 return 0
3974 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003975
3976
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003977@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003978def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003979 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003980
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003981 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07003982 # TODO(tandrii): remove this once we switch to Gerrit.
3983 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003984 parser.add_option('--activate-update', action='store_true',
3985 help='activate auto-updating [rietveld] section in '
3986 '.git/config')
3987 parser.add_option('--deactivate-update', action='store_true',
3988 help='deactivate auto-updating [rietveld] section in '
3989 '.git/config')
3990 options, args = parser.parse_args(args)
3991
3992 if options.deactivate_update:
3993 RunGit(['config', 'rietveld.autoupdate', 'false'])
3994 return
3995
3996 if options.activate_update:
3997 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3998 return
3999
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004000 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004001 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002 return 0
4003
4004 url = args[0]
4005 if not url.endswith('codereview.settings'):
4006 url = os.path.join(url, 'codereview.settings')
4007
4008 # Load code review settings and download hooks (if available).
4009 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4010 return 0
4011
4012
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004013def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004014 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004015 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4016 branch = ShortBranchName(branchref)
4017 _, args = parser.parse_args(args)
4018 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004019 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004020 return RunGit(['config', 'branch.%s.base-url' % branch],
4021 error_ok=False).strip()
4022 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004023 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004024 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4025 error_ok=False).strip()
4026
4027
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004028def color_for_status(status):
4029 """Maps a Changelist status to color, for CMDstatus and other tools."""
4030 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004031 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004032 'waiting': Fore.BLUE,
4033 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004034 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004035 'lgtm': Fore.GREEN,
4036 'commit': Fore.MAGENTA,
4037 'closed': Fore.CYAN,
4038 'error': Fore.WHITE,
4039 }.get(status, Fore.WHITE)
4040
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004041
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004042def get_cl_statuses(changes, fine_grained, max_processes=None):
4043 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004044
4045 If fine_grained is true, this will fetch CL statuses from the server.
4046 Otherwise, simply indicate if there's a matching url for the given branches.
4047
4048 If max_processes is specified, it is used as the maximum number of processes
4049 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4050 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004051
4052 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004053 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004054 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004055 upload.verbosity = 0
4056
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004057 if not changes:
4058 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004059
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004060 if not fine_grained:
4061 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004062 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004063 for cl in changes:
4064 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004065 return
4066
4067 # First, sort out authentication issues.
4068 logging.debug('ensuring credentials exist')
4069 for cl in changes:
4070 cl.EnsureAuthenticated(force=False, refresh=True)
4071
4072 def fetch(cl):
4073 try:
4074 return (cl, cl.GetStatus())
4075 except:
4076 # See http://crbug.com/629863.
4077 logging.exception('failed to fetch status for %s:', cl)
4078 raise
4079
4080 threads_count = len(changes)
4081 if max_processes:
4082 threads_count = max(1, min(threads_count, max_processes))
4083 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4084
4085 pool = ThreadPool(threads_count)
4086 fetched_cls = set()
4087 try:
4088 it = pool.imap_unordered(fetch, changes).__iter__()
4089 while True:
4090 try:
4091 cl, status = it.next(timeout=5)
4092 except multiprocessing.TimeoutError:
4093 break
4094 fetched_cls.add(cl)
4095 yield cl, status
4096 finally:
4097 pool.close()
4098
4099 # Add any branches that failed to fetch.
4100 for cl in set(changes) - fetched_cls:
4101 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004102
rmistry@google.com2dd99862015-06-22 12:22:18 +00004103
4104def upload_branch_deps(cl, args):
4105 """Uploads CLs of local branches that are dependents of the current branch.
4106
4107 If the local branch dependency tree looks like:
4108 test1 -> test2.1 -> test3.1
4109 -> test3.2
4110 -> test2.2 -> test3.3
4111
4112 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4113 run on the dependent branches in this order:
4114 test2.1, test3.1, test3.2, test2.2, test3.3
4115
4116 Note: This function does not rebase your local dependent branches. Use it when
4117 you make a change to the parent branch that will not conflict with its
4118 dependent branches, and you would like their dependencies updated in
4119 Rietveld.
4120 """
4121 if git_common.is_dirty_git_tree('upload-branch-deps'):
4122 return 1
4123
4124 root_branch = cl.GetBranch()
4125 if root_branch is None:
4126 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4127 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004128 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004129 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4130 'patchset dependencies without an uploaded CL.')
4131
4132 branches = RunGit(['for-each-ref',
4133 '--format=%(refname:short) %(upstream:short)',
4134 'refs/heads'])
4135 if not branches:
4136 print('No local branches found.')
4137 return 0
4138
4139 # Create a dictionary of all local branches to the branches that are dependent
4140 # on it.
4141 tracked_to_dependents = collections.defaultdict(list)
4142 for b in branches.splitlines():
4143 tokens = b.split()
4144 if len(tokens) == 2:
4145 branch_name, tracked = tokens
4146 tracked_to_dependents[tracked].append(branch_name)
4147
vapiera7fbd5a2016-06-16 09:17:49 -07004148 print()
4149 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004150 dependents = []
4151 def traverse_dependents_preorder(branch, padding=''):
4152 dependents_to_process = tracked_to_dependents.get(branch, [])
4153 padding += ' '
4154 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004155 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004156 dependents.append(dependent)
4157 traverse_dependents_preorder(dependent, padding)
4158 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004159 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004160
4161 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004162 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004163 return 0
4164
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004165 confirm_or_exit('This command will checkout all dependent branches and run '
4166 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004167
andybons@chromium.org962f9462016-02-03 20:00:42 +00004168 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004169 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004170 args.extend(['-t', 'Updated patchset dependency'])
4171
rmistry@google.com2dd99862015-06-22 12:22:18 +00004172 # Record all dependents that failed to upload.
4173 failures = {}
4174 # Go through all dependents, checkout the branch and upload.
4175 try:
4176 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004177 print()
4178 print('--------------------------------------')
4179 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004180 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004181 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004182 try:
4183 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004185 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004186 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004187 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004188 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004189 finally:
4190 # Swap back to the original root branch.
4191 RunGit(['checkout', '-q', root_branch])
4192
vapiera7fbd5a2016-06-16 09:17:49 -07004193 print()
4194 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004195 for dependent_branch in dependents:
4196 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004197 print(' %s : %s' % (dependent_branch, upload_status))
4198 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004199
4200 return 0
4201
4202
kmarshall3bff56b2016-06-06 18:31:47 -07004203def CMDarchive(parser, args):
4204 """Archives and deletes branches associated with closed changelists."""
4205 parser.add_option(
4206 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004207 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004208 parser.add_option(
4209 '-f', '--force', action='store_true',
4210 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004211 parser.add_option(
4212 '-d', '--dry-run', action='store_true',
4213 help='Skip the branch tagging and removal steps.')
4214 parser.add_option(
4215 '-t', '--notags', action='store_true',
4216 help='Do not tag archived branches. '
4217 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004218
4219 auth.add_auth_options(parser)
4220 options, args = parser.parse_args(args)
4221 if args:
4222 parser.error('Unsupported args: %s' % ' '.join(args))
4223 auth_config = auth.extract_auth_config_from_options(options)
4224
4225 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4226 if not branches:
4227 return 0
4228
vapiera7fbd5a2016-06-16 09:17:49 -07004229 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004230 changes = [Changelist(branchref=b, auth_config=auth_config)
4231 for b in branches.splitlines()]
4232 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4233 statuses = get_cl_statuses(changes,
4234 fine_grained=True,
4235 max_processes=options.maxjobs)
4236 proposal = [(cl.GetBranch(),
4237 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4238 for cl, status in statuses
4239 if status == 'closed']
4240 proposal.sort()
4241
4242 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004243 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004244 return 0
4245
4246 current_branch = GetCurrentBranch()
4247
vapiera7fbd5a2016-06-16 09:17:49 -07004248 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004249 if options.notags:
4250 for next_item in proposal:
4251 print(' ' + next_item[0])
4252 else:
4253 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4254 for next_item in proposal:
4255 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004256
kmarshall9249e012016-08-23 12:02:16 -07004257 # Quit now on precondition failure or if instructed by the user, either
4258 # via an interactive prompt or by command line flags.
4259 if options.dry_run:
4260 print('\nNo changes were made (dry run).\n')
4261 return 0
4262 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004263 print('You are currently on a branch \'%s\' which is associated with a '
4264 'closed codereview issue, so archive cannot proceed. Please '
4265 'checkout another branch and run this command again.' %
4266 current_branch)
4267 return 1
kmarshall9249e012016-08-23 12:02:16 -07004268 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004269 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4270 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004271 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004272 return 1
4273
4274 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004275 if not options.notags:
4276 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004277 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004278
vapiera7fbd5a2016-06-16 09:17:49 -07004279 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004280
4281 return 0
4282
4283
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004284def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004285 """Show status of changelists.
4286
4287 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004288 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004289 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004290 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004291 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004292 - Magenta in the commit queue
4293 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004294 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004295
4296 Also see 'git cl comments'.
4297 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004298 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004299 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004300 parser.add_option('-f', '--fast', action='store_true',
4301 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004302 parser.add_option(
4303 '-j', '--maxjobs', action='store', type=int,
4304 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004305
4306 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004307 _add_codereview_issue_select_options(
4308 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004309 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004310 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004311 if args:
4312 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004313 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004314
iannuccie53c9352016-08-17 14:40:40 -07004315 if options.issue is not None and not options.field:
4316 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004317
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004318 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004319 cl = Changelist(auth_config=auth_config, issue=options.issue,
4320 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004321 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004322 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004323 elif options.field == 'id':
4324 issueid = cl.GetIssue()
4325 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004326 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004327 elif options.field == 'patch':
4328 patchset = cl.GetPatchset()
4329 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004330 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004331 elif options.field == 'status':
4332 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004333 elif options.field == 'url':
4334 url = cl.GetIssueURL()
4335 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004336 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004337 return 0
4338
4339 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4340 if not branches:
4341 print('No local branch found.')
4342 return 0
4343
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004344 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004345 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004346 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004347 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004348 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004349 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004350 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004351
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004352 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004353 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4354 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4355 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004356 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004357 c, status = output.next()
4358 branch_statuses[c.GetBranch()] = status
4359 status = branch_statuses.pop(branch)
4360 url = cl.GetIssueURL()
4361 if url and (not status or status == 'error'):
4362 # The issue probably doesn't exist anymore.
4363 url += ' (broken)'
4364
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004365 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004366 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004367 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004368 color = ''
4369 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004370 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004371 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004372 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004373 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004374
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004375
4376 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004377 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004378 print('Current branch: %s' % branch)
4379 for cl in changes:
4380 if cl.GetBranch() == branch:
4381 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004382 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004383 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004384 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004385 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004386 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004387 print('Issue description:')
4388 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004389 return 0
4390
4391
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004392def colorize_CMDstatus_doc():
4393 """To be called once in main() to add colors to git cl status help."""
4394 colors = [i for i in dir(Fore) if i[0].isupper()]
4395
4396 def colorize_line(line):
4397 for color in colors:
4398 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004399 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004400 indent = len(line) - len(line.lstrip(' ')) + 1
4401 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4402 return line
4403
4404 lines = CMDstatus.__doc__.splitlines()
4405 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4406
4407
phajdan.jre328cf92016-08-22 04:12:17 -07004408def write_json(path, contents):
4409 with open(path, 'w') as f:
4410 json.dump(contents, f)
4411
4412
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004413@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004414def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004415 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004416
4417 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004418 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004419 parser.add_option('-r', '--reverse', action='store_true',
4420 help='Lookup the branch(es) for the specified issues. If '
4421 'no issues are specified, all branches with mapped '
4422 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004423 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004424 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004425 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004426 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427
dnj@chromium.org406c4402015-03-03 17:22:28 +00004428 if options.reverse:
4429 branches = RunGit(['for-each-ref', 'refs/heads',
4430 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004431 # Reverse issue lookup.
4432 issue_branch_map = {}
4433 for branch in branches:
4434 cl = Changelist(branchref=branch)
4435 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4436 if not args:
4437 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004438 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004439 for issue in args:
4440 if not issue:
4441 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004442 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004443 print('Branch for issue number %s: %s' % (
4444 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004445 if options.json:
4446 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004447 return 0
4448
4449 if len(args) > 0:
4450 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4451 if not issue.valid:
4452 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4453 'or no argument to list it.\n'
4454 'Maybe you want to run git cl status?')
4455 cl = Changelist(codereview=issue.codereview)
4456 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004457 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004458 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004459 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4460 if options.json:
4461 write_json(options.json, {
4462 'issue': cl.GetIssue(),
4463 'issue_url': cl.GetIssueURL(),
4464 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004465 return 0
4466
4467
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004468def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004469 """Shows or posts review comments for any changelist."""
4470 parser.add_option('-a', '--add-comment', dest='comment',
4471 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004472 parser.add_option('-i', '--issue', dest='issue',
4473 help='review issue id (defaults to current issue). '
4474 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004475 parser.add_option('-m', '--machine-readable', dest='readable',
4476 action='store_false', default=True,
4477 help='output comments in a format compatible with '
4478 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004479 parser.add_option('-j', '--json-file',
4480 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004481 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004482 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004483 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004484 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004485 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004486
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004487 issue = None
4488 if options.issue:
4489 try:
4490 issue = int(options.issue)
4491 except ValueError:
4492 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004493 if not options.forced_codereview:
4494 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004495
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004496 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004497 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004498 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004499
4500 if options.comment:
4501 cl.AddComment(options.comment)
4502 return 0
4503
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004504 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4505 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004506 for comment in summary:
4507 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004508 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004509 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004510 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004511 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004512 color = Fore.MAGENTA
4513 else:
4514 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004515 print('\n%s%s %s%s\n%s' % (
4516 color,
4517 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4518 comment.sender,
4519 Fore.RESET,
4520 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4521
smut@google.comc85ac942015-09-15 16:34:43 +00004522 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004523 def pre_serialize(c):
4524 dct = c.__dict__.copy()
4525 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4526 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004527 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004528 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004529 return 0
4530
4531
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004532@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004533def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004534 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004535 parser.add_option('-d', '--display', action='store_true',
4536 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004537 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004538 help='New description to set for this issue (- for stdin, '
4539 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004540 parser.add_option('-f', '--force', action='store_true',
4541 help='Delete any unpublished Gerrit edits for this issue '
4542 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004543
4544 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004545 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004546 options, args = parser.parse_args(args)
4547 _process_codereview_select_options(parser, options)
4548
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004549 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004550 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004551 target_issue_arg = ParseIssueNumberArgument(args[0],
4552 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004553 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004554 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004555
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004556 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004557
martiniss6eda05f2016-06-30 10:18:35 -07004558 kwargs = {
4559 'auth_config': auth_config,
4560 'codereview': options.forced_codereview,
4561 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004562 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004563 if target_issue_arg:
4564 kwargs['issue'] = target_issue_arg.issue
4565 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004566 if target_issue_arg.codereview and not options.forced_codereview:
4567 detected_codereview_from_url = True
4568 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004569
4570 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004571 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004572 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004573 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004574
4575 if detected_codereview_from_url:
4576 logging.info('canonical issue/change URL: %s (type: %s)\n',
4577 cl.GetIssueURL(), target_issue_arg.codereview)
4578
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004579 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004580
smut@google.com34fb6b12015-07-13 20:03:26 +00004581 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004582 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004583 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004584
4585 if options.new_description:
4586 text = options.new_description
4587 if text == '-':
4588 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004589 elif text == '+':
4590 base_branch = cl.GetCommonAncestorWithUpstream()
4591 change = cl.GetChange(base_branch, None, local_description=True)
4592 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004593
4594 description.set_description(text)
4595 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004596 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004597
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004598 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004599 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004600 return 0
4601
4602
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004603def CreateDescriptionFromLog(args):
4604 """Pulls out the commit log to use as a base for the CL description."""
4605 log_args = []
4606 if len(args) == 1 and not args[0].endswith('.'):
4607 log_args = [args[0] + '..']
4608 elif len(args) == 1 and args[0].endswith('...'):
4609 log_args = [args[0][:-1]]
4610 elif len(args) == 2:
4611 log_args = [args[0] + '..' + args[1]]
4612 else:
4613 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004614 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004615
4616
thestig@chromium.org44202a22014-03-11 19:22:18 +00004617def CMDlint(parser, args):
4618 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004619 parser.add_option('--filter', action='append', metavar='-x,+y',
4620 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004621 auth.add_auth_options(parser)
4622 options, args = parser.parse_args(args)
4623 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004624
4625 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004626 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004627 try:
4628 import cpplint
4629 import cpplint_chromium
4630 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004631 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004632 return 1
4633
4634 # Change the current working directory before calling lint so that it
4635 # shows the correct base.
4636 previous_cwd = os.getcwd()
4637 os.chdir(settings.GetRoot())
4638 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004639 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004640 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4641 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004642 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004643 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004644 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004645
4646 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004647 command = args + files
4648 if options.filter:
4649 command = ['--filter=' + ','.join(options.filter)] + command
4650 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004651
4652 white_regex = re.compile(settings.GetLintRegex())
4653 black_regex = re.compile(settings.GetLintIgnoreRegex())
4654 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4655 for filename in filenames:
4656 if white_regex.match(filename):
4657 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004658 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004659 else:
4660 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4661 extra_check_functions)
4662 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004663 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004664 finally:
4665 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004666 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004667 if cpplint._cpplint_state.error_count != 0:
4668 return 1
4669 return 0
4670
4671
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004672def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004673 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004674 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004675 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004676 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004677 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004678 auth.add_auth_options(parser)
4679 options, args = parser.parse_args(args)
4680 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004681
sbc@chromium.org71437c02015-04-09 19:29:40 +00004682 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004683 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004684 return 1
4685
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004686 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004687 if args:
4688 base_branch = args[0]
4689 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004690 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004691 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004692
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004693 cl.RunHook(
4694 committing=not options.upload,
4695 may_prompt=False,
4696 verbose=options.verbose,
4697 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004698 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004699
4700
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004701def GenerateGerritChangeId(message):
4702 """Returns Ixxxxxx...xxx change id.
4703
4704 Works the same way as
4705 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4706 but can be called on demand on all platforms.
4707
4708 The basic idea is to generate git hash of a state of the tree, original commit
4709 message, author/committer info and timestamps.
4710 """
4711 lines = []
4712 tree_hash = RunGitSilent(['write-tree'])
4713 lines.append('tree %s' % tree_hash.strip())
4714 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4715 if code == 0:
4716 lines.append('parent %s' % parent.strip())
4717 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4718 lines.append('author %s' % author.strip())
4719 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4720 lines.append('committer %s' % committer.strip())
4721 lines.append('')
4722 # Note: Gerrit's commit-hook actually cleans message of some lines and
4723 # whitespace. This code is not doing this, but it clearly won't decrease
4724 # entropy.
4725 lines.append(message)
4726 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4727 stdin='\n'.join(lines))
4728 return 'I%s' % change_hash.strip()
4729
4730
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004731def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004732 """Computes the remote branch ref to use for the CL.
4733
4734 Args:
4735 remote (str): The git remote for the CL.
4736 remote_branch (str): The git remote branch for the CL.
4737 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004738 """
4739 if not (remote and remote_branch):
4740 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004741
wittman@chromium.org455dc922015-01-26 20:15:50 +00004742 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004743 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004744 # refs, which are then translated into the remote full symbolic refs
4745 # below.
4746 if '/' not in target_branch:
4747 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4748 else:
4749 prefix_replacements = (
4750 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4751 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4752 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4753 )
4754 match = None
4755 for regex, replacement in prefix_replacements:
4756 match = re.search(regex, target_branch)
4757 if match:
4758 remote_branch = target_branch.replace(match.group(0), replacement)
4759 break
4760 if not match:
4761 # This is a branch path but not one we recognize; use as-is.
4762 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004763 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4764 # Handle the refs that need to land in different refs.
4765 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004766
wittman@chromium.org455dc922015-01-26 20:15:50 +00004767 # Create the true path to the remote branch.
4768 # Does the following translation:
4769 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4770 # * refs/remotes/origin/master -> refs/heads/master
4771 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4772 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4773 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4774 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4775 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4776 'refs/heads/')
4777 elif remote_branch.startswith('refs/remotes/branch-heads'):
4778 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004779
wittman@chromium.org455dc922015-01-26 20:15:50 +00004780 return remote_branch
4781
4782
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004783def cleanup_list(l):
4784 """Fixes a list so that comma separated items are put as individual items.
4785
4786 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4787 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4788 """
4789 items = sum((i.split(',') for i in l), [])
4790 stripped_items = (i.strip() for i in items)
4791 return sorted(filter(None, stripped_items))
4792
4793
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004794@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004795def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004796 """Uploads the current changelist to codereview.
4797
4798 Can skip dependency patchset uploads for a branch by running:
4799 git config branch.branch_name.skip-deps-uploads True
4800 To unset run:
4801 git config --unset branch.branch_name.skip-deps-uploads
4802 Can also set the above globally by using the --global flag.
4803 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004804 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4805 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004806 parser.add_option('--bypass-watchlists', action='store_true',
4807 dest='bypass_watchlists',
4808 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004809 parser.add_option('-f', action='store_true', dest='force',
4810 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004811 parser.add_option('--message', '-m', dest='message',
4812 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004813 parser.add_option('-b', '--bug',
4814 help='pre-populate the bug number(s) for this issue. '
4815 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004816 parser.add_option('--message-file', dest='message_file',
4817 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004818 parser.add_option('--title', '-t', dest='title',
4819 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004820 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004821 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004822 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004823 parser.add_option('--tbrs',
4824 action='append', default=[],
4825 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004826 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004827 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004828 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004829 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004830 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004831 parser.add_option('--emulate_svn_auto_props',
4832 '--emulate-svn-auto-props',
4833 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004834 dest="emulate_svn_auto_props",
4835 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004836 parser.add_option('-c', '--use-commit-queue', action='store_true',
4837 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004838 parser.add_option('--private', action='store_true',
4839 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004840 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004841 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004842 metavar='TARGET',
4843 help='Apply CL to remote ref TARGET. ' +
4844 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004845 parser.add_option('--squash', action='store_true',
4846 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004847 parser.add_option('--no-squash', action='store_true',
4848 help='Don\'t squash multiple commits into one ' +
4849 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004850 parser.add_option('--topic', default=None,
4851 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004852 parser.add_option('--email', default=None,
4853 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004854 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4855 const='TBR', help='add a set of OWNERS to TBR')
4856 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4857 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004858 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4859 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004860 help='Send the patchset to do a CQ dry run right after '
4861 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004862 parser.add_option('--dependencies', action='store_true',
4863 help='Uploads CLs of all the local branches that depend on '
4864 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004865
rmistry@google.com2dd99862015-06-22 12:22:18 +00004866 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004867 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004868 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004869 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004870 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004871 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004872 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004873
sbc@chromium.org71437c02015-04-09 19:29:40 +00004874 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004875 return 1
4876
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004877 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004878 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004879 options.cc = cleanup_list(options.cc)
4880
tandriib80458a2016-06-23 12:20:07 -07004881 if options.message_file:
4882 if options.message:
4883 parser.error('only one of --message and --message-file allowed.')
4884 options.message = gclient_utils.FileRead(options.message_file)
4885 options.message_file = None
4886
tandrii4d0545a2016-07-06 03:56:49 -07004887 if options.cq_dry_run and options.use_commit_queue:
4888 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4889
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004890 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4891 settings.GetIsGerrit()
4892
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004893 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004894 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004895
4896
Francois Dorayd42c6812017-05-30 15:10:20 -04004897@subcommand.usage('--description=<description file>')
4898def CMDsplit(parser, args):
4899 """Splits a branch into smaller branches and uploads CLs.
4900
4901 Creates a branch and uploads a CL for each group of files modified in the
4902 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004903 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004904 the shared OWNERS file.
4905 """
4906 parser.add_option("-d", "--description", dest="description_file",
4907 help="A text file containing a CL description. ")
4908 parser.add_option("-c", "--comment", dest="comment_file",
4909 help="A text file containing a CL comment.")
4910 options, _ = parser.parse_args(args)
4911
4912 if not options.description_file:
4913 parser.error('No --description flag specified.')
4914
4915 def WrappedCMDupload(args):
4916 return CMDupload(OptionParser(), args)
4917
4918 return split_cl.SplitCl(options.description_file, options.comment_file,
4919 Changelist, WrappedCMDupload)
4920
4921
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004922@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004923def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004924 """DEPRECATED: Used to commit the current changelist via git-svn."""
4925 message = ('git-cl no longer supports committing to SVN repositories via '
4926 'git-svn. You probably want to use `git cl land` instead.')
4927 print(message)
4928 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004929
4930
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004931# Two special branches used by git cl land.
4932MERGE_BRANCH = 'git-cl-commit'
4933CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4934
4935
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004936@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004937def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004938 """Commits the current changelist via git.
4939
4940 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4941 upstream and closes the issue automatically and atomically.
4942
4943 Otherwise (in case of Rietveld):
4944 Squashes branch into a single commit.
4945 Updates commit message with metadata (e.g. pointer to review).
4946 Pushes the code upstream.
4947 Updates review and closes.
4948 """
4949 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4950 help='bypass upload presubmit hook')
4951 parser.add_option('-m', dest='message',
4952 help="override review description")
4953 parser.add_option('-f', action='store_true', dest='force',
4954 help="force yes to questions (don't prompt)")
4955 parser.add_option('-c', dest='contributor',
4956 help="external contributor for patch (appended to " +
4957 "description and used as author for git). Should be " +
4958 "formatted as 'First Last <email@example.com>'")
4959 add_git_similarity(parser)
4960 auth.add_auth_options(parser)
4961 (options, args) = parser.parse_args(args)
4962 auth_config = auth.extract_auth_config_from_options(options)
4963
4964 cl = Changelist(auth_config=auth_config)
4965
4966 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4967 if cl.IsGerrit():
4968 if options.message:
4969 # This could be implemented, but it requires sending a new patch to
4970 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4971 # Besides, Gerrit has the ability to change the commit message on submit
4972 # automatically, thus there is no need to support this option (so far?).
4973 parser.error('-m MESSAGE option is not supported for Gerrit.')
4974 if options.contributor:
4975 parser.error(
4976 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4977 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4978 'the contributor\'s "name <email>". If you can\'t upload such a '
4979 'commit for review, contact your repository admin and request'
4980 '"Forge-Author" permission.')
4981 if not cl.GetIssue():
4982 DieWithError('You must upload the change first to Gerrit.\n'
4983 ' If you would rather have `git cl land` upload '
4984 'automatically for you, see http://crbug.com/642759')
4985 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4986 options.verbose)
4987
4988 current = cl.GetBranch()
4989 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4990 if remote == '.':
4991 print()
4992 print('Attempting to push branch %r into another local branch!' % current)
4993 print()
4994 print('Either reparent this branch on top of origin/master:')
4995 print(' git reparent-branch --root')
4996 print()
4997 print('OR run `git rebase-update` if you think the parent branch is ')
4998 print('already committed.')
4999 print()
5000 print(' Current parent: %r' % upstream_branch)
5001 return 1
5002
5003 if not args:
5004 # Default to merging against our best guess of the upstream branch.
5005 args = [cl.GetUpstreamBranch()]
5006
5007 if options.contributor:
5008 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005009 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005010 return 1
5011
5012 base_branch = args[0]
5013
5014 if git_common.is_dirty_git_tree('land'):
5015 return 1
5016
5017 # This rev-list syntax means "show all commits not in my branch that
5018 # are in base_branch".
5019 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5020 base_branch]).splitlines()
5021 if upstream_commits:
5022 print('Base branch "%s" has %d commits '
5023 'not in this branch.' % (base_branch, len(upstream_commits)))
5024 print('Run "git merge %s" before attempting to land.' % base_branch)
5025 return 1
5026
5027 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5028 if not options.bypass_hooks:
5029 author = None
5030 if options.contributor:
5031 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5032 hook_results = cl.RunHook(
5033 committing=True,
5034 may_prompt=not options.force,
5035 verbose=options.verbose,
5036 change=cl.GetChange(merge_base, author))
5037 if not hook_results.should_continue():
5038 return 1
5039
5040 # Check the tree status if the tree status URL is set.
5041 status = GetTreeStatus()
5042 if 'closed' == status:
5043 print('The tree is closed. Please wait for it to reopen. Use '
5044 '"git cl land --bypass-hooks" to commit on a closed tree.')
5045 return 1
5046 elif 'unknown' == status:
5047 print('Unable to determine tree status. Please verify manually and '
5048 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5049 return 1
5050
5051 change_desc = ChangeDescription(options.message)
5052 if not change_desc.description and cl.GetIssue():
5053 change_desc = ChangeDescription(cl.GetDescription())
5054
5055 if not change_desc.description:
5056 if not cl.GetIssue() and options.bypass_hooks:
5057 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5058 else:
5059 print('No description set.')
5060 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5061 return 1
5062
5063 # Keep a separate copy for the commit message, because the commit message
5064 # contains the link to the Rietveld issue, while the Rietveld message contains
5065 # the commit viewvc url.
5066 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005067 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005068 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005069
5070 commit_desc = ChangeDescription(change_desc.description)
5071 if cl.GetIssue():
5072 # Xcode won't linkify this URL unless there is a non-whitespace character
5073 # after it. Add a period on a new line to circumvent this. Also add a space
5074 # before the period to make sure that Gitiles continues to correctly resolve
5075 # the URL.
5076 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5077 if options.contributor:
5078 commit_desc.append_footer('Patch from %s.' % options.contributor)
5079
5080 print('Description:')
5081 print(commit_desc.description)
5082
5083 branches = [merge_base, cl.GetBranchRef()]
5084 if not options.force:
5085 print_stats(options.similarity, options.find_copies, branches)
5086
5087 # We want to squash all this branch's commits into one commit with the proper
5088 # description. We do this by doing a "reset --soft" to the base branch (which
5089 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005090 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005091 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5092 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5093 result = RunGitWithCode(showref_cmd)
5094 if result[0] == 0:
5095 RunGit(['branch', '-D', branch])
5096
5097 # We might be in a directory that's present in this branch but not in the
5098 # trunk. Move up to the top of the tree so that git commands that expect a
5099 # valid CWD won't fail after we check out the merge branch.
5100 rel_base_path = settings.GetRelativeRoot()
5101 if rel_base_path:
5102 os.chdir(rel_base_path)
5103
5104 # Stuff our change into the merge branch.
5105 # We wrap in a try...finally block so if anything goes wrong,
5106 # we clean up the branches.
5107 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005108 revision = None
5109 try:
5110 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5111 RunGit(['reset', '--soft', merge_base])
5112 if options.contributor:
5113 RunGit(
5114 [
5115 'commit', '--author', options.contributor,
5116 '-m', commit_desc.description,
5117 ])
5118 else:
5119 RunGit(['commit', '-m', commit_desc.description])
5120
5121 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5122 mirror = settings.GetGitMirror(remote)
5123 if mirror:
5124 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005125 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005126 else:
5127 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005128 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005129 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5130
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005131 retcode = PushToGitWithAutoRebase(
5132 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005133 if retcode == 0:
5134 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005135 if git_numberer_enabled:
5136 change_desc = ChangeDescription(
5137 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005138 except: # pylint: disable=bare-except
5139 if _IS_BEING_TESTED:
5140 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5141 + '-' * 30 + '8<' + '-' * 30)
5142 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5143 raise
5144 finally:
5145 # And then swap back to the original branch and clean up.
5146 RunGit(['checkout', '-q', cl.GetBranch()])
5147 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005148 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005149
5150 if not revision:
5151 print('Failed to push. If this persists, please file a bug.')
5152 return 1
5153
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005154 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005155 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005156 if viewvc_url and revision:
5157 change_desc.append_footer(
5158 'Committed: %s%s' % (viewvc_url, revision))
5159 elif revision:
5160 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005161 print('Closing issue '
5162 '(you may be prompted for your codereview password)...')
5163 cl.UpdateDescription(change_desc.description)
5164 cl.CloseIssue()
5165 props = cl.GetIssueProperties()
5166 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005167 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5168 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005169 if options.bypass_hooks:
5170 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5171 else:
5172 comment += ' (presubmit successful).'
5173 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5174
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005175 if os.path.isfile(POSTUPSTREAM_HOOK):
5176 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5177
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005178 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005179
5180
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005181def PushToGitWithAutoRebase(remote, branch, original_description,
5182 git_numberer_enabled, max_attempts=3):
5183 """Pushes current HEAD commit on top of remote's branch.
5184
5185 Attempts to fetch and autorebase on push failures.
5186 Adds git number footers on the fly.
5187
5188 Returns integer code from last command.
5189 """
5190 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5191 code = 0
5192 attempts_left = max_attempts
5193 while attempts_left:
5194 attempts_left -= 1
5195 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5196
5197 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5198 # If fetch fails, retry.
5199 print('Fetching %s/%s...' % (remote, branch))
5200 code, out = RunGitWithCode(
5201 ['retry', 'fetch', remote,
5202 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5203 if code:
5204 print('Fetch failed with exit code %d.' % code)
5205 print(out.strip())
5206 continue
5207
5208 print('Cherry-picking commit on top of latest %s' % branch)
5209 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5210 suppress_stderr=True)
5211 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5212 code, out = RunGitWithCode(['cherry-pick', cherry])
5213 if code:
5214 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5215 'the following files have merge conflicts:' %
5216 (branch, parent_hash))
5217 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5218 print('Please rebase your patch and try again.')
5219 RunGitWithCode(['cherry-pick', '--abort'])
5220 break
5221
5222 commit_desc = ChangeDescription(original_description)
5223 if git_numberer_enabled:
5224 logging.debug('Adding git number footers')
5225 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5226 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5227 branch)
5228 # Ensure timestamps are monotonically increasing.
5229 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5230 _get_committer_timestamp('HEAD'))
5231 _git_amend_head(commit_desc.description, timestamp)
5232
5233 code, out = RunGitWithCode(
5234 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5235 print(out)
5236 if code == 0:
5237 break
5238 if IsFatalPushFailure(out):
5239 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005240 'user.email are correct and you have push access to the repo.\n'
5241 'Hint: run command below to diangose common Git/Gerrit credential '
5242 'problems:\n'
5243 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005244 break
5245 return code
5246
5247
5248def IsFatalPushFailure(push_stdout):
5249 """True if retrying push won't help."""
5250 return '(prohibited by Gerrit)' in push_stdout
5251
5252
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005253@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005254def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005255 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256 parser.add_option('-b', dest='newbranch',
5257 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005258 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005259 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005260 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5261 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005262 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005263 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005264 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005265 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005266 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005267 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005268
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005269
5270 group = optparse.OptionGroup(
5271 parser,
5272 'Options for continuing work on the current issue uploaded from a '
5273 'different clone (e.g. different machine). Must be used independently '
5274 'from the other options. No issue number should be specified, and the '
5275 'branch must have an issue number associated with it')
5276 group.add_option('--reapply', action='store_true', dest='reapply',
5277 help='Reset the branch and reapply the issue.\n'
5278 'CAUTION: This will undo any local changes in this '
5279 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005280
5281 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005282 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005283 parser.add_option_group(group)
5284
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005285 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005286 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005288 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005289 auth_config = auth.extract_auth_config_from_options(options)
5290
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005291 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005292 if options.newbranch:
5293 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005294 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005295 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005296
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005297 cl = Changelist(auth_config=auth_config,
5298 codereview=options.forced_codereview)
5299 if not cl.GetIssue():
5300 parser.error('current branch must have an associated issue')
5301
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005302 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005303 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005304 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005305
5306 RunGit(['reset', '--hard', upstream])
5307 if options.pull:
5308 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005309
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005310 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5311 options.directory)
5312
5313 if len(args) != 1 or not args[0]:
5314 parser.error('Must specify issue number or url')
5315
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005316 target_issue_arg = ParseIssueNumberArgument(args[0],
5317 options.forced_codereview)
5318 if not target_issue_arg.valid:
5319 parser.error('invalid codereview url or CL id')
5320
5321 cl_kwargs = {
5322 'auth_config': auth_config,
5323 'codereview_host': target_issue_arg.hostname,
5324 'codereview': options.forced_codereview,
5325 }
5326 detected_codereview_from_url = False
5327 if target_issue_arg.codereview and not options.forced_codereview:
5328 detected_codereview_from_url = True
5329 cl_kwargs['codereview'] = target_issue_arg.codereview
5330 cl_kwargs['issue'] = target_issue_arg.issue
5331
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005332 # We don't want uncommitted changes mixed up with the patch.
5333 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005334 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005335
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005336 if options.newbranch:
5337 if options.force:
5338 RunGit(['branch', '-D', options.newbranch],
5339 stderr=subprocess2.PIPE, error_ok=True)
5340 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005341 elif not GetCurrentBranch():
5342 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005343
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005344 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005345
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005346 if cl.IsGerrit():
5347 if options.reject:
5348 parser.error('--reject is not supported with Gerrit codereview.')
5349 if options.nocommit:
5350 parser.error('--nocommit is not supported with Gerrit codereview.')
5351 if options.directory:
5352 parser.error('--directory is not supported with Gerrit codereview.')
5353
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005354 if detected_codereview_from_url:
5355 print('canonical issue/change URL: %s (type: %s)\n' %
5356 (cl.GetIssueURL(), target_issue_arg.codereview))
5357
5358 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
5359 options.nocommit, options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005360
5361
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005362def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005363 """Fetches the tree status and returns either 'open', 'closed',
5364 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005365 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005366 if url:
5367 status = urllib2.urlopen(url).read().lower()
5368 if status.find('closed') != -1 or status == '0':
5369 return 'closed'
5370 elif status.find('open') != -1 or status == '1':
5371 return 'open'
5372 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005373 return 'unset'
5374
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005375
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005376def GetTreeStatusReason():
5377 """Fetches the tree status from a json url and returns the message
5378 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005379 url = settings.GetTreeStatusUrl()
5380 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005381 connection = urllib2.urlopen(json_url)
5382 status = json.loads(connection.read())
5383 connection.close()
5384 return status['message']
5385
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005386
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005387def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005388 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005389 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005390 status = GetTreeStatus()
5391 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005392 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005393 return 2
5394
vapiera7fbd5a2016-06-16 09:17:49 -07005395 print('The tree is %s' % status)
5396 print()
5397 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005398 if status != 'open':
5399 return 1
5400 return 0
5401
5402
maruel@chromium.org15192402012-09-06 12:38:29 +00005403def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005404 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005405 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005406 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005407 '-b', '--bot', action='append',
5408 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5409 'times to specify multiple builders. ex: '
5410 '"-b win_rel -b win_layout". See '
5411 'the try server waterfall for the builders name and the tests '
5412 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005413 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005414 '-B', '--bucket', default='',
5415 help=('Buildbucket bucket to send the try requests.'))
5416 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005417 '-m', '--master', default='',
5418 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005419 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005420 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005421 help='Revision to use for the try job; default: the revision will '
5422 'be determined by the try recipe that builder runs, which usually '
5423 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005424 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005425 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005426 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005427 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005428 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005429 '--project',
5430 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005431 'in recipe to determine to which repository or directory to '
5432 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005433 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005434 '-p', '--property', dest='properties', action='append', default=[],
5435 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005436 'key2=value2 etc. The value will be treated as '
5437 'json if decodable, or as string otherwise. '
5438 'NOTE: using this may make your try job not usable for CQ, '
5439 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005440 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005441 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5442 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005443 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005444 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005445 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005446 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005447
machenbach@chromium.org45453142015-09-15 08:45:22 +00005448 # Make sure that all properties are prop=value pairs.
5449 bad_params = [x for x in options.properties if '=' not in x]
5450 if bad_params:
5451 parser.error('Got properties with missing "=": %s' % bad_params)
5452
maruel@chromium.org15192402012-09-06 12:38:29 +00005453 if args:
5454 parser.error('Unknown arguments: %s' % args)
5455
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005456 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005457 if not cl.GetIssue():
5458 parser.error('Need to upload first')
5459
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005460 if cl.IsGerrit():
5461 # HACK: warm up Gerrit change detail cache to save on RPCs.
5462 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5463
tandriie113dfd2016-10-11 10:20:12 -07005464 error_message = cl.CannotTriggerTryJobReason()
5465 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005466 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005467
borenet6c0efe62016-10-19 08:13:29 -07005468 if options.bucket and options.master:
5469 parser.error('Only one of --bucket and --master may be used.')
5470
qyearsley1fdfcb62016-10-24 13:22:03 -07005471 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005472
qyearsleydd49f942016-10-28 11:57:22 -07005473 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5474 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005475 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005476 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005477 print('git cl try with no bots now defaults to CQ dry run.')
5478 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5479 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005480
borenet6c0efe62016-10-19 08:13:29 -07005481 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005482 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005483 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005484 'of bot requires an initial job from a parent (usually a builder). '
5485 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005486 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005487 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005488
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005489 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005490 # TODO(tandrii): Checking local patchset against remote patchset is only
5491 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5492 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005493 print('Warning: Codereview server has newer patchsets (%s) than most '
5494 'recent upload from local checkout (%s). Did a previous upload '
5495 'fail?\n'
5496 'By default, git cl try uses the latest patchset from '
5497 'codereview, continuing to use patchset %s.\n' %
5498 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005499
tandrii568043b2016-10-11 07:49:18 -07005500 try:
borenet6c0efe62016-10-19 08:13:29 -07005501 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5502 patchset)
tandrii568043b2016-10-11 07:49:18 -07005503 except BuildbucketResponseException as ex:
5504 print('ERROR: %s' % ex)
5505 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005506 return 0
5507
5508
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005509def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005510 """Prints info about try jobs associated with current CL."""
5511 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005512 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005513 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005514 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005515 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005516 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005517 '--color', action='store_true', default=setup_color.IS_TTY,
5518 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +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.')
qyearsley53f48a12016-09-01 10:45:13 -07005522 group.add_option(
5523 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005524 parser.add_option_group(group)
5525 auth.add_auth_options(parser)
5526 options, args = parser.parse_args(args)
5527 if args:
5528 parser.error('Unrecognized args: %s' % ' '.join(args))
5529
5530 auth_config = auth.extract_auth_config_from_options(options)
5531 cl = Changelist(auth_config=auth_config)
5532 if not cl.GetIssue():
5533 parser.error('Need to upload first')
5534
tandrii221ab252016-10-06 08:12:04 -07005535 patchset = options.patchset
5536 if not patchset:
5537 patchset = cl.GetMostRecentPatchset()
5538 if not patchset:
5539 parser.error('Codereview doesn\'t know about issue %s. '
5540 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005541 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005542 cl.GetIssue())
5543
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005544 # TODO(tandrii): Checking local patchset against remote patchset is only
5545 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5546 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005547 print('Warning: Codereview server has newer patchsets (%s) than most '
5548 'recent upload from local checkout (%s). Did a previous upload '
5549 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005550 'By default, git cl try-results uses the latest patchset from '
5551 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005552 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005553 try:
tandrii221ab252016-10-06 08:12:04 -07005554 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005555 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005556 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005557 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005558 if options.json:
5559 write_try_results_json(options.json, jobs)
5560 else:
5561 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005562 return 0
5563
5564
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005565@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005566def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005567 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005568 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005569 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005570 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005571
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005572 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005573 if args:
5574 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005575 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005576 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005577 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005578 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005579
5580 # Clear configured merge-base, if there is one.
5581 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005582 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005583 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005584 return 0
5585
5586
thestig@chromium.org00858c82013-12-02 23:08:03 +00005587def CMDweb(parser, args):
5588 """Opens the current CL in the web browser."""
5589 _, args = parser.parse_args(args)
5590 if args:
5591 parser.error('Unrecognized args: %s' % ' '.join(args))
5592
5593 issue_url = Changelist().GetIssueURL()
5594 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005595 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005596 return 1
5597
5598 webbrowser.open(issue_url)
5599 return 0
5600
5601
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005602def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005603 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005604 parser.add_option('-d', '--dry-run', action='store_true',
5605 help='trigger in dry run mode')
5606 parser.add_option('-c', '--clear', action='store_true',
5607 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005608 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005609 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005610 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005611 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005612 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005613 if args:
5614 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005615 if options.dry_run and options.clear:
5616 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5617
iannuccie53c9352016-08-17 14:40:40 -07005618 cl = Changelist(auth_config=auth_config, issue=options.issue,
5619 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005620 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005621 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005622 elif options.dry_run:
5623 state = _CQState.DRY_RUN
5624 else:
5625 state = _CQState.COMMIT
5626 if not cl.GetIssue():
5627 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005628 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005629 return 0
5630
5631
groby@chromium.org411034a2013-02-26 15:12:01 +00005632def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005633 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005634 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005635 auth.add_auth_options(parser)
5636 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005637 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005638 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005639 if args:
5640 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005641 cl = Changelist(auth_config=auth_config, issue=options.issue,
5642 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005643 # Ensure there actually is an issue to close.
5644 cl.GetDescription()
5645 cl.CloseIssue()
5646 return 0
5647
5648
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005649def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005650 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005651 parser.add_option(
5652 '--stat',
5653 action='store_true',
5654 dest='stat',
5655 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005656 auth.add_auth_options(parser)
5657 options, args = parser.parse_args(args)
5658 auth_config = auth.extract_auth_config_from_options(options)
5659 if args:
5660 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005661
5662 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005663 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005664 # Staged changes would be committed along with the patch from last
5665 # upload, hence counted toward the "last upload" side in the final
5666 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005667 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005668 return 1
5669
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005670 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005671 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005672 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005673 if not issue:
5674 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005675 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005676 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005677
5678 # Create a new branch based on the merge-base
5679 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005680 # Clear cached branch in cl object, to avoid overwriting original CL branch
5681 # properties.
5682 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005683 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005684 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005685 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005686 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005687 return rtn
5688
wychen@chromium.org06928532015-02-03 02:11:29 +00005689 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005690 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005691 cmd = ['git', 'diff']
5692 if options.stat:
5693 cmd.append('--stat')
5694 cmd.extend([TMP_BRANCH, branch, '--'])
5695 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005696 finally:
5697 RunGit(['checkout', '-q', branch])
5698 RunGit(['branch', '-D', TMP_BRANCH])
5699
5700 return 0
5701
5702
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005703def CMDowners(parser, args):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005704 """Interactively finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005705 parser.add_option(
5706 '--no-color',
5707 action='store_true',
5708 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005709 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005710 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005711 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005712
5713 author = RunGit(['config', 'user.email']).strip() or None
5714
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005715 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005716
5717 if args:
5718 if len(args) > 1:
5719 parser.error('Unknown args')
5720 base_branch = args[0]
5721 else:
5722 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005723 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005724
5725 change = cl.GetChange(base_branch, None)
5726 return owners_finder.OwnersFinder(
5727 [f.LocalPath() for f in
5728 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005729 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005730 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005731 disable_color=options.no_color,
5732 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005733
5734
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005735def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005736 """Generates a diff command."""
5737 # Generate diff for the current branch's changes.
5738 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005739 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005740
5741 if args:
5742 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005743 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005744 diff_cmd.append(arg)
5745 else:
5746 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005747
5748 return diff_cmd
5749
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005750
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005751def MatchingFileType(file_name, extensions):
5752 """Returns true if the file name ends with one of the given extensions."""
5753 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005754
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005755
enne@chromium.org555cfe42014-01-29 18:21:39 +00005756@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005757def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005758 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005759 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005760 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005761 parser.add_option('--full', action='store_true',
5762 help='Reformat the full content of all touched files')
5763 parser.add_option('--dry-run', action='store_true',
5764 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005765 parser.add_option('--python', action='store_true',
5766 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005767 parser.add_option('--js', action='store_true',
5768 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005769 parser.add_option('--diff', action='store_true',
5770 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005771 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005772
Daniel Chengc55eecf2016-12-30 03:11:02 -08005773 # Normalize any remaining args against the current path, so paths relative to
5774 # the current directory are still resolved as expected.
5775 args = [os.path.join(os.getcwd(), arg) for arg in args]
5776
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005777 # git diff generates paths against the root of the repository. Change
5778 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005779 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005780 if rel_base_path:
5781 os.chdir(rel_base_path)
5782
digit@chromium.org29e47272013-05-17 17:01:46 +00005783 # Grab the merge-base commit, i.e. the upstream commit of the current
5784 # branch when it was created or the last time it was rebased. This is
5785 # to cover the case where the user may have called "git fetch origin",
5786 # moving the origin branch to a newer commit, but hasn't rebased yet.
5787 upstream_commit = None
5788 cl = Changelist()
5789 upstream_branch = cl.GetUpstreamBranch()
5790 if upstream_branch:
5791 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5792 upstream_commit = upstream_commit.strip()
5793
5794 if not upstream_commit:
5795 DieWithError('Could not find base commit for this branch. '
5796 'Are you in detached state?')
5797
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005798 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5799 diff_output = RunGit(changed_files_cmd)
5800 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005801 # Filter out files deleted by this CL
5802 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005803
Christopher Lamc5ba6922017-01-24 11:19:14 +11005804 if opts.js:
5805 CLANG_EXTS.append('.js')
5806
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005807 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5808 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5809 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005810 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005811
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005812 top_dir = os.path.normpath(
5813 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5814
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005815 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5816 # formatted. This is used to block during the presubmit.
5817 return_value = 0
5818
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005819 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005820 # Locate the clang-format binary in the checkout
5821 try:
5822 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005823 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005824 DieWithError(e)
5825
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005826 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005827 cmd = [clang_format_tool]
5828 if not opts.dry_run and not opts.diff:
5829 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005830 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005831 if opts.diff:
5832 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005833 else:
5834 env = os.environ.copy()
5835 env['PATH'] = str(os.path.dirname(clang_format_tool))
5836 try:
5837 script = clang_format.FindClangFormatScriptInChromiumTree(
5838 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005839 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005840 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005841
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005842 cmd = [sys.executable, script, '-p0']
5843 if not opts.dry_run and not opts.diff:
5844 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005845
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005846 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5847 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005848
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005849 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5850 if opts.diff:
5851 sys.stdout.write(stdout)
5852 if opts.dry_run and len(stdout) > 0:
5853 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005854
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005855 # Similar code to above, but using yapf on .py files rather than clang-format
5856 # on C/C++ files
5857 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005858 yapf_tool = gclient_utils.FindExecutable('yapf')
5859 if yapf_tool is None:
5860 DieWithError('yapf not found in PATH')
5861
5862 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005863 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005864 cmd = [yapf_tool]
5865 if not opts.dry_run and not opts.diff:
5866 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005867 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005868 if opts.diff:
5869 sys.stdout.write(stdout)
5870 else:
5871 # TODO(sbc): yapf --lines mode still has some issues.
5872 # https://github.com/google/yapf/issues/154
5873 DieWithError('--python currently only works with --full')
5874
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005875 # Dart's formatter does not have the nice property of only operating on
5876 # modified chunks, so hard code full.
5877 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005878 try:
5879 command = [dart_format.FindDartFmtToolInChromiumTree()]
5880 if not opts.dry_run and not opts.diff:
5881 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005882 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005883
ppi@chromium.org6593d932016-03-03 15:41:15 +00005884 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005885 if opts.dry_run and stdout:
5886 return_value = 2
5887 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005888 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5889 'found in this checkout. Files in other languages are still '
5890 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005891
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005892 # Format GN build files. Always run on full build files for canonical form.
5893 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005894 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005895 if opts.dry_run or opts.diff:
5896 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005897 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005898 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5899 shell=sys.platform == 'win32',
5900 cwd=top_dir)
5901 if opts.dry_run and gn_ret == 2:
5902 return_value = 2 # Not formatted.
5903 elif opts.diff and gn_ret == 2:
5904 # TODO this should compute and print the actual diff.
5905 print("This change has GN build file diff for " + gn_diff_file)
5906 elif gn_ret != 0:
5907 # For non-dry run cases (and non-2 return values for dry-run), a
5908 # nonzero error code indicates a failure, probably because the file
5909 # doesn't parse.
5910 DieWithError("gn format failed on " + gn_diff_file +
5911 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005912
Steven Holte2e664bf2017-04-21 13:10:47 -07005913 for xml_dir in GetDirtyMetricsDirs(diff_files):
5914 tool_dir = os.path.join(top_dir, xml_dir)
5915 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5916 if opts.dry_run or opts.diff:
5917 cmd.append('--diff')
5918 stdout = RunCommand(cmd, cwd=top_dir)
5919 if opts.diff:
5920 sys.stdout.write(stdout)
5921 if opts.dry_run and stdout:
5922 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005923
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005924 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005925
Steven Holte2e664bf2017-04-21 13:10:47 -07005926def GetDirtyMetricsDirs(diff_files):
5927 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5928 metrics_xml_dirs = [
5929 os.path.join('tools', 'metrics', 'actions'),
5930 os.path.join('tools', 'metrics', 'histograms'),
5931 os.path.join('tools', 'metrics', 'rappor'),
5932 os.path.join('tools', 'metrics', 'ukm')]
5933 for xml_dir in metrics_xml_dirs:
5934 if any(file.startswith(xml_dir) for file in xml_diff_files):
5935 yield xml_dir
5936
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005937
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005938@subcommand.usage('<codereview url or issue id>')
5939def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005940 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005941 _, args = parser.parse_args(args)
5942
5943 if len(args) != 1:
5944 parser.print_help()
5945 return 1
5946
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005947 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005948 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005949 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005950
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005951 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005952
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005953 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005954 output = RunGit(['config', '--local', '--get-regexp',
5955 r'branch\..*\.%s' % issueprefix],
5956 error_ok=True)
5957 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005958 if issue == target_issue:
5959 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005960
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005961 branches = []
5962 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005963 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005964 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005965 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005966 return 1
5967 if len(branches) == 1:
5968 RunGit(['checkout', branches[0]])
5969 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005970 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005971 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005972 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005973 which = raw_input('Choose by index: ')
5974 try:
5975 RunGit(['checkout', branches[int(which)]])
5976 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005977 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005978 return 1
5979
5980 return 0
5981
5982
maruel@chromium.org29404b52014-09-08 22:58:00 +00005983def CMDlol(parser, args):
5984 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005985 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005986 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5987 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5988 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005989 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005990 return 0
5991
5992
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005993class OptionParser(optparse.OptionParser):
5994 """Creates the option parse and add --verbose support."""
5995 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005996 optparse.OptionParser.__init__(
5997 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005998 self.add_option(
5999 '-v', '--verbose', action='count', default=0,
6000 help='Use 2 times for more debugging info')
6001
6002 def parse_args(self, args=None, values=None):
6003 options, args = optparse.OptionParser.parse_args(self, args, values)
6004 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006005 logging.basicConfig(
6006 level=levels[min(options.verbose, len(levels) - 1)],
6007 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6008 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006009 return options, args
6010
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006011
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006012def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006013 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006014 print('\nYour python version %s is unsupported, please upgrade.\n' %
6015 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006016 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006017
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006018 # Reload settings.
6019 global settings
6020 settings = Settings()
6021
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006022 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006023 dispatcher = subcommand.CommandDispatcher(__name__)
6024 try:
6025 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006026 except auth.AuthenticationError as e:
6027 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006028 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006029 if e.code != 500:
6030 raise
6031 DieWithError(
6032 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6033 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006034 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006035
6036
6037if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006038 # These affect sys.stdout so do it outside of main() to simplify mocks in
6039 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006040 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006041 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006042 try:
6043 sys.exit(main(sys.argv[1:]))
6044 except KeyboardInterrupt:
6045 sys.stderr.write('interrupted\n')
6046 sys.exit(1)