blob: a935c63c109b2b20cb96d1f465a1c1fc6fc34f83 [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
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001716 def GetCommentsSummary(self):
1717 """Returns list of _CommentSummary for each comment.
1718
1719 Note: comments per file or per line are not included,
1720 only top-level comments are returned.
1721 """
1722 return self._codereview_impl.GetCommentsSummary()
1723
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
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001823 def GetCommentsSummary(self):
1824 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
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001999 def GetCommentsSummary(self):
2000 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
2417 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002418 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002419 ' %s\n'
2420 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002421 ' Consider running the following command:\n'
2422 ' git cl creds-check\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002423 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002424 (git_host, self._gerrit_host,
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002425 cookie_auth.get_new_password_message(git_host)))
2426 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002427 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002428 return
2429 else:
2430 missing = (
2431 [] if gerrit_auth else [self._gerrit_host] +
2432 [] if git_auth else [git_host])
2433 DieWithError('Credentials for the following hosts are required:\n'
2434 ' %s\n'
2435 'These are read from %s (or legacy %s)\n'
2436 '%s' % (
2437 '\n '.join(missing),
2438 cookie_auth.get_gitcookies_path(),
2439 cookie_auth.get_netrc_path(),
2440 cookie_auth.get_new_password_message(git_host)))
2441
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002442 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002443 if not self.GetIssue():
2444 return
2445
2446 # Warm change details cache now to avoid RPCs later, reducing latency for
2447 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002448 self._GetChangeDetail(
2449 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002450
2451 status = self._GetChangeDetail()['status']
2452 if status in ('MERGED', 'ABANDONED'):
2453 DieWithError('Change %s has been %s, new uploads are not allowed' %
2454 (self.GetIssueURL(),
2455 'submitted' if status == 'MERGED' else 'abandoned'))
2456
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002457 if gerrit_util.GceAuthenticator.is_gce():
2458 return
2459 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2460 self._GetGerritHost())
2461 if self.GetIssueOwner() == cookies_user:
2462 return
2463 logging.debug('change %s owner is %s, cookies user is %s',
2464 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002465 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002466 # so ask what Gerrit thinks of this user.
2467 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2468 if details['email'] == self.GetIssueOwner():
2469 return
2470 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002471 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002472 'as %s.\n'
2473 'Uploading may fail due to lack of permissions.' %
2474 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2475 confirm_or_exit(action='upload')
2476
2477
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002478 def _PostUnsetIssueProperties(self):
2479 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002480 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002481
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002482 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002483 class ThisIsNotRietveldIssue(object):
2484 def __nonzero__(self):
2485 # This is a hack to make presubmit_support think that rietveld is not
2486 # defined, yet still ensure that calls directly result in a decent
2487 # exception message below.
2488 return False
2489
2490 def __getattr__(self, attr):
2491 print(
2492 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2493 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002494 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002495 'or use Rietveld for codereview.\n'
2496 'See also http://crbug.com/579160.' % attr)
2497 raise NotImplementedError()
2498 return ThisIsNotRietveldIssue()
2499
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002500 def GetGerritObjForPresubmit(self):
2501 return presubmit_support.GerritAccessor(self._GetGerritHost())
2502
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002503 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002504 """Apply a rough heuristic to give a simple summary of an issue's review
2505 or CQ status, assuming adherence to a common workflow.
2506
2507 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002508 * 'error' - error from review tool (including deleted issues)
2509 * 'unsent' - no reviewers added
2510 * 'waiting' - waiting for review
2511 * 'reply' - waiting for uploader to reply to review
2512 * 'lgtm' - Code-Review label has been set
2513 * 'commit' - in the commit queue
2514 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002515 """
2516 if not self.GetIssue():
2517 return None
2518
2519 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002520 data = self._GetChangeDetail([
2521 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002522 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002523 return 'error'
2524
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002525 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002526 return 'closed'
2527
Aaron Gable9ab38c62017-04-06 14:36:33 -07002528 if data['labels'].get('Commit-Queue', {}).get('approved'):
2529 # The section will have an "approved" subsection if anyone has voted
2530 # the maximum value on the label.
2531 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002532
Aaron Gable9ab38c62017-04-06 14:36:33 -07002533 if data['labels'].get('Code-Review', {}).get('approved'):
2534 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002535
2536 if not data.get('reviewers', {}).get('REVIEWER', []):
2537 return 'unsent'
2538
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002539 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002540 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2541 last_message_author = messages.pop().get('author', {})
2542 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002543 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2544 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002545 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002546 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002547 if last_message_author.get('_account_id') == owner:
2548 # Most recent message was by owner.
2549 return 'waiting'
2550 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002551 # Some reply from non-owner.
2552 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002553
2554 # Somehow there are no messages even though there are reviewers.
2555 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002556
2557 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002558 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002559 return data['revisions'][data['current_revision']]['_number']
2560
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002561 def FetchDescription(self, force=False):
2562 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2563 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002564 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002565 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002566
dsansomee2d6fd92016-09-08 00:10:47 -07002567 def UpdateDescriptionRemote(self, description, force=False):
2568 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2569 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002570 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002571 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002572 'unpublished edit. Either publish the edit in the Gerrit web UI '
2573 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002574
2575 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2576 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002577 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002578 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002579
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002580 def AddComment(self, message):
2581 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2582 msg=message)
2583
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002584 def GetCommentsSummary(self):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002585 # DETAILED_ACCOUNTS is to get emails in accounts.
2586 data = self._GetChangeDetail(options=['MESSAGES', 'DETAILED_ACCOUNTS'])
2587 summary = []
2588 for msg in data.get('messages', []):
2589 # Gerrit spits out nanoseconds.
2590 assert len(msg['date'].split('.')[-1]) == 9
2591 date = datetime.datetime.strptime(msg['date'][:-3],
2592 '%Y-%m-%d %H:%M:%S.%f')
2593 summary.append(_CommentSummary(
2594 date=date,
2595 message=msg['message'],
2596 sender=msg['author']['email'],
2597 # These could be inferred from the text messages and correlated with
2598 # Code-Review label maximum, however this is not reliable.
2599 # Leaving as is until the need arises.
2600 approval=False,
2601 disapproval=False,
2602 ))
2603 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002604
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002605 def CloseIssue(self):
2606 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2607
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002608 def SubmitIssue(self, wait_for_merge=True):
2609 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2610 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002611
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002612 def _GetChangeDetail(self, options=None, issue=None,
2613 no_cache=False):
2614 """Returns details of the issue by querying Gerrit and caching results.
2615
2616 If fresh data is needed, set no_cache=True which will clear cache and
2617 thus new data will be fetched from Gerrit.
2618 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002619 options = options or []
2620 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002621 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002622
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002623 # Optimization to avoid multiple RPCs:
2624 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2625 'CURRENT_COMMIT' not in options):
2626 options.append('CURRENT_COMMIT')
2627
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002628 # Normalize issue and options for consistent keys in cache.
2629 issue = str(issue)
2630 options = [o.upper() for o in options]
2631
2632 # Check in cache first unless no_cache is True.
2633 if no_cache:
2634 self._detail_cache.pop(issue, None)
2635 else:
2636 options_set = frozenset(options)
2637 for cached_options_set, data in self._detail_cache.get(issue, []):
2638 # Assumption: data fetched before with extra options is suitable
2639 # for return for a smaller set of options.
2640 # For example, if we cached data for
2641 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2642 # and request is for options=[CURRENT_REVISION],
2643 # THEN we can return prior cached data.
2644 if options_set.issubset(cached_options_set):
2645 return data
2646
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002647 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002648 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002649 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002650 except gerrit_util.GerritError as e:
2651 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002652 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002653 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002654
2655 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002656 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002657
agable32978d92016-11-01 12:55:02 -07002658 def _GetChangeCommit(self, issue=None):
2659 issue = issue or self.GetIssue()
2660 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002661 try:
2662 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2663 except gerrit_util.GerritError as e:
2664 if e.http_status == 404:
2665 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2666 raise
agable32978d92016-11-01 12:55:02 -07002667 return data
2668
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002669 def CMDLand(self, force, bypass_hooks, verbose):
2670 if git_common.is_dirty_git_tree('land'):
2671 return 1
tandriid60367b2016-06-22 05:25:12 -07002672 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2673 if u'Commit-Queue' in detail.get('labels', {}):
2674 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002675 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2676 'which can test and land changes for you. '
2677 'Are you sure you wish to bypass it?\n',
2678 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002679
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002680 differs = True
tandriic4344b52016-08-29 06:04:54 -07002681 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002682 # Note: git diff outputs nothing if there is no diff.
2683 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002684 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002685 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002686 if detail['current_revision'] == last_upload:
2687 differs = False
2688 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002689 print('WARNING: Local branch contents differ from latest uploaded '
2690 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002691 if differs:
2692 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002693 confirm_or_exit(
2694 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2695 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002696 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002697 elif not bypass_hooks:
2698 hook_results = self.RunHook(
2699 committing=True,
2700 may_prompt=not force,
2701 verbose=verbose,
2702 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2703 if not hook_results.should_continue():
2704 return 1
2705
2706 self.SubmitIssue(wait_for_merge=True)
2707 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002708 links = self._GetChangeCommit().get('web_links', [])
2709 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002710 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002711 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002712 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002713 return 0
2714
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002715 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2716 directory):
2717 assert not reject
2718 assert not nocommit
2719 assert not directory
2720 assert parsed_issue_arg.valid
2721
2722 self._changelist.issue = parsed_issue_arg.issue
2723
2724 if parsed_issue_arg.hostname:
2725 self._gerrit_host = parsed_issue_arg.hostname
2726 self._gerrit_server = 'https://%s' % self._gerrit_host
2727
tandriic2405f52016-10-10 08:13:15 -07002728 try:
2729 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002730 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002731 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002732
2733 if not parsed_issue_arg.patchset:
2734 # Use current revision by default.
2735 revision_info = detail['revisions'][detail['current_revision']]
2736 patchset = int(revision_info['_number'])
2737 else:
2738 patchset = parsed_issue_arg.patchset
2739 for revision_info in detail['revisions'].itervalues():
2740 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2741 break
2742 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002743 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002744 (parsed_issue_arg.patchset, self.GetIssue()))
2745
2746 fetch_info = revision_info['fetch']['http']
2747 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002748 self.SetIssue(self.GetIssue())
2749 self.SetPatchset(patchset)
Aaron Gabled343c632017-03-15 11:02:26 -07002750 RunGit(['cherry-pick', 'FETCH_HEAD'])
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002751 print('Committed patch for change %i patchset %i locally.' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002752 (self.GetIssue(), self.GetPatchset()))
2753 return 0
2754
2755 @staticmethod
2756 def ParseIssueURL(parsed_url):
2757 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2758 return None
2759 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2760 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2761 # Short urls like https://domain/<issue_number> can be used, but don't allow
2762 # specifying the patchset (you'd 404), but we allow that here.
2763 if parsed_url.path == '/':
2764 part = parsed_url.fragment
2765 else:
2766 part = parsed_url.path
2767 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2768 if match:
2769 return _ParsedIssueNumberArgument(
2770 issue=int(match.group(2)),
2771 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002772 hostname=parsed_url.netloc,
2773 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002774 return None
2775
tandrii16e0b4e2016-06-07 10:34:28 -07002776 def _GerritCommitMsgHookCheck(self, offer_removal):
2777 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2778 if not os.path.exists(hook):
2779 return
2780 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2781 # custom developer made one.
2782 data = gclient_utils.FileRead(hook)
2783 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2784 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002785 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002786 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002787 'and may interfere with it in subtle ways.\n'
2788 'We recommend you remove the commit-msg hook.')
2789 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002790 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002791 gclient_utils.rm_file_or_tree(hook)
2792 print('Gerrit commit-msg hook removed.')
2793 else:
2794 print('OK, will keep Gerrit commit-msg hook in place.')
2795
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002796 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002797 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002798 if options.squash and options.no_squash:
2799 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002800
2801 if not options.squash and not options.no_squash:
2802 # Load default for user, repo, squash=true, in this order.
2803 options.squash = settings.GetSquashGerritUploads()
2804 elif options.no_squash:
2805 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002806
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002807 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002808 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002809
Aaron Gableb56ad332017-01-06 15:24:31 -08002810 # This may be None; default fallback value is determined in logic below.
2811 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002812 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002813
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002814 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002815 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002816 if self.GetIssue():
2817 # Try to get the message from a previous upload.
2818 message = self.GetDescription()
2819 if not message:
2820 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002821 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002822 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002823 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002824 if options.message:
2825 # For compatibility with Rietveld, if -m|--message is given on
2826 # command line, title should be the first line of that message,
2827 # which shouldn't be confused with CL description.
2828 default_title = options.message.strip().split()[0]
2829 else:
2830 default_title = RunGit(
2831 ['show', '-s', '--format=%s', 'HEAD']).strip()
Andrii Shyshkalove00a29b2017-04-10 14:48:28 +02002832 if options.force:
2833 title = default_title
2834 else:
2835 title = ask_for_data(
2836 'Title for patchset [%s]: ' % default_title) or default_title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002837 if title == default_title:
2838 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002839 change_id = self._GetChangeDetail()['change_id']
2840 while True:
2841 footer_change_ids = git_footers.get_footer_change_id(message)
2842 if footer_change_ids == [change_id]:
2843 break
2844 if not footer_change_ids:
2845 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002846 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002847 continue
2848 # There is already a valid footer but with different or several ids.
2849 # Doing this automatically is non-trivial as we don't want to lose
2850 # existing other footers, yet we want to append just 1 desired
2851 # Change-Id. Thus, just create a new footer, but let user verify the
2852 # new description.
2853 message = '%s\n\nChange-Id: %s' % (message, change_id)
2854 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002855 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002856 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002857 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002858 'Please, check the proposed correction to the description, '
2859 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2860 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2861 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002862 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002863 if not options.force:
2864 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002865 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002866 message = change_desc.description
2867 if not message:
2868 DieWithError("Description is empty. Aborting...")
2869 # Continue the while loop.
2870 # Sanity check of this code - we should end up with proper message
2871 # footer.
2872 assert [change_id] == git_footers.get_footer_change_id(message)
2873 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002874 else: # if not self.GetIssue()
2875 if options.message:
2876 message = options.message
2877 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002878 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002879 if options.title:
2880 message = options.title + '\n\n' + message
2881 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002882
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002883 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002884 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002885 # On first upload, patchset title is always this string, while
2886 # --title flag gets converted to first line of message.
2887 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002888 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002889 if not change_desc.description:
2890 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002891 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002892 if len(change_ids) > 1:
2893 DieWithError('too many Change-Id footers, at most 1 allowed.')
2894 if not change_ids:
2895 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002896 change_desc.set_description(git_footers.add_footer_change_id(
2897 change_desc.description,
2898 GenerateGerritChangeId(change_desc.description)))
2899 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002900 assert len(change_ids) == 1
2901 change_id = change_ids[0]
2902
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002903 if options.reviewers or options.tbrs or options.add_owners_to:
2904 change_desc.update_reviewers(options.reviewers, options.tbrs,
2905 options.add_owners_to, change)
2906
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002907 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002908 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2909 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002910 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2911 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002912 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002913 else:
2914 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002915 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002916 if not change_desc.description:
2917 DieWithError("Description is empty. Aborting...")
2918
2919 if not git_footers.get_footer_change_id(change_desc.description):
2920 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002921 change_desc.set_description(
2922 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002923 if options.reviewers or options.tbrs or options.add_owners_to:
2924 change_desc.update_reviewers(options.reviewers, options.tbrs,
2925 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002926 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002927 # For no-squash mode, we assume the remote called "origin" is the one we
2928 # want. It is not worthwhile to support different workflows for
2929 # no-squash mode.
2930 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002931 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2932
2933 assert change_desc
2934 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2935 ref_to_push)]).splitlines()
2936 if len(commits) > 1:
2937 print('WARNING: This will upload %d commits. Run the following command '
2938 'to see which commits will be uploaded: ' % len(commits))
2939 print('git log %s..%s' % (parent, ref_to_push))
2940 print('You can also use `git squash-branch` to squash these into a '
2941 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002942 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002943
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002944 if options.reviewers or options.tbrs or options.add_owners_to:
2945 change_desc.update_reviewers(options.reviewers, options.tbrs,
2946 options.add_owners_to, change)
2947
2948 if options.send_mail:
2949 if not change_desc.get_reviewers():
2950 DieWithError('Must specify reviewers to send email.', change_desc)
2951
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002952 # Extra options that can be specified at push time. Doc:
2953 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002954 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002955 if change_desc.get_reviewers(tbr_only=True):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002956 print('Adding self-LGTM (Code-Review +1) because of TBRs.')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002957 refspec_opts.append('l=Code-Review+1')
tandrii99a72f22016-08-17 14:33:24 -07002958
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002959
2960 # TODO(tandrii): options.message should be posted as a comment
2961 # if --send-email is set on non-initial upload as Rietveld used to do it.
2962
Aaron Gable9b713dd2016-12-14 16:04:21 -08002963 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002964 if not re.match(r'^[\w ]+$', title):
2965 title = re.sub(r'[^\w ]', '', title)
2966 if not automatic_title:
2967 print('WARNING: Patchset title may only contain alphanumeric chars '
2968 'and spaces. You can edit it in the UI. '
2969 'See https://crbug.com/663787.\n'
2970 'Cleaned up title: %s' % title)
2971 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2972 # reverse on its side.
2973 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002974
Aaron Gable6dadfbf2017-05-09 14:27:58 -07002975 # Never notify now because no one is on the review. Notify when we add
2976 # reviewers and CCs below.
2977 refspec_opts.append('notify=NONE')
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002978
agablec6787972016-09-09 16:13:34 -07002979 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07002980 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07002981
rmistry9eadede2016-09-19 11:22:43 -07002982 if options.topic:
2983 # Documentation on Gerrit topics is here:
2984 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002985 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07002986
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002987 refspec_suffix = ''
2988 if refspec_opts:
2989 refspec_suffix = '%' + ','.join(refspec_opts)
2990 assert ' ' not in refspec_suffix, (
2991 'spaces not allowed in refspec: "%s"' % refspec_suffix)
2992 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
2993
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002994 try:
2995 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002996 ['git', 'push', self.GetRemoteUrl(), refspec],
2997 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01002998 # Flush after every line: useful for seeing progress when running as
2999 # recipe.
3000 filter_fn=lambda _: sys.stdout.flush())
3001 except subprocess2.CalledProcessError:
3002 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003003 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003004 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003005 'credential problems:\n'
3006 ' git cl creds-check\n',
3007 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003008
3009 if options.squash:
3010 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3011 change_numbers = [m.group(1)
3012 for m in map(regex.match, push_stdout.splitlines())
3013 if m]
3014 if len(change_numbers) != 1:
3015 DieWithError(
3016 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003017 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003018 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003019 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003020
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003021 reviewers = sorted(change_desc.get_reviewers())
3022
tandrii88189772016-09-29 04:29:57 -07003023 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003024 if not options.private:
3025 cc = self.GetCCList().split(',')
3026 else:
3027 cc = []
tandrii88189772016-09-29 04:29:57 -07003028 if options.cc:
3029 cc.extend(options.cc)
3030 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003031 if change_desc.get_cced():
3032 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003033
3034 gerrit_util.AddReviewers(
3035 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3036 notify=bool(options.send_mail))
3037
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003038 return 0
3039
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003040 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3041 change_desc):
3042 """Computes parent of the generated commit to be uploaded to Gerrit.
3043
3044 Returns revision or a ref name.
3045 """
3046 if custom_cl_base:
3047 # Try to avoid creating additional unintended CLs when uploading, unless
3048 # user wants to take this risk.
3049 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3050 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3051 local_ref_of_target_remote])
3052 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003053 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003054 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3055 'If you proceed with upload, more than 1 CL may be created by '
3056 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3057 'If you are certain that specified base `%s` has already been '
3058 'uploaded to Gerrit as another CL, you may proceed.\n' %
3059 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3060 if not force:
3061 confirm_or_exit(
3062 'Do you take responsibility for cleaning up potential mess '
3063 'resulting from proceeding with upload?',
3064 action='upload')
3065 return custom_cl_base
3066
Aaron Gablef97e33d2017-03-30 15:44:27 -07003067 if remote != '.':
3068 return self.GetCommonAncestorWithUpstream()
3069
3070 # If our upstream branch is local, we base our squashed commit on its
3071 # squashed version.
3072 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3073
Aaron Gablef97e33d2017-03-30 15:44:27 -07003074 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003075 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003076
3077 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003078 # TODO(tandrii): consider checking parent change in Gerrit and using its
3079 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3080 # the tree hash of the parent branch. The upside is less likely bogus
3081 # requests to reupload parent change just because it's uploadhash is
3082 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003083 parent = RunGit(['config',
3084 'branch.%s.gerritsquashhash' % upstream_branch_name],
3085 error_ok=True).strip()
3086 # Verify that the upstream branch has been uploaded too, otherwise
3087 # Gerrit will create additional CLs when uploading.
3088 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3089 RunGitSilent(['rev-parse', parent + ':'])):
3090 DieWithError(
3091 '\nUpload upstream branch %s first.\n'
3092 'It is likely that this branch has been rebased since its last '
3093 'upload, so you just need to upload it again.\n'
3094 '(If you uploaded it with --no-squash, then branch dependencies '
3095 'are not supported, and you should reupload with --squash.)'
3096 % upstream_branch_name,
3097 change_desc)
3098 return parent
3099
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003100 def _AddChangeIdToCommitMessage(self, options, args):
3101 """Re-commits using the current message, assumes the commit hook is in
3102 place.
3103 """
3104 log_desc = options.message or CreateDescriptionFromLog(args)
3105 git_command = ['commit', '--amend', '-m', log_desc]
3106 RunGit(git_command)
3107 new_log_desc = CreateDescriptionFromLog(args)
3108 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003109 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003110 return new_log_desc
3111 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003112 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003113
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003114 def SetCQState(self, new_state):
3115 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003116 vote_map = {
3117 _CQState.NONE: 0,
3118 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003119 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003120 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003121 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3122 if new_state == _CQState.DRY_RUN:
3123 # Don't spam everybody reviewer/owner.
3124 kwargs['notify'] = 'NONE'
3125 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003126
tandriie113dfd2016-10-11 10:20:12 -07003127 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003128 try:
3129 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003130 except GerritChangeNotExists:
3131 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003132
3133 if data['status'] in ('ABANDONED', 'MERGED'):
3134 return 'CL %s is closed' % self.GetIssue()
3135
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003136 def GetTryJobProperties(self, patchset=None):
3137 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003138 data = self._GetChangeDetail(['ALL_REVISIONS'])
3139 patchset = int(patchset or self.GetPatchset())
3140 assert patchset
3141 revision_data = None # Pylint wants it to be defined.
3142 for revision_data in data['revisions'].itervalues():
3143 if int(revision_data['_number']) == patchset:
3144 break
3145 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003146 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003147 (patchset, self.GetIssue()))
3148 return {
3149 'patch_issue': self.GetIssue(),
3150 'patch_set': patchset or self.GetPatchset(),
3151 'patch_project': data['project'],
3152 'patch_storage': 'gerrit',
3153 'patch_ref': revision_data['fetch']['http']['ref'],
3154 'patch_repository_url': revision_data['fetch']['http']['url'],
3155 'patch_gerrit_url': self.GetCodereviewServer(),
3156 }
tandriie113dfd2016-10-11 10:20:12 -07003157
tandriide281ae2016-10-12 06:02:30 -07003158 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003159 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003160
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003161
3162_CODEREVIEW_IMPLEMENTATIONS = {
3163 'rietveld': _RietveldChangelistImpl,
3164 'gerrit': _GerritChangelistImpl,
3165}
3166
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003167
iannuccie53c9352016-08-17 14:40:40 -07003168def _add_codereview_issue_select_options(parser, extra=""):
3169 _add_codereview_select_options(parser)
3170
3171 text = ('Operate on this issue number instead of the current branch\'s '
3172 'implicit issue.')
3173 if extra:
3174 text += ' '+extra
3175 parser.add_option('-i', '--issue', type=int, help=text)
3176
3177
3178def _process_codereview_issue_select_options(parser, options):
3179 _process_codereview_select_options(parser, options)
3180 if options.issue is not None and not options.forced_codereview:
3181 parser.error('--issue must be specified with either --rietveld or --gerrit')
3182
3183
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003184def _add_codereview_select_options(parser):
3185 """Appends --gerrit and --rietveld options to force specific codereview."""
3186 parser.codereview_group = optparse.OptionGroup(
3187 parser, 'EXPERIMENTAL! Codereview override options')
3188 parser.add_option_group(parser.codereview_group)
3189 parser.codereview_group.add_option(
3190 '--gerrit', action='store_true',
3191 help='Force the use of Gerrit for codereview')
3192 parser.codereview_group.add_option(
3193 '--rietveld', action='store_true',
3194 help='Force the use of Rietveld for codereview')
3195
3196
3197def _process_codereview_select_options(parser, options):
3198 if options.gerrit and options.rietveld:
3199 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3200 options.forced_codereview = None
3201 if options.gerrit:
3202 options.forced_codereview = 'gerrit'
3203 elif options.rietveld:
3204 options.forced_codereview = 'rietveld'
3205
3206
tandriif9aefb72016-07-01 09:06:51 -07003207def _get_bug_line_values(default_project, bugs):
3208 """Given default_project and comma separated list of bugs, yields bug line
3209 values.
3210
3211 Each bug can be either:
3212 * a number, which is combined with default_project
3213 * string, which is left as is.
3214
3215 This function may produce more than one line, because bugdroid expects one
3216 project per line.
3217
3218 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3219 ['v8:123', 'chromium:789']
3220 """
3221 default_bugs = []
3222 others = []
3223 for bug in bugs.split(','):
3224 bug = bug.strip()
3225 if bug:
3226 try:
3227 default_bugs.append(int(bug))
3228 except ValueError:
3229 others.append(bug)
3230
3231 if default_bugs:
3232 default_bugs = ','.join(map(str, default_bugs))
3233 if default_project:
3234 yield '%s:%s' % (default_project, default_bugs)
3235 else:
3236 yield default_bugs
3237 for other in sorted(others):
3238 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3239 yield other
3240
3241
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003242class ChangeDescription(object):
3243 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003244 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003245 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003246 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003247 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003248
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003249 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003250 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003251
agable@chromium.org42c20792013-09-12 17:34:49 +00003252 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003253 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003254 return '\n'.join(self._description_lines)
3255
3256 def set_description(self, desc):
3257 if isinstance(desc, basestring):
3258 lines = desc.splitlines()
3259 else:
3260 lines = [line.rstrip() for line in desc]
3261 while lines and not lines[0]:
3262 lines.pop(0)
3263 while lines and not lines[-1]:
3264 lines.pop(-1)
3265 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003266
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003267 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3268 """Rewrites the R=/TBR= line(s) as a single line each.
3269
3270 Args:
3271 reviewers (list(str)) - list of additional emails to use for reviewers.
3272 tbrs (list(str)) - list of additional emails to use for TBRs.
3273 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3274 the change that are missing OWNER coverage. If this is not None, you
3275 must also pass a value for `change`.
3276 change (Change) - The Change that should be used for OWNERS lookups.
3277 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003278 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003279 assert isinstance(tbrs, list), tbrs
3280
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003281 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003282 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003283
3284 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003285 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003286
3287 reviewers = set(reviewers)
3288 tbrs = set(tbrs)
3289 LOOKUP = {
3290 'TBR': tbrs,
3291 'R': reviewers,
3292 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003293
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003294 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003295 regexp = re.compile(self.R_LINE)
3296 matches = [regexp.match(line) for line in self._description_lines]
3297 new_desc = [l for i, l in enumerate(self._description_lines)
3298 if not matches[i]]
3299 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003300
agable@chromium.org42c20792013-09-12 17:34:49 +00003301 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003302
3303 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003304 for match in matches:
3305 if not match:
3306 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003307 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3308
3309 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003310 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003311 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003312 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003313 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003314 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003315 LOOKUP[add_owners_to].update(
3316 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003317
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003318 # If any folks ended up in both groups, remove them from tbrs.
3319 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003320
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003321 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3322 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003323
3324 # Put the new lines in the description where the old first R= line was.
3325 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3326 if 0 <= line_loc < len(self._description_lines):
3327 if new_tbr_line:
3328 self._description_lines.insert(line_loc, new_tbr_line)
3329 if new_r_line:
3330 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003331 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003332 if new_r_line:
3333 self.append_footer(new_r_line)
3334 if new_tbr_line:
3335 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003336
Aaron Gable3a16ed12017-03-23 10:51:55 -07003337 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003338 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003339 self.set_description([
3340 '# Enter a description of the change.',
3341 '# This will be displayed on the codereview site.',
3342 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003343 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003344 '--------------------',
3345 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003346
agable@chromium.org42c20792013-09-12 17:34:49 +00003347 regexp = re.compile(self.BUG_LINE)
3348 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003349 prefix = settings.GetBugPrefix()
3350 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003351 if git_footer:
3352 self.append_footer('Bug: %s' % ', '.join(values))
3353 else:
3354 for value in values:
3355 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003356
agable@chromium.org42c20792013-09-12 17:34:49 +00003357 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003358 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003359 if not content:
3360 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003361 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003362
3363 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003364 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3365 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003366 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003367 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003368
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003369 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003370 """Adds a footer line to the description.
3371
3372 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3373 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3374 that Gerrit footers are always at the end.
3375 """
3376 parsed_footer_line = git_footers.parse_footer(line)
3377 if parsed_footer_line:
3378 # Line is a gerrit footer in the form: Footer-Key: any value.
3379 # Thus, must be appended observing Gerrit footer rules.
3380 self.set_description(
3381 git_footers.add_footer(self.description,
3382 key=parsed_footer_line[0],
3383 value=parsed_footer_line[1]))
3384 return
3385
3386 if not self._description_lines:
3387 self._description_lines.append(line)
3388 return
3389
3390 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3391 if gerrit_footers:
3392 # git_footers.split_footers ensures that there is an empty line before
3393 # actual (gerrit) footers, if any. We have to keep it that way.
3394 assert top_lines and top_lines[-1] == ''
3395 top_lines, separator = top_lines[:-1], top_lines[-1:]
3396 else:
3397 separator = [] # No need for separator if there are no gerrit_footers.
3398
3399 prev_line = top_lines[-1] if top_lines else ''
3400 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3401 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3402 top_lines.append('')
3403 top_lines.append(line)
3404 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003405
tandrii99a72f22016-08-17 14:33:24 -07003406 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003407 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003408 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003409 reviewers = [match.group(2).strip()
3410 for match in matches
3411 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003412 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003413
bradnelsond975b302016-10-23 12:20:23 -07003414 def get_cced(self):
3415 """Retrieves the list of reviewers."""
3416 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3417 cced = [match.group(2).strip() for match in matches if match]
3418 return cleanup_list(cced)
3419
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003420 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3421 """Updates this commit description given the parent.
3422
3423 This is essentially what Gnumbd used to do.
3424 Consult https://goo.gl/WMmpDe for more details.
3425 """
3426 assert parent_msg # No, orphan branch creation isn't supported.
3427 assert parent_hash
3428 assert dest_ref
3429 parent_footer_map = git_footers.parse_footers(parent_msg)
3430 # This will also happily parse svn-position, which GnumbD is no longer
3431 # supporting. While we'd generate correct footers, the verifier plugin
3432 # installed in Gerrit will block such commit (ie git push below will fail).
3433 parent_position = git_footers.get_position(parent_footer_map)
3434
3435 # Cherry-picks may have last line obscuring their prior footers,
3436 # from git_footers perspective. This is also what Gnumbd did.
3437 cp_line = None
3438 if (self._description_lines and
3439 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3440 cp_line = self._description_lines.pop()
3441
3442 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3443
3444 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3445 # user interference with actual footers we'd insert below.
3446 for i, (k, v) in enumerate(parsed_footers):
3447 if k.startswith('Cr-'):
3448 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3449
3450 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003451 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003452 if parent_position[0] == dest_ref:
3453 # Same branch as parent.
3454 number = int(parent_position[1]) + 1
3455 else:
3456 number = 1 # New branch, and extra lineage.
3457 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3458 int(parent_position[1])))
3459
3460 parsed_footers.append(('Cr-Commit-Position',
3461 '%s@{#%d}' % (dest_ref, number)))
3462 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3463
3464 self._description_lines = top_lines
3465 if cp_line:
3466 self._description_lines.append(cp_line)
3467 if self._description_lines[-1] != '':
3468 self._description_lines.append('') # Ensure footer separator.
3469 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3470
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003471
Aaron Gablea1bab272017-04-11 16:38:18 -07003472def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003473 """Retrieves the reviewers that approved a CL from the issue properties with
3474 messages.
3475
3476 Note that the list may contain reviewers that are not committer, thus are not
3477 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003478
3479 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003480 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003481 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003482 return sorted(
3483 set(
3484 message['sender']
3485 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003486 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003487 )
3488 )
3489
3490
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003491def FindCodereviewSettingsFile(filename='codereview.settings'):
3492 """Finds the given file starting in the cwd and going up.
3493
3494 Only looks up to the top of the repository unless an
3495 'inherit-review-settings-ok' file exists in the root of the repository.
3496 """
3497 inherit_ok_file = 'inherit-review-settings-ok'
3498 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003499 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003500 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3501 root = '/'
3502 while True:
3503 if filename in os.listdir(cwd):
3504 if os.path.isfile(os.path.join(cwd, filename)):
3505 return open(os.path.join(cwd, filename))
3506 if cwd == root:
3507 break
3508 cwd = os.path.dirname(cwd)
3509
3510
3511def LoadCodereviewSettingsFromFile(fileobj):
3512 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003513 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003514
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003515 def SetProperty(name, setting, unset_error_ok=False):
3516 fullname = 'rietveld.' + name
3517 if setting in keyvals:
3518 RunGit(['config', fullname, keyvals[setting]])
3519 else:
3520 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3521
tandrii48df5812016-10-17 03:55:37 -07003522 if not keyvals.get('GERRIT_HOST', False):
3523 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003524 # Only server setting is required. Other settings can be absent.
3525 # In that case, we ignore errors raised during option deletion attempt.
3526 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003527 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003528 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3529 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003530 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003531 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3532 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003533 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003534 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3535 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003536
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003537 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003538 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003539
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003540 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003541 RunGit(['config', 'gerrit.squash-uploads',
3542 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003543
tandrii@chromium.org28253532016-04-14 13:46:56 +00003544 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003545 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003546 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3547
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003548 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003549 # should be of the form
3550 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3551 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003552 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3553 keyvals['ORIGIN_URL_CONFIG']])
3554
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003555
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003556def urlretrieve(source, destination):
3557 """urllib is broken for SSL connections via a proxy therefore we
3558 can't use urllib.urlretrieve()."""
3559 with open(destination, 'w') as f:
3560 f.write(urllib2.urlopen(source).read())
3561
3562
ukai@chromium.org712d6102013-11-27 00:52:58 +00003563def hasSheBang(fname):
3564 """Checks fname is a #! script."""
3565 with open(fname) as f:
3566 return f.read(2).startswith('#!')
3567
3568
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003569# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3570def DownloadHooks(*args, **kwargs):
3571 pass
3572
3573
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003574def DownloadGerritHook(force):
3575 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003576
3577 Args:
3578 force: True to update hooks. False to install hooks if not present.
3579 """
3580 if not settings.GetIsGerrit():
3581 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003582 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003583 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3584 if not os.access(dst, os.X_OK):
3585 if os.path.exists(dst):
3586 if not force:
3587 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003588 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003589 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003590 if not hasSheBang(dst):
3591 DieWithError('Not a script: %s\n'
3592 'You need to download from\n%s\n'
3593 'into .git/hooks/commit-msg and '
3594 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003595 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3596 except Exception:
3597 if os.path.exists(dst):
3598 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003599 DieWithError('\nFailed to download hooks.\n'
3600 'You need to download from\n%s\n'
3601 'into .git/hooks/commit-msg and '
3602 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003603
3604
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003605def GetRietveldCodereviewSettingsInteractively():
3606 """Prompt the user for settings."""
3607 server = settings.GetDefaultServerUrl(error_ok=True)
3608 prompt = 'Rietveld server (host[:port])'
3609 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3610 newserver = ask_for_data(prompt + ':')
3611 if not server and not newserver:
3612 newserver = DEFAULT_SERVER
3613 if newserver:
3614 newserver = gclient_utils.UpgradeToHttps(newserver)
3615 if newserver != server:
3616 RunGit(['config', 'rietveld.server', newserver])
3617
3618 def SetProperty(initial, caption, name, is_url):
3619 prompt = caption
3620 if initial:
3621 prompt += ' ("x" to clear) [%s]' % initial
3622 new_val = ask_for_data(prompt + ':')
3623 if new_val == 'x':
3624 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3625 elif new_val:
3626 if is_url:
3627 new_val = gclient_utils.UpgradeToHttps(new_val)
3628 if new_val != initial:
3629 RunGit(['config', 'rietveld.' + name, new_val])
3630
3631 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3632 SetProperty(settings.GetDefaultPrivateFlag(),
3633 'Private flag (rietveld only)', 'private', False)
3634 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3635 'tree-status-url', False)
3636 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3637 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3638 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3639 'run-post-upload-hook', False)
3640
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003641
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003642class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003643 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003644
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003645 _GOOGLESOURCE = 'googlesource.com'
3646
3647 def __init__(self):
3648 # Cached list of [host, identity, source], where source is either
3649 # .gitcookies or .netrc.
3650 self._all_hosts = None
3651
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003652 def ensure_configured_gitcookies(self):
3653 """Runs checks and suggests fixes to make git use .gitcookies from default
3654 path."""
3655 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3656 configured_path = RunGitSilent(
3657 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003658 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003659 if configured_path:
3660 self._ensure_default_gitcookies_path(configured_path, default)
3661 else:
3662 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003663
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003664 @staticmethod
3665 def _ensure_default_gitcookies_path(configured_path, default_path):
3666 assert configured_path
3667 if configured_path == default_path:
3668 print('git is already configured to use your .gitcookies from %s' %
3669 configured_path)
3670 return
3671
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003672 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003673 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3674 (configured_path, default_path))
3675
3676 if not os.path.exists(configured_path):
3677 print('However, your configured .gitcookies file is missing.')
3678 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3679 action='reconfigure')
3680 RunGit(['config', '--global', 'http.cookiefile', default_path])
3681 return
3682
3683 if os.path.exists(default_path):
3684 print('WARNING: default .gitcookies file already exists %s' %
3685 default_path)
3686 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3687 default_path)
3688
3689 confirm_or_exit('Move existing .gitcookies to default location?',
3690 action='move')
3691 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003692 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003693 print('Moved and reconfigured git to use .gitcookies from %s' %
3694 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003695
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003696 @staticmethod
3697 def _configure_gitcookies_path(default_path):
3698 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3699 if os.path.exists(netrc_path):
3700 print('You seem to be using outdated .netrc for git credentials: %s' %
3701 netrc_path)
3702 print('This tool will guide you through setting up recommended '
3703 '.gitcookies store for git credentials.\n'
3704 '\n'
3705 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3706 ' git config --global --unset http.cookiefile\n'
3707 ' mv %s %s.backup\n\n' % (default_path, default_path))
3708 confirm_or_exit(action='setup .gitcookies')
3709 RunGit(['config', '--global', 'http.cookiefile', default_path])
3710 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003711
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003712 def get_hosts_with_creds(self, include_netrc=False):
3713 if self._all_hosts is None:
3714 a = gerrit_util.CookiesAuthenticator()
3715 self._all_hosts = [
3716 (h, u, s)
3717 for h, u, s in itertools.chain(
3718 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3719 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3720 )
3721 if h.endswith(self._GOOGLESOURCE)
3722 ]
3723
3724 if include_netrc:
3725 return self._all_hosts
3726 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3727
3728 def print_current_creds(self, include_netrc=False):
3729 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3730 if not hosts:
3731 print('No Git/Gerrit credentials found')
3732 return
3733 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3734 header = [('Host', 'User', 'Which file'),
3735 ['=' * l for l in lengths]]
3736 for row in (header + hosts):
3737 print('\t'.join((('%%+%ds' % l) % s)
3738 for l, s in zip(lengths, row)))
3739
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003740 @staticmethod
3741 def _parse_identity(identity):
3742 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3743 username, domain = identity.split('.', 1)
3744 if username.startswith('git-'):
3745 username = username[len('git-'):]
3746 return username, domain
3747
3748 def _get_usernames_of_domain(self, domain):
3749 """Returns list of usernames referenced by .gitcookies in a given domain."""
3750 identities_by_domain = {}
3751 for _, identity, _ in self.get_hosts_with_creds():
3752 username, domain = self._parse_identity(identity)
3753 identities_by_domain.setdefault(domain, []).append(username)
3754 return identities_by_domain.get(domain)
3755
3756 def _canonical_git_googlesource_host(self, host):
3757 """Normalizes Gerrit hosts (with '-review') to Git host."""
3758 assert host.endswith(self._GOOGLESOURCE)
3759 # Prefix doesn't include '.' at the end.
3760 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3761 if prefix.endswith('-review'):
3762 prefix = prefix[:-len('-review')]
3763 return prefix + '.' + self._GOOGLESOURCE
3764
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003765 def _canonical_gerrit_googlesource_host(self, host):
3766 git_host = self._canonical_git_googlesource_host(host)
3767 prefix = git_host.split('.', 1)[0]
3768 return prefix + '-review.' + self._GOOGLESOURCE
3769
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003770 def has_generic_host(self):
3771 """Returns whether generic .googlesource.com has been configured.
3772
3773 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3774 """
3775 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3776 if host == '.' + self._GOOGLESOURCE:
3777 return True
3778 return False
3779
3780 def _get_git_gerrit_identity_pairs(self):
3781 """Returns map from canonic host to pair of identities (Git, Gerrit).
3782
3783 One of identities might be None, meaning not configured.
3784 """
3785 host_to_identity_pairs = {}
3786 for host, identity, _ in self.get_hosts_with_creds():
3787 canonical = self._canonical_git_googlesource_host(host)
3788 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3789 idx = 0 if canonical == host else 1
3790 pair[idx] = identity
3791 return host_to_identity_pairs
3792
3793 def get_partially_configured_hosts(self):
3794 return set(
3795 host for host, identities_pair in
3796 self._get_git_gerrit_identity_pairs().iteritems()
3797 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3798
3799 def get_conflicting_hosts(self):
3800 return set(
3801 host for host, (i1, i2) in
3802 self._get_git_gerrit_identity_pairs().iteritems()
3803 if None not in (i1, i2) and i1 != i2)
3804
3805 def get_duplicated_hosts(self):
3806 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3807 return set(host for host, count in counters.iteritems() if count > 1)
3808
3809 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3810 'chromium.googlesource.com': 'chromium.org',
3811 'chrome-internal.googlesource.com': 'google.com',
3812 }
3813
3814 def get_hosts_with_wrong_identities(self):
3815 """Finds hosts which **likely** reference wrong identities.
3816
3817 Note: skips hosts which have conflicting identities for Git and Gerrit.
3818 """
3819 hosts = set()
3820 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3821 pair = self._get_git_gerrit_identity_pairs().get(host)
3822 if pair and pair[0] == pair[1]:
3823 _, domain = self._parse_identity(pair[0])
3824 if domain != expected:
3825 hosts.add(host)
3826 return hosts
3827
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003828 @staticmethod
3829 def print_hosts(hosts, extra_column_func=None):
3830 hosts = sorted(hosts)
3831 assert hosts
3832 if extra_column_func is None:
3833 extras = [''] * len(hosts)
3834 else:
3835 extras = [extra_column_func(host) for host in hosts]
3836 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3837 for he in zip(hosts, extras):
3838 print(tmpl % he)
3839 print()
3840
3841 def find_and_report_problems(self):
3842 """Returns True if there was at least one problem, else False."""
3843 problems = [False]
3844 def add_problem():
3845 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003846 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003847 problems[0] = True
3848
3849 if self.has_generic_host():
3850 add_problem()
3851 print(' .googlesource.com record detected\n'
3852 ' Chrome Infrastructure team recommends to list full host names '
3853 'explicitly.\n')
3854
3855 dups = self.get_duplicated_hosts()
3856 if dups:
3857 add_problem()
3858 print(' The following hosts were defined twice:\n')
3859 self.print_hosts(dups)
3860
3861 partial = self.get_partially_configured_hosts()
3862 if partial:
3863 add_problem()
3864 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3865 'These hosts are missing:')
3866 self.print_hosts(partial)
3867
3868 conflicting = self.get_conflicting_hosts()
3869 if conflicting:
3870 add_problem()
3871 print(' The following Git hosts have differing credentials from their '
3872 'Gerrit counterparts:\n')
3873 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3874 tuple(self._get_git_gerrit_identity_pairs()[host]))
3875
3876 wrong = self.get_hosts_with_wrong_identities()
3877 if wrong:
3878 add_problem()
3879 print(' These hosts likely use wrong identity:\n')
3880 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3881 (self._get_git_gerrit_identity_pairs()[host][0],
3882 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3883 return problems[0]
3884
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003885
3886def CMDcreds_check(parser, args):
3887 """Checks credentials and suggests changes."""
3888 _, _ = parser.parse_args(args)
3889
3890 if gerrit_util.GceAuthenticator.is_gce():
3891 DieWithError('this command is not designed for GCE, are you on a bot?')
3892
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003893 checker = _GitCookiesChecker()
3894 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003895
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003896 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003897 checker.print_current_creds(include_netrc=True)
3898
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003899 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003900 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003901 return 0
3902 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003903
3904
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003905@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003906def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003907 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003908
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003909 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07003910 # TODO(tandrii): remove this once we switch to Gerrit.
3911 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003912 parser.add_option('--activate-update', action='store_true',
3913 help='activate auto-updating [rietveld] section in '
3914 '.git/config')
3915 parser.add_option('--deactivate-update', action='store_true',
3916 help='deactivate auto-updating [rietveld] section in '
3917 '.git/config')
3918 options, args = parser.parse_args(args)
3919
3920 if options.deactivate_update:
3921 RunGit(['config', 'rietveld.autoupdate', 'false'])
3922 return
3923
3924 if options.activate_update:
3925 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3926 return
3927
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003928 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003929 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003930 return 0
3931
3932 url = args[0]
3933 if not url.endswith('codereview.settings'):
3934 url = os.path.join(url, 'codereview.settings')
3935
3936 # Load code review settings and download hooks (if available).
3937 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3938 return 0
3939
3940
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003941def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003942 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003943 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3944 branch = ShortBranchName(branchref)
3945 _, args = parser.parse_args(args)
3946 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003947 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003948 return RunGit(['config', 'branch.%s.base-url' % branch],
3949 error_ok=False).strip()
3950 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003951 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003952 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3953 error_ok=False).strip()
3954
3955
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003956def color_for_status(status):
3957 """Maps a Changelist status to color, for CMDstatus and other tools."""
3958 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07003959 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003960 'waiting': Fore.BLUE,
3961 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07003962 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003963 'lgtm': Fore.GREEN,
3964 'commit': Fore.MAGENTA,
3965 'closed': Fore.CYAN,
3966 'error': Fore.WHITE,
3967 }.get(status, Fore.WHITE)
3968
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003969
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003970def get_cl_statuses(changes, fine_grained, max_processes=None):
3971 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003972
3973 If fine_grained is true, this will fetch CL statuses from the server.
3974 Otherwise, simply indicate if there's a matching url for the given branches.
3975
3976 If max_processes is specified, it is used as the maximum number of processes
3977 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3978 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003979
3980 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003981 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003982 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003983 upload.verbosity = 0
3984
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003985 if not changes:
3986 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003987
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003988 if not fine_grained:
3989 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07003990 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003991 for cl in changes:
3992 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01003993 return
3994
3995 # First, sort out authentication issues.
3996 logging.debug('ensuring credentials exist')
3997 for cl in changes:
3998 cl.EnsureAuthenticated(force=False, refresh=True)
3999
4000 def fetch(cl):
4001 try:
4002 return (cl, cl.GetStatus())
4003 except:
4004 # See http://crbug.com/629863.
4005 logging.exception('failed to fetch status for %s:', cl)
4006 raise
4007
4008 threads_count = len(changes)
4009 if max_processes:
4010 threads_count = max(1, min(threads_count, max_processes))
4011 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4012
4013 pool = ThreadPool(threads_count)
4014 fetched_cls = set()
4015 try:
4016 it = pool.imap_unordered(fetch, changes).__iter__()
4017 while True:
4018 try:
4019 cl, status = it.next(timeout=5)
4020 except multiprocessing.TimeoutError:
4021 break
4022 fetched_cls.add(cl)
4023 yield cl, status
4024 finally:
4025 pool.close()
4026
4027 # Add any branches that failed to fetch.
4028 for cl in set(changes) - fetched_cls:
4029 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004030
rmistry@google.com2dd99862015-06-22 12:22:18 +00004031
4032def upload_branch_deps(cl, args):
4033 """Uploads CLs of local branches that are dependents of the current branch.
4034
4035 If the local branch dependency tree looks like:
4036 test1 -> test2.1 -> test3.1
4037 -> test3.2
4038 -> test2.2 -> test3.3
4039
4040 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4041 run on the dependent branches in this order:
4042 test2.1, test3.1, test3.2, test2.2, test3.3
4043
4044 Note: This function does not rebase your local dependent branches. Use it when
4045 you make a change to the parent branch that will not conflict with its
4046 dependent branches, and you would like their dependencies updated in
4047 Rietveld.
4048 """
4049 if git_common.is_dirty_git_tree('upload-branch-deps'):
4050 return 1
4051
4052 root_branch = cl.GetBranch()
4053 if root_branch is None:
4054 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4055 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004056 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004057 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4058 'patchset dependencies without an uploaded CL.')
4059
4060 branches = RunGit(['for-each-ref',
4061 '--format=%(refname:short) %(upstream:short)',
4062 'refs/heads'])
4063 if not branches:
4064 print('No local branches found.')
4065 return 0
4066
4067 # Create a dictionary of all local branches to the branches that are dependent
4068 # on it.
4069 tracked_to_dependents = collections.defaultdict(list)
4070 for b in branches.splitlines():
4071 tokens = b.split()
4072 if len(tokens) == 2:
4073 branch_name, tracked = tokens
4074 tracked_to_dependents[tracked].append(branch_name)
4075
vapiera7fbd5a2016-06-16 09:17:49 -07004076 print()
4077 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004078 dependents = []
4079 def traverse_dependents_preorder(branch, padding=''):
4080 dependents_to_process = tracked_to_dependents.get(branch, [])
4081 padding += ' '
4082 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004083 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004084 dependents.append(dependent)
4085 traverse_dependents_preorder(dependent, padding)
4086 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004087 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004088
4089 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004090 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004091 return 0
4092
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004093 confirm_or_exit('This command will checkout all dependent branches and run '
4094 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004095
andybons@chromium.org962f9462016-02-03 20:00:42 +00004096 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004097 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004098 args.extend(['-t', 'Updated patchset dependency'])
4099
rmistry@google.com2dd99862015-06-22 12:22:18 +00004100 # Record all dependents that failed to upload.
4101 failures = {}
4102 # Go through all dependents, checkout the branch and upload.
4103 try:
4104 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004105 print()
4106 print('--------------------------------------')
4107 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004108 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004109 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004110 try:
4111 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004112 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004113 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004114 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004115 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004116 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004117 finally:
4118 # Swap back to the original root branch.
4119 RunGit(['checkout', '-q', root_branch])
4120
vapiera7fbd5a2016-06-16 09:17:49 -07004121 print()
4122 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004123 for dependent_branch in dependents:
4124 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004125 print(' %s : %s' % (dependent_branch, upload_status))
4126 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004127
4128 return 0
4129
4130
kmarshall3bff56b2016-06-06 18:31:47 -07004131def CMDarchive(parser, args):
4132 """Archives and deletes branches associated with closed changelists."""
4133 parser.add_option(
4134 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004135 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004136 parser.add_option(
4137 '-f', '--force', action='store_true',
4138 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004139 parser.add_option(
4140 '-d', '--dry-run', action='store_true',
4141 help='Skip the branch tagging and removal steps.')
4142 parser.add_option(
4143 '-t', '--notags', action='store_true',
4144 help='Do not tag archived branches. '
4145 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004146
4147 auth.add_auth_options(parser)
4148 options, args = parser.parse_args(args)
4149 if args:
4150 parser.error('Unsupported args: %s' % ' '.join(args))
4151 auth_config = auth.extract_auth_config_from_options(options)
4152
4153 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4154 if not branches:
4155 return 0
4156
vapiera7fbd5a2016-06-16 09:17:49 -07004157 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004158 changes = [Changelist(branchref=b, auth_config=auth_config)
4159 for b in branches.splitlines()]
4160 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4161 statuses = get_cl_statuses(changes,
4162 fine_grained=True,
4163 max_processes=options.maxjobs)
4164 proposal = [(cl.GetBranch(),
4165 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4166 for cl, status in statuses
4167 if status == 'closed']
4168 proposal.sort()
4169
4170 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004171 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004172 return 0
4173
4174 current_branch = GetCurrentBranch()
4175
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004177 if options.notags:
4178 for next_item in proposal:
4179 print(' ' + next_item[0])
4180 else:
4181 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4182 for next_item in proposal:
4183 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004184
kmarshall9249e012016-08-23 12:02:16 -07004185 # Quit now on precondition failure or if instructed by the user, either
4186 # via an interactive prompt or by command line flags.
4187 if options.dry_run:
4188 print('\nNo changes were made (dry run).\n')
4189 return 0
4190 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004191 print('You are currently on a branch \'%s\' which is associated with a '
4192 'closed codereview issue, so archive cannot proceed. Please '
4193 'checkout another branch and run this command again.' %
4194 current_branch)
4195 return 1
kmarshall9249e012016-08-23 12:02:16 -07004196 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004197 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4198 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004199 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004200 return 1
4201
4202 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004203 if not options.notags:
4204 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004205 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004206
vapiera7fbd5a2016-06-16 09:17:49 -07004207 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004208
4209 return 0
4210
4211
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004212def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004213 """Show status of changelists.
4214
4215 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004216 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004217 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004218 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004219 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004220 - Magenta in the commit queue
4221 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004222 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004223
4224 Also see 'git cl comments'.
4225 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004226 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004227 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004228 parser.add_option('-f', '--fast', action='store_true',
4229 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004230 parser.add_option(
4231 '-j', '--maxjobs', action='store', type=int,
4232 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004233
4234 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004235 _add_codereview_issue_select_options(
4236 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004237 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004238 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004239 if args:
4240 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004241 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004242
iannuccie53c9352016-08-17 14:40:40 -07004243 if options.issue is not None and not options.field:
4244 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004245
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004246 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004247 cl = Changelist(auth_config=auth_config, issue=options.issue,
4248 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004249 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004250 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004251 elif options.field == 'id':
4252 issueid = cl.GetIssue()
4253 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004254 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004255 elif options.field == 'patch':
4256 patchset = cl.GetPatchset()
4257 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004258 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004259 elif options.field == 'status':
4260 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004261 elif options.field == 'url':
4262 url = cl.GetIssueURL()
4263 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004264 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004265 return 0
4266
4267 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4268 if not branches:
4269 print('No local branch found.')
4270 return 0
4271
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004272 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004273 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004274 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004275 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004276 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004277 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004278 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004279
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004280 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004281 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4282 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4283 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004284 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004285 c, status = output.next()
4286 branch_statuses[c.GetBranch()] = status
4287 status = branch_statuses.pop(branch)
4288 url = cl.GetIssueURL()
4289 if url and (not status or status == 'error'):
4290 # The issue probably doesn't exist anymore.
4291 url += ' (broken)'
4292
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004293 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004294 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004295 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004296 color = ''
4297 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004298 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004299 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004300 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004301 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004302
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004303
4304 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004305 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004306 print('Current branch: %s' % branch)
4307 for cl in changes:
4308 if cl.GetBranch() == branch:
4309 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004310 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004311 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004312 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004313 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004314 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004315 print('Issue description:')
4316 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004317 return 0
4318
4319
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004320def colorize_CMDstatus_doc():
4321 """To be called once in main() to add colors to git cl status help."""
4322 colors = [i for i in dir(Fore) if i[0].isupper()]
4323
4324 def colorize_line(line):
4325 for color in colors:
4326 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004327 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004328 indent = len(line) - len(line.lstrip(' ')) + 1
4329 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4330 return line
4331
4332 lines = CMDstatus.__doc__.splitlines()
4333 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4334
4335
phajdan.jre328cf92016-08-22 04:12:17 -07004336def write_json(path, contents):
4337 with open(path, 'w') as f:
4338 json.dump(contents, f)
4339
4340
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004341@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004342def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004343 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004344
4345 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004346 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004347 parser.add_option('-r', '--reverse', action='store_true',
4348 help='Lookup the branch(es) for the specified issues. If '
4349 'no issues are specified, all branches with mapped '
4350 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07004351 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004352 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004353 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004354 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004355
dnj@chromium.org406c4402015-03-03 17:22:28 +00004356 if options.reverse:
4357 branches = RunGit(['for-each-ref', 'refs/heads',
4358 '--format=%(refname:short)']).splitlines()
4359
4360 # Reverse issue lookup.
4361 issue_branch_map = {}
4362 for branch in branches:
4363 cl = Changelist(branchref=branch)
4364 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4365 if not args:
4366 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004367 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004368 for issue in args:
4369 if not issue:
4370 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004371 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004372 print('Branch for issue number %s: %s' % (
4373 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004374 if options.json:
4375 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004376 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004377 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004378 if len(args) > 0:
4379 try:
4380 issue = int(args[0])
4381 except ValueError:
4382 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00004383 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00004384 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07004385 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07004386 if options.json:
4387 write_json(options.json, {
4388 'issue': cl.GetIssue(),
4389 'issue_url': cl.GetIssueURL(),
4390 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004391 return 0
4392
4393
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004394def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004395 """Shows or posts review comments for any changelist."""
4396 parser.add_option('-a', '--add-comment', dest='comment',
4397 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004398 parser.add_option('-i', '--issue', dest='issue',
4399 help='review issue id (defaults to current issue). '
4400 'If given, requires --rietveld or --gerrit')
smut@google.comc85ac942015-09-15 16:34:43 +00004401 parser.add_option('-j', '--json-file',
4402 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004403 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004404 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004405 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004406 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004407 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004408
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004409 issue = None
4410 if options.issue:
4411 try:
4412 issue = int(options.issue)
4413 except ValueError:
4414 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004415 if not options.forced_codereview:
4416 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004417
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004418 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004419 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004420 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004421
4422 if options.comment:
4423 cl.AddComment(options.comment)
4424 return 0
4425
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004426 summary = sorted(cl.GetCommentsSummary(), key=lambda c: c.date)
4427 for comment in summary:
4428 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004429 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004430 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004431 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004432 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004433 color = Fore.MAGENTA
4434 else:
4435 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004436 print('\n%s%s %s%s\n%s' % (
4437 color,
4438 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4439 comment.sender,
4440 Fore.RESET,
4441 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4442
smut@google.comc85ac942015-09-15 16:34:43 +00004443 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004444 def pre_serialize(c):
4445 dct = c.__dict__.copy()
4446 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4447 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004448 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004449 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004450 return 0
4451
4452
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004453@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004454def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004455 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004456 parser.add_option('-d', '--display', action='store_true',
4457 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004458 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004459 help='New description to set for this issue (- for stdin, '
4460 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004461 parser.add_option('-f', '--force', action='store_true',
4462 help='Delete any unpublished Gerrit edits for this issue '
4463 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004464
4465 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004466 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004467 options, args = parser.parse_args(args)
4468 _process_codereview_select_options(parser, options)
4469
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004470 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004471 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004472 target_issue_arg = ParseIssueNumberArgument(args[0],
4473 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004474 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004475 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004476
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004477 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004478
martiniss6eda05f2016-06-30 10:18:35 -07004479 kwargs = {
4480 'auth_config': auth_config,
4481 'codereview': options.forced_codereview,
4482 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004483 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004484 if target_issue_arg:
4485 kwargs['issue'] = target_issue_arg.issue
4486 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004487 if target_issue_arg.codereview and not options.forced_codereview:
4488 detected_codereview_from_url = True
4489 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004490
4491 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004492 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004493 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004494 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004495
4496 if detected_codereview_from_url:
4497 logging.info('canonical issue/change URL: %s (type: %s)\n',
4498 cl.GetIssueURL(), target_issue_arg.codereview)
4499
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004500 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004501
smut@google.com34fb6b12015-07-13 20:03:26 +00004502 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004503 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004504 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004505
4506 if options.new_description:
4507 text = options.new_description
4508 if text == '-':
4509 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004510 elif text == '+':
4511 base_branch = cl.GetCommonAncestorWithUpstream()
4512 change = cl.GetChange(base_branch, None, local_description=True)
4513 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004514
4515 description.set_description(text)
4516 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004517 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004518
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004519 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004520 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004521 return 0
4522
4523
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004524def CreateDescriptionFromLog(args):
4525 """Pulls out the commit log to use as a base for the CL description."""
4526 log_args = []
4527 if len(args) == 1 and not args[0].endswith('.'):
4528 log_args = [args[0] + '..']
4529 elif len(args) == 1 and args[0].endswith('...'):
4530 log_args = [args[0][:-1]]
4531 elif len(args) == 2:
4532 log_args = [args[0] + '..' + args[1]]
4533 else:
4534 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004535 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004536
4537
thestig@chromium.org44202a22014-03-11 19:22:18 +00004538def CMDlint(parser, args):
4539 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004540 parser.add_option('--filter', action='append', metavar='-x,+y',
4541 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004542 auth.add_auth_options(parser)
4543 options, args = parser.parse_args(args)
4544 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004545
4546 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004547 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004548 try:
4549 import cpplint
4550 import cpplint_chromium
4551 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004552 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004553 return 1
4554
4555 # Change the current working directory before calling lint so that it
4556 # shows the correct base.
4557 previous_cwd = os.getcwd()
4558 os.chdir(settings.GetRoot())
4559 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004560 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004561 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4562 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004563 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004564 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004565 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004566
4567 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004568 command = args + files
4569 if options.filter:
4570 command = ['--filter=' + ','.join(options.filter)] + command
4571 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004572
4573 white_regex = re.compile(settings.GetLintRegex())
4574 black_regex = re.compile(settings.GetLintIgnoreRegex())
4575 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4576 for filename in filenames:
4577 if white_regex.match(filename):
4578 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004579 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004580 else:
4581 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4582 extra_check_functions)
4583 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004584 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004585 finally:
4586 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004587 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004588 if cpplint._cpplint_state.error_count != 0:
4589 return 1
4590 return 0
4591
4592
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004593def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004594 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004595 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004596 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004597 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004598 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004599 auth.add_auth_options(parser)
4600 options, args = parser.parse_args(args)
4601 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004602
sbc@chromium.org71437c02015-04-09 19:29:40 +00004603 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004604 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004605 return 1
4606
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004607 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004608 if args:
4609 base_branch = args[0]
4610 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004611 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004612 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004614 cl.RunHook(
4615 committing=not options.upload,
4616 may_prompt=False,
4617 verbose=options.verbose,
4618 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004619 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004620
4621
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004622def GenerateGerritChangeId(message):
4623 """Returns Ixxxxxx...xxx change id.
4624
4625 Works the same way as
4626 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4627 but can be called on demand on all platforms.
4628
4629 The basic idea is to generate git hash of a state of the tree, original commit
4630 message, author/committer info and timestamps.
4631 """
4632 lines = []
4633 tree_hash = RunGitSilent(['write-tree'])
4634 lines.append('tree %s' % tree_hash.strip())
4635 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4636 if code == 0:
4637 lines.append('parent %s' % parent.strip())
4638 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4639 lines.append('author %s' % author.strip())
4640 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4641 lines.append('committer %s' % committer.strip())
4642 lines.append('')
4643 # Note: Gerrit's commit-hook actually cleans message of some lines and
4644 # whitespace. This code is not doing this, but it clearly won't decrease
4645 # entropy.
4646 lines.append(message)
4647 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4648 stdin='\n'.join(lines))
4649 return 'I%s' % change_hash.strip()
4650
4651
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004652def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004653 """Computes the remote branch ref to use for the CL.
4654
4655 Args:
4656 remote (str): The git remote for the CL.
4657 remote_branch (str): The git remote branch for the CL.
4658 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004659 """
4660 if not (remote and remote_branch):
4661 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004662
wittman@chromium.org455dc922015-01-26 20:15:50 +00004663 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004664 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004665 # refs, which are then translated into the remote full symbolic refs
4666 # below.
4667 if '/' not in target_branch:
4668 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4669 else:
4670 prefix_replacements = (
4671 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4672 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4673 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4674 )
4675 match = None
4676 for regex, replacement in prefix_replacements:
4677 match = re.search(regex, target_branch)
4678 if match:
4679 remote_branch = target_branch.replace(match.group(0), replacement)
4680 break
4681 if not match:
4682 # This is a branch path but not one we recognize; use as-is.
4683 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004684 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4685 # Handle the refs that need to land in different refs.
4686 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004687
wittman@chromium.org455dc922015-01-26 20:15:50 +00004688 # Create the true path to the remote branch.
4689 # Does the following translation:
4690 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4691 # * refs/remotes/origin/master -> refs/heads/master
4692 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4693 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4694 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4695 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4696 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4697 'refs/heads/')
4698 elif remote_branch.startswith('refs/remotes/branch-heads'):
4699 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004700
wittman@chromium.org455dc922015-01-26 20:15:50 +00004701 return remote_branch
4702
4703
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004704def cleanup_list(l):
4705 """Fixes a list so that comma separated items are put as individual items.
4706
4707 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4708 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4709 """
4710 items = sum((i.split(',') for i in l), [])
4711 stripped_items = (i.strip() for i in items)
4712 return sorted(filter(None, stripped_items))
4713
4714
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004715@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004716def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004717 """Uploads the current changelist to codereview.
4718
4719 Can skip dependency patchset uploads for a branch by running:
4720 git config branch.branch_name.skip-deps-uploads True
4721 To unset run:
4722 git config --unset branch.branch_name.skip-deps-uploads
4723 Can also set the above globally by using the --global flag.
4724 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004725 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4726 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004727 parser.add_option('--bypass-watchlists', action='store_true',
4728 dest='bypass_watchlists',
4729 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004730 parser.add_option('-f', action='store_true', dest='force',
4731 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004732 parser.add_option('--message', '-m', dest='message',
4733 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004734 parser.add_option('-b', '--bug',
4735 help='pre-populate the bug number(s) for this issue. '
4736 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004737 parser.add_option('--message-file', dest='message_file',
4738 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004739 parser.add_option('--title', '-t', dest='title',
4740 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004741 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004742 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004743 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004744 parser.add_option('--tbrs',
4745 action='append', default=[],
4746 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004747 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004748 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004749 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004750 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004751 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004752 parser.add_option('--emulate_svn_auto_props',
4753 '--emulate-svn-auto-props',
4754 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004755 dest="emulate_svn_auto_props",
4756 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004757 parser.add_option('-c', '--use-commit-queue', action='store_true',
4758 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004759 parser.add_option('--private', action='store_true',
4760 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004761 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004762 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004763 metavar='TARGET',
4764 help='Apply CL to remote ref TARGET. ' +
4765 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004766 parser.add_option('--squash', action='store_true',
4767 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004768 parser.add_option('--no-squash', action='store_true',
4769 help='Don\'t squash multiple commits into one ' +
4770 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004771 parser.add_option('--topic', default=None,
4772 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004773 parser.add_option('--email', default=None,
4774 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004775 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4776 const='TBR', help='add a set of OWNERS to TBR')
4777 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4778 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004779 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4780 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004781 help='Send the patchset to do a CQ dry run right after '
4782 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004783 parser.add_option('--dependencies', action='store_true',
4784 help='Uploads CLs of all the local branches that depend on '
4785 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004786
rmistry@google.com2dd99862015-06-22 12:22:18 +00004787 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004788 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004789 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004790 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004791 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004792 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004793 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004794
sbc@chromium.org71437c02015-04-09 19:29:40 +00004795 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004796 return 1
4797
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004798 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004799 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004800 options.cc = cleanup_list(options.cc)
4801
tandriib80458a2016-06-23 12:20:07 -07004802 if options.message_file:
4803 if options.message:
4804 parser.error('only one of --message and --message-file allowed.')
4805 options.message = gclient_utils.FileRead(options.message_file)
4806 options.message_file = None
4807
tandrii4d0545a2016-07-06 03:56:49 -07004808 if options.cq_dry_run and options.use_commit_queue:
4809 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4810
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004811 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4812 settings.GetIsGerrit()
4813
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004814 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004815 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004816
4817
Francois Dorayd42c6812017-05-30 15:10:20 -04004818@subcommand.usage('--description=<description file>')
4819def CMDsplit(parser, args):
4820 """Splits a branch into smaller branches and uploads CLs.
4821
4822 Creates a branch and uploads a CL for each group of files modified in the
4823 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004824 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004825 the shared OWNERS file.
4826 """
4827 parser.add_option("-d", "--description", dest="description_file",
4828 help="A text file containing a CL description. ")
4829 parser.add_option("-c", "--comment", dest="comment_file",
4830 help="A text file containing a CL comment.")
4831 options, _ = parser.parse_args(args)
4832
4833 if not options.description_file:
4834 parser.error('No --description flag specified.')
4835
4836 def WrappedCMDupload(args):
4837 return CMDupload(OptionParser(), args)
4838
4839 return split_cl.SplitCl(options.description_file, options.comment_file,
4840 Changelist, WrappedCMDupload)
4841
4842
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004843@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004844def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004845 """DEPRECATED: Used to commit the current changelist via git-svn."""
4846 message = ('git-cl no longer supports committing to SVN repositories via '
4847 'git-svn. You probably want to use `git cl land` instead.')
4848 print(message)
4849 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004850
4851
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004852# Two special branches used by git cl land.
4853MERGE_BRANCH = 'git-cl-commit'
4854CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4855
4856
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004857@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004858def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004859 """Commits the current changelist via git.
4860
4861 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4862 upstream and closes the issue automatically and atomically.
4863
4864 Otherwise (in case of Rietveld):
4865 Squashes branch into a single commit.
4866 Updates commit message with metadata (e.g. pointer to review).
4867 Pushes the code upstream.
4868 Updates review and closes.
4869 """
4870 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4871 help='bypass upload presubmit hook')
4872 parser.add_option('-m', dest='message',
4873 help="override review description")
4874 parser.add_option('-f', action='store_true', dest='force',
4875 help="force yes to questions (don't prompt)")
4876 parser.add_option('-c', dest='contributor',
4877 help="external contributor for patch (appended to " +
4878 "description and used as author for git). Should be " +
4879 "formatted as 'First Last <email@example.com>'")
4880 add_git_similarity(parser)
4881 auth.add_auth_options(parser)
4882 (options, args) = parser.parse_args(args)
4883 auth_config = auth.extract_auth_config_from_options(options)
4884
4885 cl = Changelist(auth_config=auth_config)
4886
4887 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4888 if cl.IsGerrit():
4889 if options.message:
4890 # This could be implemented, but it requires sending a new patch to
4891 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4892 # Besides, Gerrit has the ability to change the commit message on submit
4893 # automatically, thus there is no need to support this option (so far?).
4894 parser.error('-m MESSAGE option is not supported for Gerrit.')
4895 if options.contributor:
4896 parser.error(
4897 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4898 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4899 'the contributor\'s "name <email>". If you can\'t upload such a '
4900 'commit for review, contact your repository admin and request'
4901 '"Forge-Author" permission.')
4902 if not cl.GetIssue():
4903 DieWithError('You must upload the change first to Gerrit.\n'
4904 ' If you would rather have `git cl land` upload '
4905 'automatically for you, see http://crbug.com/642759')
4906 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4907 options.verbose)
4908
4909 current = cl.GetBranch()
4910 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4911 if remote == '.':
4912 print()
4913 print('Attempting to push branch %r into another local branch!' % current)
4914 print()
4915 print('Either reparent this branch on top of origin/master:')
4916 print(' git reparent-branch --root')
4917 print()
4918 print('OR run `git rebase-update` if you think the parent branch is ')
4919 print('already committed.')
4920 print()
4921 print(' Current parent: %r' % upstream_branch)
4922 return 1
4923
4924 if not args:
4925 # Default to merging against our best guess of the upstream branch.
4926 args = [cl.GetUpstreamBranch()]
4927
4928 if options.contributor:
4929 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004930 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004931 return 1
4932
4933 base_branch = args[0]
4934
4935 if git_common.is_dirty_git_tree('land'):
4936 return 1
4937
4938 # This rev-list syntax means "show all commits not in my branch that
4939 # are in base_branch".
4940 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4941 base_branch]).splitlines()
4942 if upstream_commits:
4943 print('Base branch "%s" has %d commits '
4944 'not in this branch.' % (base_branch, len(upstream_commits)))
4945 print('Run "git merge %s" before attempting to land.' % base_branch)
4946 return 1
4947
4948 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
4949 if not options.bypass_hooks:
4950 author = None
4951 if options.contributor:
4952 author = re.search(r'\<(.*)\>', options.contributor).group(1)
4953 hook_results = cl.RunHook(
4954 committing=True,
4955 may_prompt=not options.force,
4956 verbose=options.verbose,
4957 change=cl.GetChange(merge_base, author))
4958 if not hook_results.should_continue():
4959 return 1
4960
4961 # Check the tree status if the tree status URL is set.
4962 status = GetTreeStatus()
4963 if 'closed' == status:
4964 print('The tree is closed. Please wait for it to reopen. Use '
4965 '"git cl land --bypass-hooks" to commit on a closed tree.')
4966 return 1
4967 elif 'unknown' == status:
4968 print('Unable to determine tree status. Please verify manually and '
4969 'use "git cl land --bypass-hooks" to commit on a closed tree.')
4970 return 1
4971
4972 change_desc = ChangeDescription(options.message)
4973 if not change_desc.description and cl.GetIssue():
4974 change_desc = ChangeDescription(cl.GetDescription())
4975
4976 if not change_desc.description:
4977 if not cl.GetIssue() and options.bypass_hooks:
4978 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
4979 else:
4980 print('No description set.')
4981 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
4982 return 1
4983
4984 # Keep a separate copy for the commit message, because the commit message
4985 # contains the link to the Rietveld issue, while the Rietveld message contains
4986 # the commit viewvc url.
4987 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07004988 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004989 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004990
4991 commit_desc = ChangeDescription(change_desc.description)
4992 if cl.GetIssue():
4993 # Xcode won't linkify this URL unless there is a non-whitespace character
4994 # after it. Add a period on a new line to circumvent this. Also add a space
4995 # before the period to make sure that Gitiles continues to correctly resolve
4996 # the URL.
4997 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
4998 if options.contributor:
4999 commit_desc.append_footer('Patch from %s.' % options.contributor)
5000
5001 print('Description:')
5002 print(commit_desc.description)
5003
5004 branches = [merge_base, cl.GetBranchRef()]
5005 if not options.force:
5006 print_stats(options.similarity, options.find_copies, branches)
5007
5008 # We want to squash all this branch's commits into one commit with the proper
5009 # description. We do this by doing a "reset --soft" to the base branch (which
5010 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005011 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005012 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5013 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5014 result = RunGitWithCode(showref_cmd)
5015 if result[0] == 0:
5016 RunGit(['branch', '-D', branch])
5017
5018 # We might be in a directory that's present in this branch but not in the
5019 # trunk. Move up to the top of the tree so that git commands that expect a
5020 # valid CWD won't fail after we check out the merge branch.
5021 rel_base_path = settings.GetRelativeRoot()
5022 if rel_base_path:
5023 os.chdir(rel_base_path)
5024
5025 # Stuff our change into the merge branch.
5026 # We wrap in a try...finally block so if anything goes wrong,
5027 # we clean up the branches.
5028 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005029 revision = None
5030 try:
5031 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5032 RunGit(['reset', '--soft', merge_base])
5033 if options.contributor:
5034 RunGit(
5035 [
5036 'commit', '--author', options.contributor,
5037 '-m', commit_desc.description,
5038 ])
5039 else:
5040 RunGit(['commit', '-m', commit_desc.description])
5041
5042 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5043 mirror = settings.GetGitMirror(remote)
5044 if mirror:
5045 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005046 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005047 else:
5048 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005049 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005050 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5051
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005052 retcode = PushToGitWithAutoRebase(
5053 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005054 if retcode == 0:
5055 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005056 if git_numberer_enabled:
5057 change_desc = ChangeDescription(
5058 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005059 except: # pylint: disable=bare-except
5060 if _IS_BEING_TESTED:
5061 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5062 + '-' * 30 + '8<' + '-' * 30)
5063 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5064 raise
5065 finally:
5066 # And then swap back to the original branch and clean up.
5067 RunGit(['checkout', '-q', cl.GetBranch()])
5068 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005069 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005070
5071 if not revision:
5072 print('Failed to push. If this persists, please file a bug.')
5073 return 1
5074
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005075 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005076 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005077 if viewvc_url and revision:
5078 change_desc.append_footer(
5079 'Committed: %s%s' % (viewvc_url, revision))
5080 elif revision:
5081 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005082 print('Closing issue '
5083 '(you may be prompted for your codereview password)...')
5084 cl.UpdateDescription(change_desc.description)
5085 cl.CloseIssue()
5086 props = cl.GetIssueProperties()
5087 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005088 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5089 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005090 if options.bypass_hooks:
5091 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5092 else:
5093 comment += ' (presubmit successful).'
5094 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5095
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005096 if os.path.isfile(POSTUPSTREAM_HOOK):
5097 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5098
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005099 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005100
5101
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005102def PushToGitWithAutoRebase(remote, branch, original_description,
5103 git_numberer_enabled, max_attempts=3):
5104 """Pushes current HEAD commit on top of remote's branch.
5105
5106 Attempts to fetch and autorebase on push failures.
5107 Adds git number footers on the fly.
5108
5109 Returns integer code from last command.
5110 """
5111 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5112 code = 0
5113 attempts_left = max_attempts
5114 while attempts_left:
5115 attempts_left -= 1
5116 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5117
5118 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5119 # If fetch fails, retry.
5120 print('Fetching %s/%s...' % (remote, branch))
5121 code, out = RunGitWithCode(
5122 ['retry', 'fetch', remote,
5123 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5124 if code:
5125 print('Fetch failed with exit code %d.' % code)
5126 print(out.strip())
5127 continue
5128
5129 print('Cherry-picking commit on top of latest %s' % branch)
5130 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5131 suppress_stderr=True)
5132 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5133 code, out = RunGitWithCode(['cherry-pick', cherry])
5134 if code:
5135 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5136 'the following files have merge conflicts:' %
5137 (branch, parent_hash))
5138 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5139 print('Please rebase your patch and try again.')
5140 RunGitWithCode(['cherry-pick', '--abort'])
5141 break
5142
5143 commit_desc = ChangeDescription(original_description)
5144 if git_numberer_enabled:
5145 logging.debug('Adding git number footers')
5146 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5147 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5148 branch)
5149 # Ensure timestamps are monotonically increasing.
5150 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5151 _get_committer_timestamp('HEAD'))
5152 _git_amend_head(commit_desc.description, timestamp)
5153
5154 code, out = RunGitWithCode(
5155 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5156 print(out)
5157 if code == 0:
5158 break
5159 if IsFatalPushFailure(out):
5160 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005161 'user.email are correct and you have push access to the repo.\n'
5162 'Hint: run command below to diangose common Git/Gerrit credential '
5163 'problems:\n'
5164 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005165 break
5166 return code
5167
5168
5169def IsFatalPushFailure(push_stdout):
5170 """True if retrying push won't help."""
5171 return '(prohibited by Gerrit)' in push_stdout
5172
5173
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005174@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005175def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005176 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005177 parser.add_option('-b', dest='newbranch',
5178 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005179 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005180 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005181 parser.add_option('-d', '--directory', action='store', metavar='DIR',
5182 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005183 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005184 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005185 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005186 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005187 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005188 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005189
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005190
5191 group = optparse.OptionGroup(
5192 parser,
5193 'Options for continuing work on the current issue uploaded from a '
5194 'different clone (e.g. different machine). Must be used independently '
5195 'from the other options. No issue number should be specified, and the '
5196 'branch must have an issue number associated with it')
5197 group.add_option('--reapply', action='store_true', dest='reapply',
5198 help='Reset the branch and reapply the issue.\n'
5199 'CAUTION: This will undo any local changes in this '
5200 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005201
5202 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005203 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005204 parser.add_option_group(group)
5205
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005206 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005207 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005208 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005209 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005210 auth_config = auth.extract_auth_config_from_options(options)
5211
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005212 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005213 if options.newbranch:
5214 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005215 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005216 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005217
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005218 cl = Changelist(auth_config=auth_config,
5219 codereview=options.forced_codereview)
5220 if not cl.GetIssue():
5221 parser.error('current branch must have an associated issue')
5222
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005223 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005224 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005225 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005226
5227 RunGit(['reset', '--hard', upstream])
5228 if options.pull:
5229 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005230
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005231 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5232 options.directory)
5233
5234 if len(args) != 1 or not args[0]:
5235 parser.error('Must specify issue number or url')
5236
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005237 target_issue_arg = ParseIssueNumberArgument(args[0],
5238 options.forced_codereview)
5239 if not target_issue_arg.valid:
5240 parser.error('invalid codereview url or CL id')
5241
5242 cl_kwargs = {
5243 'auth_config': auth_config,
5244 'codereview_host': target_issue_arg.hostname,
5245 'codereview': options.forced_codereview,
5246 }
5247 detected_codereview_from_url = False
5248 if target_issue_arg.codereview and not options.forced_codereview:
5249 detected_codereview_from_url = True
5250 cl_kwargs['codereview'] = target_issue_arg.codereview
5251 cl_kwargs['issue'] = target_issue_arg.issue
5252
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005253 # We don't want uncommitted changes mixed up with the patch.
5254 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005255 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005256
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005257 if options.newbranch:
5258 if options.force:
5259 RunGit(['branch', '-D', options.newbranch],
5260 stderr=subprocess2.PIPE, error_ok=True)
5261 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005262 elif not GetCurrentBranch():
5263 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005264
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005265 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005266
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005267 if cl.IsGerrit():
5268 if options.reject:
5269 parser.error('--reject is not supported with Gerrit codereview.')
5270 if options.nocommit:
5271 parser.error('--nocommit is not supported with Gerrit codereview.')
5272 if options.directory:
5273 parser.error('--directory is not supported with Gerrit codereview.')
5274
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005275 if detected_codereview_from_url:
5276 print('canonical issue/change URL: %s (type: %s)\n' %
5277 (cl.GetIssueURL(), target_issue_arg.codereview))
5278
5279 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
5280 options.nocommit, options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005281
5282
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005283def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005284 """Fetches the tree status and returns either 'open', 'closed',
5285 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005286 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005287 if url:
5288 status = urllib2.urlopen(url).read().lower()
5289 if status.find('closed') != -1 or status == '0':
5290 return 'closed'
5291 elif status.find('open') != -1 or status == '1':
5292 return 'open'
5293 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005294 return 'unset'
5295
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005296
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005297def GetTreeStatusReason():
5298 """Fetches the tree status from a json url and returns the message
5299 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005300 url = settings.GetTreeStatusUrl()
5301 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005302 connection = urllib2.urlopen(json_url)
5303 status = json.loads(connection.read())
5304 connection.close()
5305 return status['message']
5306
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005307
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005308def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005309 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005310 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005311 status = GetTreeStatus()
5312 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005313 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005314 return 2
5315
vapiera7fbd5a2016-06-16 09:17:49 -07005316 print('The tree is %s' % status)
5317 print()
5318 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005319 if status != 'open':
5320 return 1
5321 return 0
5322
5323
maruel@chromium.org15192402012-09-06 12:38:29 +00005324def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005325 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005326 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005327 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005328 '-b', '--bot', action='append',
5329 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5330 'times to specify multiple builders. ex: '
5331 '"-b win_rel -b win_layout". See '
5332 'the try server waterfall for the builders name and the tests '
5333 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005334 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005335 '-B', '--bucket', default='',
5336 help=('Buildbucket bucket to send the try requests.'))
5337 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005338 '-m', '--master', default='',
5339 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005340 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005341 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005342 help='Revision to use for the try job; default: the revision will '
5343 'be determined by the try recipe that builder runs, which usually '
5344 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005345 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005346 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005347 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005348 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005349 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005350 '--project',
5351 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005352 'in recipe to determine to which repository or directory to '
5353 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005354 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005355 '-p', '--property', dest='properties', action='append', default=[],
5356 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005357 'key2=value2 etc. The value will be treated as '
5358 'json if decodable, or as string otherwise. '
5359 'NOTE: using this may make your try job not usable for CQ, '
5360 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005361 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005362 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5363 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005364 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005365 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005366 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005367 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005368
machenbach@chromium.org45453142015-09-15 08:45:22 +00005369 # Make sure that all properties are prop=value pairs.
5370 bad_params = [x for x in options.properties if '=' not in x]
5371 if bad_params:
5372 parser.error('Got properties with missing "=": %s' % bad_params)
5373
maruel@chromium.org15192402012-09-06 12:38:29 +00005374 if args:
5375 parser.error('Unknown arguments: %s' % args)
5376
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005377 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005378 if not cl.GetIssue():
5379 parser.error('Need to upload first')
5380
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005381 if cl.IsGerrit():
5382 # HACK: warm up Gerrit change detail cache to save on RPCs.
5383 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5384
tandriie113dfd2016-10-11 10:20:12 -07005385 error_message = cl.CannotTriggerTryJobReason()
5386 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005387 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005388
borenet6c0efe62016-10-19 08:13:29 -07005389 if options.bucket and options.master:
5390 parser.error('Only one of --bucket and --master may be used.')
5391
qyearsley1fdfcb62016-10-24 13:22:03 -07005392 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005393
qyearsleydd49f942016-10-28 11:57:22 -07005394 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5395 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005396 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005397 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005398 print('git cl try with no bots now defaults to CQ dry run.')
5399 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5400 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005401
borenet6c0efe62016-10-19 08:13:29 -07005402 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005403 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005404 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005405 'of bot requires an initial job from a parent (usually a builder). '
5406 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005407 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005408 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005409
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005410 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005411 # TODO(tandrii): Checking local patchset against remote patchset is only
5412 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5413 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005414 print('Warning: Codereview server has newer patchsets (%s) than most '
5415 'recent upload from local checkout (%s). Did a previous upload '
5416 'fail?\n'
5417 'By default, git cl try uses the latest patchset from '
5418 'codereview, continuing to use patchset %s.\n' %
5419 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005420
tandrii568043b2016-10-11 07:49:18 -07005421 try:
borenet6c0efe62016-10-19 08:13:29 -07005422 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5423 patchset)
tandrii568043b2016-10-11 07:49:18 -07005424 except BuildbucketResponseException as ex:
5425 print('ERROR: %s' % ex)
5426 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005427 return 0
5428
5429
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005430def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005431 """Prints info about try jobs associated with current CL."""
5432 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005433 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005434 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005435 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005436 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005437 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005438 '--color', action='store_true', default=setup_color.IS_TTY,
5439 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +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.')
qyearsley53f48a12016-09-01 10:45:13 -07005443 group.add_option(
5444 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005445 parser.add_option_group(group)
5446 auth.add_auth_options(parser)
5447 options, args = parser.parse_args(args)
5448 if args:
5449 parser.error('Unrecognized args: %s' % ' '.join(args))
5450
5451 auth_config = auth.extract_auth_config_from_options(options)
5452 cl = Changelist(auth_config=auth_config)
5453 if not cl.GetIssue():
5454 parser.error('Need to upload first')
5455
tandrii221ab252016-10-06 08:12:04 -07005456 patchset = options.patchset
5457 if not patchset:
5458 patchset = cl.GetMostRecentPatchset()
5459 if not patchset:
5460 parser.error('Codereview doesn\'t know about issue %s. '
5461 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005462 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005463 cl.GetIssue())
5464
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005465 # TODO(tandrii): Checking local patchset against remote patchset is only
5466 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5467 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005468 print('Warning: Codereview server has newer patchsets (%s) than most '
5469 'recent upload from local checkout (%s). Did a previous upload '
5470 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005471 'By default, git cl try-results uses the latest patchset from '
5472 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005473 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005474 try:
tandrii221ab252016-10-06 08:12:04 -07005475 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005476 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005477 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005478 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005479 if options.json:
5480 write_try_results_json(options.json, jobs)
5481 else:
5482 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005483 return 0
5484
5485
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005486@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005487def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005488 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005489 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005490 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005491 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005492
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005493 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005494 if args:
5495 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005496 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005497 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005498 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005499 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005500
5501 # Clear configured merge-base, if there is one.
5502 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005503 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005504 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005505 return 0
5506
5507
thestig@chromium.org00858c82013-12-02 23:08:03 +00005508def CMDweb(parser, args):
5509 """Opens the current CL in the web browser."""
5510 _, args = parser.parse_args(args)
5511 if args:
5512 parser.error('Unrecognized args: %s' % ' '.join(args))
5513
5514 issue_url = Changelist().GetIssueURL()
5515 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005516 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005517 return 1
5518
5519 webbrowser.open(issue_url)
5520 return 0
5521
5522
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005523def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005524 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005525 parser.add_option('-d', '--dry-run', action='store_true',
5526 help='trigger in dry run mode')
5527 parser.add_option('-c', '--clear', action='store_true',
5528 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005529 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005530 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005531 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005532 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005533 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005534 if args:
5535 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005536 if options.dry_run and options.clear:
5537 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5538
iannuccie53c9352016-08-17 14:40:40 -07005539 cl = Changelist(auth_config=auth_config, issue=options.issue,
5540 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005541 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005542 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005543 elif options.dry_run:
5544 state = _CQState.DRY_RUN
5545 else:
5546 state = _CQState.COMMIT
5547 if not cl.GetIssue():
5548 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005549 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005550 return 0
5551
5552
groby@chromium.org411034a2013-02-26 15:12:01 +00005553def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005554 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005555 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005556 auth.add_auth_options(parser)
5557 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005558 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005559 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005560 if args:
5561 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005562 cl = Changelist(auth_config=auth_config, issue=options.issue,
5563 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005564 # Ensure there actually is an issue to close.
5565 cl.GetDescription()
5566 cl.CloseIssue()
5567 return 0
5568
5569
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005570def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005571 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005572 parser.add_option(
5573 '--stat',
5574 action='store_true',
5575 dest='stat',
5576 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005577 auth.add_auth_options(parser)
5578 options, args = parser.parse_args(args)
5579 auth_config = auth.extract_auth_config_from_options(options)
5580 if args:
5581 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005582
5583 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005584 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005585 # Staged changes would be committed along with the patch from last
5586 # upload, hence counted toward the "last upload" side in the final
5587 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005588 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005589 return 1
5590
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005591 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005592 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005593 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005594 if not issue:
5595 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005596 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005597 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005598
5599 # Create a new branch based on the merge-base
5600 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005601 # Clear cached branch in cl object, to avoid overwriting original CL branch
5602 # properties.
5603 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005604 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005605 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005606 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005607 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005608 return rtn
5609
wychen@chromium.org06928532015-02-03 02:11:29 +00005610 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005611 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005612 cmd = ['git', 'diff']
5613 if options.stat:
5614 cmd.append('--stat')
5615 cmd.extend([TMP_BRANCH, branch, '--'])
5616 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005617 finally:
5618 RunGit(['checkout', '-q', branch])
5619 RunGit(['branch', '-D', TMP_BRANCH])
5620
5621 return 0
5622
5623
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005624def CMDowners(parser, args):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005625 """Interactively finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005626 parser.add_option(
5627 '--no-color',
5628 action='store_true',
5629 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005630 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005631 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005632 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005633
5634 author = RunGit(['config', 'user.email']).strip() or None
5635
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005636 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005637
5638 if args:
5639 if len(args) > 1:
5640 parser.error('Unknown args')
5641 base_branch = args[0]
5642 else:
5643 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005644 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005645
5646 change = cl.GetChange(base_branch, None)
5647 return owners_finder.OwnersFinder(
5648 [f.LocalPath() for f in
5649 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005650 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005651 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005652 disable_color=options.no_color,
5653 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005654
5655
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005656def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005657 """Generates a diff command."""
5658 # Generate diff for the current branch's changes.
5659 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005660 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005661
5662 if args:
5663 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005664 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005665 diff_cmd.append(arg)
5666 else:
5667 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005668
5669 return diff_cmd
5670
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005671
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005672def MatchingFileType(file_name, extensions):
5673 """Returns true if the file name ends with one of the given extensions."""
5674 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005675
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005676
enne@chromium.org555cfe42014-01-29 18:21:39 +00005677@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005678def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005679 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005680 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005681 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005682 parser.add_option('--full', action='store_true',
5683 help='Reformat the full content of all touched files')
5684 parser.add_option('--dry-run', action='store_true',
5685 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005686 parser.add_option('--python', action='store_true',
5687 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005688 parser.add_option('--js', action='store_true',
5689 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005690 parser.add_option('--diff', action='store_true',
5691 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005692 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005693
Daniel Chengc55eecf2016-12-30 03:11:02 -08005694 # Normalize any remaining args against the current path, so paths relative to
5695 # the current directory are still resolved as expected.
5696 args = [os.path.join(os.getcwd(), arg) for arg in args]
5697
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005698 # git diff generates paths against the root of the repository. Change
5699 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005700 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005701 if rel_base_path:
5702 os.chdir(rel_base_path)
5703
digit@chromium.org29e47272013-05-17 17:01:46 +00005704 # Grab the merge-base commit, i.e. the upstream commit of the current
5705 # branch when it was created or the last time it was rebased. This is
5706 # to cover the case where the user may have called "git fetch origin",
5707 # moving the origin branch to a newer commit, but hasn't rebased yet.
5708 upstream_commit = None
5709 cl = Changelist()
5710 upstream_branch = cl.GetUpstreamBranch()
5711 if upstream_branch:
5712 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5713 upstream_commit = upstream_commit.strip()
5714
5715 if not upstream_commit:
5716 DieWithError('Could not find base commit for this branch. '
5717 'Are you in detached state?')
5718
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005719 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5720 diff_output = RunGit(changed_files_cmd)
5721 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005722 # Filter out files deleted by this CL
5723 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005724
Christopher Lamc5ba6922017-01-24 11:19:14 +11005725 if opts.js:
5726 CLANG_EXTS.append('.js')
5727
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005728 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5729 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5730 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005731 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005732
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005733 top_dir = os.path.normpath(
5734 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5735
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005736 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5737 # formatted. This is used to block during the presubmit.
5738 return_value = 0
5739
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005740 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005741 # Locate the clang-format binary in the checkout
5742 try:
5743 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005744 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005745 DieWithError(e)
5746
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005747 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005748 cmd = [clang_format_tool]
5749 if not opts.dry_run and not opts.diff:
5750 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005751 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005752 if opts.diff:
5753 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005754 else:
5755 env = os.environ.copy()
5756 env['PATH'] = str(os.path.dirname(clang_format_tool))
5757 try:
5758 script = clang_format.FindClangFormatScriptInChromiumTree(
5759 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005760 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005761 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005762
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005763 cmd = [sys.executable, script, '-p0']
5764 if not opts.dry_run and not opts.diff:
5765 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005766
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005767 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5768 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005769
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005770 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5771 if opts.diff:
5772 sys.stdout.write(stdout)
5773 if opts.dry_run and len(stdout) > 0:
5774 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005775
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005776 # Similar code to above, but using yapf on .py files rather than clang-format
5777 # on C/C++ files
5778 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005779 yapf_tool = gclient_utils.FindExecutable('yapf')
5780 if yapf_tool is None:
5781 DieWithError('yapf not found in PATH')
5782
5783 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005784 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005785 cmd = [yapf_tool]
5786 if not opts.dry_run and not opts.diff:
5787 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005788 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005789 if opts.diff:
5790 sys.stdout.write(stdout)
5791 else:
5792 # TODO(sbc): yapf --lines mode still has some issues.
5793 # https://github.com/google/yapf/issues/154
5794 DieWithError('--python currently only works with --full')
5795
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005796 # Dart's formatter does not have the nice property of only operating on
5797 # modified chunks, so hard code full.
5798 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005799 try:
5800 command = [dart_format.FindDartFmtToolInChromiumTree()]
5801 if not opts.dry_run and not opts.diff:
5802 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005803 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005804
ppi@chromium.org6593d932016-03-03 15:41:15 +00005805 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005806 if opts.dry_run and stdout:
5807 return_value = 2
5808 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005809 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5810 'found in this checkout. Files in other languages are still '
5811 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005812
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005813 # Format GN build files. Always run on full build files for canonical form.
5814 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005815 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005816 if opts.dry_run or opts.diff:
5817 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005818 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005819 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5820 shell=sys.platform == 'win32',
5821 cwd=top_dir)
5822 if opts.dry_run and gn_ret == 2:
5823 return_value = 2 # Not formatted.
5824 elif opts.diff and gn_ret == 2:
5825 # TODO this should compute and print the actual diff.
5826 print("This change has GN build file diff for " + gn_diff_file)
5827 elif gn_ret != 0:
5828 # For non-dry run cases (and non-2 return values for dry-run), a
5829 # nonzero error code indicates a failure, probably because the file
5830 # doesn't parse.
5831 DieWithError("gn format failed on " + gn_diff_file +
5832 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005833
Steven Holte2e664bf2017-04-21 13:10:47 -07005834 for xml_dir in GetDirtyMetricsDirs(diff_files):
5835 tool_dir = os.path.join(top_dir, xml_dir)
5836 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5837 if opts.dry_run or opts.diff:
5838 cmd.append('--diff')
5839 stdout = RunCommand(cmd, cwd=top_dir)
5840 if opts.diff:
5841 sys.stdout.write(stdout)
5842 if opts.dry_run and stdout:
5843 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005844
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005845 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005846
Steven Holte2e664bf2017-04-21 13:10:47 -07005847def GetDirtyMetricsDirs(diff_files):
5848 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5849 metrics_xml_dirs = [
5850 os.path.join('tools', 'metrics', 'actions'),
5851 os.path.join('tools', 'metrics', 'histograms'),
5852 os.path.join('tools', 'metrics', 'rappor'),
5853 os.path.join('tools', 'metrics', 'ukm')]
5854 for xml_dir in metrics_xml_dirs:
5855 if any(file.startswith(xml_dir) for file in xml_diff_files):
5856 yield xml_dir
5857
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005858
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005859@subcommand.usage('<codereview url or issue id>')
5860def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005861 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005862 _, args = parser.parse_args(args)
5863
5864 if len(args) != 1:
5865 parser.print_help()
5866 return 1
5867
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005868 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005869 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005870 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005871
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005872 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005873
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005874 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005875 output = RunGit(['config', '--local', '--get-regexp',
5876 r'branch\..*\.%s' % issueprefix],
5877 error_ok=True)
5878 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005879 if issue == target_issue:
5880 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005881
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005882 branches = []
5883 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005884 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005885 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005886 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005887 return 1
5888 if len(branches) == 1:
5889 RunGit(['checkout', branches[0]])
5890 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005891 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005892 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005893 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005894 which = raw_input('Choose by index: ')
5895 try:
5896 RunGit(['checkout', branches[int(which)]])
5897 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005898 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005899 return 1
5900
5901 return 0
5902
5903
maruel@chromium.org29404b52014-09-08 22:58:00 +00005904def CMDlol(parser, args):
5905 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005906 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005907 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5908 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5909 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005910 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005911 return 0
5912
5913
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005914class OptionParser(optparse.OptionParser):
5915 """Creates the option parse and add --verbose support."""
5916 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005917 optparse.OptionParser.__init__(
5918 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005919 self.add_option(
5920 '-v', '--verbose', action='count', default=0,
5921 help='Use 2 times for more debugging info')
5922
5923 def parse_args(self, args=None, values=None):
5924 options, args = optparse.OptionParser.parse_args(self, args, values)
5925 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01005926 logging.basicConfig(
5927 level=levels[min(options.verbose, len(levels) - 1)],
5928 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
5929 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005930 return options, args
5931
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005933def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005934 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005935 print('\nYour python version %s is unsupported, please upgrade.\n' %
5936 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005937 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005938
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005939 # Reload settings.
5940 global settings
5941 settings = Settings()
5942
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005943 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005944 dispatcher = subcommand.CommandDispatcher(__name__)
5945 try:
5946 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005947 except auth.AuthenticationError as e:
5948 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005949 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005950 if e.code != 500:
5951 raise
5952 DieWithError(
5953 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5954 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005955 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005956
5957
5958if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005959 # These affect sys.stdout so do it outside of main() to simplify mocks in
5960 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005961 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005962 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005963 try:
5964 sys.exit(main(sys.argv[1:]))
5965 except KeyboardInterrupt:
5966 sys.stderr.write('interrupted\n')
5967 sys.exit(1)