blob: e79a22df71f831b9b978bb23027a11b3a43c96ee [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():
Aaron Gableaee6c852017-06-26 12:49:01 -07001059 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001060 if not arg.startswith('http'):
1061 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001062
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001063 url = gclient_utils.UpgradeToHttps(arg)
1064 try:
1065 parsed_url = urlparse.urlparse(url)
1066 except ValueError:
1067 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001068
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001069 if codereview is not None:
1070 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1071 return parsed or fail_result
1072
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001073 results = {}
1074 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1075 parsed = cls.ParseIssueURL(parsed_url)
1076 if parsed is not None:
1077 results[name] = parsed
1078
1079 if not results:
1080 return fail_result
1081 if len(results) == 1:
1082 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001083
1084 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1085 # This is likely Gerrit.
1086 return results['gerrit']
1087 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001088 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001089
1090
Aaron Gablea45ee112016-11-22 15:14:38 -08001091class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001092 def __init__(self, issue, url):
1093 self.issue = issue
1094 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001095 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001096
1097 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001098 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001099 self.issue, self.url)
1100
1101
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001102_CommentSummary = collections.namedtuple(
1103 '_CommentSummary', ['date', 'message', 'sender',
1104 # TODO(tandrii): these two aren't known in Gerrit.
1105 'approval', 'disapproval'])
1106
1107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001109 """Changelist works with one changelist in local branch.
1110
1111 Supports two codereview backends: Rietveld or Gerrit, selected at object
1112 creation.
1113
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001114 Notes:
1115 * Not safe for concurrent multi-{thread,process} use.
1116 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001117 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001118 """
1119
1120 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1121 """Create a new ChangeList instance.
1122
1123 If issue is given, the codereview must be given too.
1124
1125 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1126 Otherwise, it's decided based on current configuration of the local branch,
1127 with default being 'rietveld' for backwards compatibility.
1128 See _load_codereview_impl for more details.
1129
1130 **kwargs will be passed directly to codereview implementation.
1131 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001133 global settings
1134 if not settings:
1135 # Happens when git_cl.py is used as a utility library.
1136 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001137
1138 if issue:
1139 assert codereview, 'codereview must be known, if issue is known'
1140
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.branchref = branchref
1142 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001143 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.branch = ShortBranchName(self.branchref)
1145 else:
1146 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001148 self.lookedup_issue = False
1149 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.has_description = False
1151 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001152 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001154 self.cc = None
1155 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001156 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001157
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001159 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001160 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001161 assert self._codereview_impl
1162 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001163
1164 def _load_codereview_impl(self, codereview=None, **kwargs):
1165 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001166 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1167 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1168 self._codereview = codereview
1169 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001170 return
1171
1172 # Automatic selection based on issue number set for a current branch.
1173 # Rietveld takes precedence over Gerrit.
1174 assert not self.issue
1175 # Whether we find issue or not, we are doing the lookup.
1176 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001177 if self.GetBranch():
1178 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1179 issue = _git_get_branch_config_value(
1180 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1181 if issue:
1182 self._codereview = codereview
1183 self._codereview_impl = cls(self, **kwargs)
1184 self.issue = int(issue)
1185 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001186
1187 # No issue is set for this branch, so decide based on repo-wide settings.
1188 return self._load_codereview_impl(
1189 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1190 **kwargs)
1191
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001192 def IsGerrit(self):
1193 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001194
1195 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001196 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001198 The return value is a string suitable for passing to git cl with the --cc
1199 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200 """
1201 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001202 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001203 more_cc = ','.join(self.watchers)
1204 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1205 return self.cc
1206
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001207 def GetCCListWithoutDefault(self):
1208 """Return the users cc'd on this CL excluding default ones."""
1209 if self.cc is None:
1210 self.cc = ','.join(self.watchers)
1211 return self.cc
1212
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001213 def SetWatchers(self, watchers):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001214 """Sets the list of email addresses that should be cc'd based on the changed
1215 files in this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001216 """
1217 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218
1219 def GetBranch(self):
1220 """Returns the short branch name, e.g. 'master'."""
1221 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001222 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001223 if not branchref:
1224 return None
1225 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001226 self.branch = ShortBranchName(self.branchref)
1227 return self.branch
1228
1229 def GetBranchRef(self):
1230 """Returns the full branch name, e.g. 'refs/heads/master'."""
1231 self.GetBranch() # Poke the lazy loader.
1232 return self.branchref
1233
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001234 def ClearBranch(self):
1235 """Clears cached branch data of this object."""
1236 self.branch = self.branchref = None
1237
tandrii5d48c322016-08-18 16:19:37 -07001238 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1239 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1240 kwargs['branch'] = self.GetBranch()
1241 return _git_get_branch_config_value(key, default, **kwargs)
1242
1243 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1244 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1245 assert self.GetBranch(), (
1246 'this CL must have an associated branch to %sset %s%s' %
1247 ('un' if value is None else '',
1248 key,
1249 '' if value is None else ' to %r' % value))
1250 kwargs['branch'] = self.GetBranch()
1251 return _git_set_branch_config_value(key, value, **kwargs)
1252
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001253 @staticmethod
1254 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001255 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256 e.g. 'origin', 'refs/heads/master'
1257 """
1258 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001259 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1260
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001262 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001263 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001264 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1265 error_ok=True).strip()
1266 if upstream_branch:
1267 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001269 # Else, try to guess the origin remote.
1270 remote_branches = RunGit(['branch', '-r']).split()
1271 if 'origin/master' in remote_branches:
1272 # Fall back on origin/master if it exits.
1273 remote = 'origin'
1274 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001276 DieWithError(
1277 'Unable to determine default branch to diff against.\n'
1278 'Either pass complete "git diff"-style arguments, like\n'
1279 ' git cl upload origin/master\n'
1280 'or verify this branch is set up to track another \n'
1281 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001282
1283 return remote, upstream_branch
1284
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001285 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001286 upstream_branch = self.GetUpstreamBranch()
1287 if not BranchExists(upstream_branch):
1288 DieWithError('The upstream for the current branch (%s) does not exist '
1289 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001290 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001291 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001292
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 def GetUpstreamBranch(self):
1294 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001295 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001297 upstream_branch = upstream_branch.replace('refs/heads/',
1298 'refs/remotes/%s/' % remote)
1299 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1300 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 self.upstream_branch = upstream_branch
1302 return self.upstream_branch
1303
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001305 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001306 remote, branch = None, self.GetBranch()
1307 seen_branches = set()
1308 while branch not in seen_branches:
1309 seen_branches.add(branch)
1310 remote, branch = self.FetchUpstreamTuple(branch)
1311 branch = ShortBranchName(branch)
1312 if remote != '.' or branch.startswith('refs/remotes'):
1313 break
1314 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001315 remotes = RunGit(['remote'], error_ok=True).split()
1316 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001317 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001318 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001319 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001320 logging.warn('Could not determine which remote this change is '
1321 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322 else:
1323 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001324 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001325 branch = 'HEAD'
1326 if branch.startswith('refs/remotes'):
1327 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001328 elif branch.startswith('refs/branch-heads/'):
1329 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 else:
1331 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001332 return self._remote
1333
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001334 def GitSanityChecks(self, upstream_git_obj):
1335 """Checks git repo status and ensures diff is from local commits."""
1336
sbc@chromium.org79706062015-01-14 21:18:12 +00001337 if upstream_git_obj is None:
1338 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001339 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001340 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001341 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001342 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001343 return False
1344
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001345 # Verify the commit we're diffing against is in our current branch.
1346 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1347 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1348 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001349 print('ERROR: %s is not in the current branch. You may need to rebase '
1350 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001351 return False
1352
1353 # List the commits inside the diff, and verify they are all local.
1354 commits_in_diff = RunGit(
1355 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1356 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1357 remote_branch = remote_branch.strip()
1358 if code != 0:
1359 _, remote_branch = self.GetRemoteBranch()
1360
1361 commits_in_remote = RunGit(
1362 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1363
1364 common_commits = set(commits_in_diff) & set(commits_in_remote)
1365 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001366 print('ERROR: Your diff contains %d commits already in %s.\n'
1367 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1368 'the diff. If you are using a custom git flow, you can override'
1369 ' the reference used for this check with "git config '
1370 'gitcl.remotebranch <git-ref>".' % (
1371 len(common_commits), remote_branch, upstream_git_obj),
1372 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001373 return False
1374 return True
1375
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001376 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001377 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001378
1379 Returns None if it is not set.
1380 """
tandrii5d48c322016-08-18 16:19:37 -07001381 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001382
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001383 def GetRemoteUrl(self):
1384 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1385
1386 Returns None if there is no remote.
1387 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001388 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001389 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1390
1391 # If URL is pointing to a local directory, it is probably a git cache.
1392 if os.path.isdir(url):
1393 url = RunGit(['config', 'remote.%s.url' % remote],
1394 error_ok=True,
1395 cwd=url).strip()
1396 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001397
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001398 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001399 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001400 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001401 self.issue = self._GitGetBranchConfigValue(
1402 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001403 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404 return self.issue
1405
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 def GetIssueURL(self):
1407 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001408 issue = self.GetIssue()
1409 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001410 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001411 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001413 def GetDescription(self, pretty=False, force=False):
1414 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001416 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417 self.has_description = True
1418 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001419 # Set width to 72 columns + 2 space indent.
1420 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001422 lines = self.description.splitlines()
1423 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001424 return self.description
1425
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001426 def GetDescriptionFooters(self):
1427 """Returns (non_footer_lines, footers) for the commit message.
1428
1429 Returns:
1430 non_footer_lines (list(str)) - Simple list of description lines without
1431 any footer. The lines do not contain newlines, nor does the list contain
1432 the empty line between the message and the footers.
1433 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1434 [("Change-Id", "Ideadbeef...."), ...]
1435 """
1436 raw_description = self.GetDescription()
1437 msg_lines, _, footers = git_footers.split_footers(raw_description)
1438 if footers:
1439 msg_lines = msg_lines[:len(msg_lines)-1]
1440 return msg_lines, footers
1441
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001442 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001443 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001444 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001445 self.patchset = self._GitGetBranchConfigValue(
1446 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001447 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448 return self.patchset
1449
1450 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001451 """Set this branch's patchset. If patchset=0, clears the patchset."""
1452 assert self.GetBranch()
1453 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001454 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001455 else:
1456 self.patchset = int(patchset)
1457 self._GitSetBranchConfigValue(
1458 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001459
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001460 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001461 """Set this branch's issue. If issue isn't given, clears the issue."""
1462 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001463 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001464 issue = int(issue)
1465 self._GitSetBranchConfigValue(
1466 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001467 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001468 codereview_server = self._codereview_impl.GetCodereviewServer()
1469 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001470 self._GitSetBranchConfigValue(
1471 self._codereview_impl.CodereviewServerConfigKey(),
1472 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001473 else:
tandrii5d48c322016-08-18 16:19:37 -07001474 # Reset all of these just to be clean.
1475 reset_suffixes = [
1476 'last-upload-hash',
1477 self._codereview_impl.IssueConfigKey(),
1478 self._codereview_impl.PatchsetConfigKey(),
1479 self._codereview_impl.CodereviewServerConfigKey(),
1480 ] + self._PostUnsetIssueProperties()
1481 for prop in reset_suffixes:
1482 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001483 msg = RunGit(['log', '-1', '--format=%B']).strip()
1484 if msg and git_footers.get_footer_change_id(msg):
1485 print('WARNING: The change patched into this branch has a Change-Id. '
1486 'Removing it.')
1487 RunGit(['commit', '--amend', '-m',
1488 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001489 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001490 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001491
dnjba1b0f32016-09-02 12:37:42 -07001492 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001493 if not self.GitSanityChecks(upstream_branch):
1494 DieWithError('\nGit sanity check failure')
1495
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001496 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001497 if not root:
1498 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001499 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001500
1501 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001502 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001503 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001504 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001505 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001506 except subprocess2.CalledProcessError:
1507 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001508 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001509 'This branch probably doesn\'t exist anymore. To reset the\n'
1510 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001511 ' git branch --set-upstream-to origin/master %s\n'
1512 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001513 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001514
maruel@chromium.org52424302012-08-29 15:14:30 +00001515 issue = self.GetIssue()
1516 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001517 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001518 description = self.GetDescription()
1519 else:
1520 # If the change was never uploaded, use the log messages of all commits
1521 # up to the branch point, as git cl upload will prefill the description
1522 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001523 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1524 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001525
1526 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001527 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001528 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001529 name,
1530 description,
1531 absroot,
1532 files,
1533 issue,
1534 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001535 author,
1536 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001537
dsansomee2d6fd92016-09-08 00:10:47 -07001538 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001539 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001540 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001541 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001542
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001543 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1544 """Sets the description for this CL remotely.
1545
1546 You can get description_lines and footers with GetDescriptionFooters.
1547
1548 Args:
1549 description_lines (list(str)) - List of CL description lines without
1550 newline characters.
1551 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1552 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1553 `List-Of-Tokens`). It will be case-normalized so that each token is
1554 title-cased.
1555 """
1556 new_description = '\n'.join(description_lines)
1557 if footers:
1558 new_description += '\n'
1559 for k, v in footers:
1560 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1561 if not git_footers.FOOTER_PATTERN.match(foot):
1562 raise ValueError('Invalid footer %r' % foot)
1563 new_description += foot + '\n'
1564 self.UpdateDescription(new_description, force)
1565
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001566 def RunHook(self, committing, may_prompt, verbose, change):
1567 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1568 try:
1569 return presubmit_support.DoPresubmitChecks(change, committing,
1570 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1571 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001572 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001573 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001574 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001575 DieWithError(
1576 ('%s\nMaybe your depot_tools is out of date?\n'
1577 'If all fails, contact maruel@') % e)
1578
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001579 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1580 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001581 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1582 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001583 else:
1584 # Assume url.
1585 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1586 urlparse.urlparse(issue_arg))
1587 if not parsed_issue_arg or not parsed_issue_arg.valid:
1588 DieWithError('Failed to parse issue argument "%s". '
1589 'Must be an issue number or a valid URL.' % issue_arg)
1590 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001591 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001592
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001593 def CMDUpload(self, options, git_diff_args, orig_args):
1594 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001595 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001596 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001597 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001598 else:
1599 if self.GetBranch() is None:
1600 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1601
1602 # Default to diffing against common ancestor of upstream branch
1603 base_branch = self.GetCommonAncestorWithUpstream()
1604 git_diff_args = [base_branch, 'HEAD']
1605
Aaron Gablec4c40d12017-05-22 11:49:53 -07001606 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1607 if not self.IsGerrit() and not self.GetIssue():
1608 print('=====================================')
1609 print('NOTICE: Rietveld is being deprecated. '
1610 'You can upload changes to Gerrit with')
1611 print(' git cl upload --gerrit')
1612 print('or set Gerrit to be your default code review tool with')
1613 print(' git config gerrit.host true')
1614 print('=====================================')
1615
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001616 # Fast best-effort checks to abort before running potentially
1617 # expensive hooks if uploading is likely to fail anyway. Passing these
1618 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001619 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001620 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001621
1622 # Apply watchlists on upload.
1623 change = self.GetChange(base_branch, None)
1624 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1625 files = [f.LocalPath() for f in change.AffectedFiles()]
1626 if not options.bypass_watchlists:
1627 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1628
1629 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001630 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001631 # Set the reviewer list now so that presubmit checks can access it.
1632 change_description = ChangeDescription(change.FullDescriptionText())
1633 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001634 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001635 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001636 change)
1637 change.SetDescriptionText(change_description.description)
1638 hook_results = self.RunHook(committing=False,
1639 may_prompt=not options.force,
1640 verbose=options.verbose,
1641 change=change)
1642 if not hook_results.should_continue():
1643 return 1
1644 if not options.reviewers and hook_results.reviewers:
1645 options.reviewers = hook_results.reviewers.split(',')
1646
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001647 # TODO(tandrii): Checking local patchset against remote patchset is only
1648 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1649 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001650 latest_patchset = self.GetMostRecentPatchset()
1651 local_patchset = self.GetPatchset()
1652 if (latest_patchset and local_patchset and
1653 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001654 print('The last upload made from this repository was patchset #%d but '
1655 'the most recent patchset on the server is #%d.'
1656 % (local_patchset, latest_patchset))
1657 print('Uploading will still work, but if you\'ve uploaded to this '
1658 'issue from another machine or branch the patch you\'re '
1659 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001660 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001661
1662 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001663 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001664 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001665 if options.use_commit_queue:
1666 self.SetCQState(_CQState.COMMIT)
1667 elif options.cq_dry_run:
1668 self.SetCQState(_CQState.DRY_RUN)
1669
tandrii5d48c322016-08-18 16:19:37 -07001670 _git_set_branch_config_value('last-upload-hash',
1671 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001672 # Run post upload hooks, if specified.
1673 if settings.GetRunPostUploadHook():
1674 presubmit_support.DoPostUploadExecuter(
1675 change,
1676 self,
1677 settings.GetRoot(),
1678 options.verbose,
1679 sys.stdout)
1680
1681 # Upload all dependencies if specified.
1682 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001683 print()
1684 print('--dependencies has been specified.')
1685 print('All dependent local branches will be re-uploaded.')
1686 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001687 # Remove the dependencies flag from args so that we do not end up in a
1688 # loop.
1689 orig_args.remove('--dependencies')
1690 ret = upload_branch_deps(self, orig_args)
1691 return ret
1692
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001693 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001694 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001695
1696 Issue must have been already uploaded and known.
1697 """
1698 assert new_state in _CQState.ALL_STATES
1699 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001700 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001701 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001702 return 0
1703 except KeyboardInterrupt:
1704 raise
1705 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001706 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001707 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001708 ' * Your project has no CQ,\n'
1709 ' * You don\'t have permission to change the CQ state,\n'
1710 ' * There\'s a bug in this code (see stack trace below).\n'
1711 'Consider specifying which bots to trigger manually or asking your '
1712 'project owners for permissions or contacting Chrome Infra at:\n'
1713 'https://www.chromium.org/infra\n\n' %
1714 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001715 # Still raise exception so that stack trace is printed.
1716 raise
1717
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001718 # Forward methods to codereview specific implementation.
1719
Aaron Gable636b13f2017-07-14 10:42:48 -07001720 def AddComment(self, message, publish=None):
1721 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001722
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001723 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001724 """Returns list of _CommentSummary for each comment.
1725
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001726 args:
1727 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001728 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001729 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001730
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001731 def CloseIssue(self):
1732 return self._codereview_impl.CloseIssue()
1733
1734 def GetStatus(self):
1735 return self._codereview_impl.GetStatus()
1736
1737 def GetCodereviewServer(self):
1738 return self._codereview_impl.GetCodereviewServer()
1739
tandriide281ae2016-10-12 06:02:30 -07001740 def GetIssueOwner(self):
1741 """Get owner from codereview, which may differ from this checkout."""
1742 return self._codereview_impl.GetIssueOwner()
1743
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001744 def GetMostRecentPatchset(self):
1745 return self._codereview_impl.GetMostRecentPatchset()
1746
tandriide281ae2016-10-12 06:02:30 -07001747 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001748 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001749 return self._codereview_impl.CannotTriggerTryJobReason()
1750
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001751 def GetTryJobProperties(self, patchset=None):
1752 """Returns dictionary of properties to launch try job."""
1753 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001754
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001755 def __getattr__(self, attr):
1756 # This is because lots of untested code accesses Rietveld-specific stuff
1757 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001758 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001759 # Note that child method defines __getattr__ as well, and forwards it here,
1760 # because _RietveldChangelistImpl is not cleaned up yet, and given
1761 # deprecation of Rietveld, it should probably be just removed.
1762 # Until that time, avoid infinite recursion by bypassing __getattr__
1763 # of implementation class.
1764 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001765
1766
1767class _ChangelistCodereviewBase(object):
1768 """Abstract base class encapsulating codereview specifics of a changelist."""
1769 def __init__(self, changelist):
1770 self._changelist = changelist # instance of Changelist
1771
1772 def __getattr__(self, attr):
1773 # Forward methods to changelist.
1774 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1775 # _RietveldChangelistImpl to avoid this hack?
1776 return getattr(self._changelist, attr)
1777
1778 def GetStatus(self):
1779 """Apply a rough heuristic to give a simple summary of an issue's review
1780 or CQ status, assuming adherence to a common workflow.
1781
1782 Returns None if no issue for this branch, or specific string keywords.
1783 """
1784 raise NotImplementedError()
1785
1786 def GetCodereviewServer(self):
1787 """Returns server URL without end slash, like "https://codereview.com"."""
1788 raise NotImplementedError()
1789
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001790 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791 """Fetches and returns description from the codereview server."""
1792 raise NotImplementedError()
1793
tandrii5d48c322016-08-18 16:19:37 -07001794 @classmethod
1795 def IssueConfigKey(cls):
1796 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001797 raise NotImplementedError()
1798
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001799 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001800 def PatchsetConfigKey(cls):
1801 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001802 raise NotImplementedError()
1803
tandrii5d48c322016-08-18 16:19:37 -07001804 @classmethod
1805 def CodereviewServerConfigKey(cls):
1806 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001807 raise NotImplementedError()
1808
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001809 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001810 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001811 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001812
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001813 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001814 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001815 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001816 raise NotImplementedError()
1817
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001818 def GetGerritObjForPresubmit(self):
1819 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1820 return None
1821
dsansomee2d6fd92016-09-08 00:10:47 -07001822 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001823 """Update the description on codereview site."""
1824 raise NotImplementedError()
1825
Aaron Gable636b13f2017-07-14 10:42:48 -07001826 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001827 """Posts a comment to the codereview site."""
1828 raise NotImplementedError()
1829
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001830 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001831 raise NotImplementedError()
1832
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001833 def CloseIssue(self):
1834 """Closes the issue."""
1835 raise NotImplementedError()
1836
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001837 def GetMostRecentPatchset(self):
1838 """Returns the most recent patchset number from the codereview site."""
1839 raise NotImplementedError()
1840
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001841 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001842 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001843 """Fetches and applies the issue.
1844
1845 Arguments:
1846 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1847 reject: if True, reject the failed patch instead of switching to 3-way
1848 merge. Rietveld only.
1849 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1850 only.
1851 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001852 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001853 """
1854 raise NotImplementedError()
1855
1856 @staticmethod
1857 def ParseIssueURL(parsed_url):
1858 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1859 failed."""
1860 raise NotImplementedError()
1861
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001862 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001863 """Best effort check that user is authenticated with codereview server.
1864
1865 Arguments:
1866 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001867 refresh: whether to attempt to refresh credentials. Ignored if not
1868 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001869 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001870 raise NotImplementedError()
1871
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001872 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001873 """Best effort check that uploading isn't supposed to fail for predictable
1874 reasons.
1875
1876 This method should raise informative exception if uploading shouldn't
1877 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001878
1879 Arguments:
1880 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001881 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001882 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001883
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001884 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001885 """Uploads a change to codereview."""
1886 raise NotImplementedError()
1887
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001888 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001889 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001890
1891 Issue must have been already uploaded and known.
1892 """
1893 raise NotImplementedError()
1894
tandriie113dfd2016-10-11 10:20:12 -07001895 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001896 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001897 raise NotImplementedError()
1898
tandriide281ae2016-10-12 06:02:30 -07001899 def GetIssueOwner(self):
1900 raise NotImplementedError()
1901
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001902 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001903 raise NotImplementedError()
1904
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001905
1906class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001907
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001908 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001909 super(_RietveldChangelistImpl, self).__init__(changelist)
1910 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001911 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001912 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001914 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001915 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001916 self._props = None
1917 self._rpc_server = None
1918
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919 def GetCodereviewServer(self):
1920 if not self._rietveld_server:
1921 # If we're on a branch then get the server potentially associated
1922 # with that branch.
1923 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001924 self._rietveld_server = gclient_utils.UpgradeToHttps(
1925 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001926 if not self._rietveld_server:
1927 self._rietveld_server = settings.GetDefaultServerUrl()
1928 return self._rietveld_server
1929
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001930 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001931 """Best effort check that user is authenticated with Rietveld server."""
1932 if self._auth_config.use_oauth2:
1933 authenticator = auth.get_authenticator_for_host(
1934 self.GetCodereviewServer(), self._auth_config)
1935 if not authenticator.has_cached_credentials():
1936 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001937 if refresh:
1938 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001939
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001940 def EnsureCanUploadPatchset(self, force):
1941 # No checks for Rietveld because we are deprecating Rietveld.
1942 pass
1943
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001944 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001945 issue = self.GetIssue()
1946 assert issue
1947 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001948 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001949 except urllib2.HTTPError as e:
1950 if e.code == 404:
1951 DieWithError(
1952 ('\nWhile fetching the description for issue %d, received a '
1953 '404 (not found)\n'
1954 'error. It is likely that you deleted this '
1955 'issue on the server. If this is the\n'
1956 'case, please run\n\n'
1957 ' git cl issue 0\n\n'
1958 'to clear the association with the deleted issue. Then run '
1959 'this command again.') % issue)
1960 else:
1961 DieWithError(
1962 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1963 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001964 print('Warning: Failed to retrieve CL description due to network '
1965 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001966 return ''
1967
1968 def GetMostRecentPatchset(self):
1969 return self.GetIssueProperties()['patchsets'][-1]
1970
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001971 def GetIssueProperties(self):
1972 if self._props is None:
1973 issue = self.GetIssue()
1974 if not issue:
1975 self._props = {}
1976 else:
1977 self._props = self.RpcServer().get_issue_properties(issue, True)
1978 return self._props
1979
tandriie113dfd2016-10-11 10:20:12 -07001980 def CannotTriggerTryJobReason(self):
1981 props = self.GetIssueProperties()
1982 if not props:
1983 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1984 if props.get('closed'):
1985 return 'CL %s is closed' % self.GetIssue()
1986 if props.get('private'):
1987 return 'CL %s is private' % self.GetIssue()
1988 return None
1989
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001990 def GetTryJobProperties(self, patchset=None):
1991 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001992 project = (self.GetIssueProperties() or {}).get('project')
1993 return {
1994 'issue': self.GetIssue(),
1995 'patch_project': project,
1996 'patch_storage': 'rietveld',
1997 'patchset': patchset or self.GetPatchset(),
1998 'rietveld': self.GetCodereviewServer(),
1999 }
2000
tandriide281ae2016-10-12 06:02:30 -07002001 def GetIssueOwner(self):
2002 return (self.GetIssueProperties() or {}).get('owner_email')
2003
Aaron Gable636b13f2017-07-14 10:42:48 -07002004 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002005 return self.RpcServer().add_comment(self.GetIssue(), message)
2006
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002007 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002008 summary = []
2009 for message in self.GetIssueProperties().get('messages', []):
2010 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2011 summary.append(_CommentSummary(
2012 date=date,
2013 disapproval=bool(message['disapproval']),
2014 approval=bool(message['approval']),
2015 sender=message['sender'],
2016 message=message['text'],
2017 ))
2018 return summary
2019
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002020 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002021 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002022 or CQ status, assuming adherence to a common workflow.
2023
2024 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002025 * 'error' - error from review tool (including deleted issues)
2026 * 'unsent' - not sent for review
2027 * 'waiting' - waiting for review
2028 * 'reply' - waiting for owner to reply to review
2029 * 'not lgtm' - Code-Review label has been set negatively
2030 * 'lgtm' - LGTM from at least one approved reviewer
2031 * 'commit' - in the commit queue
2032 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002033 """
2034 if not self.GetIssue():
2035 return None
2036
2037 try:
2038 props = self.GetIssueProperties()
2039 except urllib2.HTTPError:
2040 return 'error'
2041
2042 if props.get('closed'):
2043 # Issue is closed.
2044 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002045 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002046 # Issue is in the commit queue.
2047 return 'commit'
2048
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002049 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002050 if not messages:
2051 # No message was sent.
2052 return 'unsent'
2053
2054 if get_approving_reviewers(props):
2055 return 'lgtm'
2056 elif get_approving_reviewers(props, disapproval=True):
2057 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002058
tandrii9d2c7a32016-06-22 03:42:45 -07002059 # Skip CQ messages that don't require owner's action.
2060 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2061 if 'Dry run:' in messages[-1]['text']:
2062 messages.pop()
2063 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2064 # This message always follows prior messages from CQ,
2065 # so skip this too.
2066 messages.pop()
2067 else:
2068 # This is probably a CQ messages warranting user attention.
2069 break
2070
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002071 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002072 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002073 return 'reply'
2074 return 'waiting'
2075
dsansomee2d6fd92016-09-08 00:10:47 -07002076 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002077 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002078
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002079 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002080 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002081
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002082 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002083 return self.SetFlags({flag: value})
2084
2085 def SetFlags(self, flags):
2086 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002087 """
phajdan.jr68598232016-08-10 03:28:28 -07002088 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002089 try:
tandrii4b233bd2016-07-06 03:50:29 -07002090 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002091 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002092 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002093 if e.code == 404:
2094 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2095 if e.code == 403:
2096 DieWithError(
2097 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002098 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002099 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002100
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002101 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002102 """Returns an upload.RpcServer() to access this review's rietveld instance.
2103 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002104 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002105 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002106 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002107 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002108 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002109
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002110 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002111 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002112 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002113
tandrii5d48c322016-08-18 16:19:37 -07002114 @classmethod
2115 def PatchsetConfigKey(cls):
2116 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002117
tandrii5d48c322016-08-18 16:19:37 -07002118 @classmethod
2119 def CodereviewServerConfigKey(cls):
2120 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002121
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002122 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002123 return self.RpcServer()
2124
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002125 def SetCQState(self, new_state):
2126 props = self.GetIssueProperties()
2127 if props.get('private'):
2128 DieWithError('Cannot set-commit on private issue')
2129
2130 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002131 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002132 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002133 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134 else:
tandrii4b233bd2016-07-06 03:50:29 -07002135 assert new_state == _CQState.DRY_RUN
2136 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002137
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002138 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002139 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002140 # PatchIssue should never be called with a dirty tree. It is up to the
2141 # caller to check this, but just in case we assert here since the
2142 # consequences of the caller not checking this could be dire.
2143 assert(not git_common.is_dirty_git_tree('apply'))
2144 assert(parsed_issue_arg.valid)
2145 self._changelist.issue = parsed_issue_arg.issue
2146 if parsed_issue_arg.hostname:
2147 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2148
skobes6468b902016-10-24 08:45:10 -07002149 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2150 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2151 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002152 try:
skobes6468b902016-10-24 08:45:10 -07002153 scm_obj.apply_patch(patchset_object)
2154 except Exception as e:
2155 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156 return 1
2157
2158 # If we had an issue, commit the current state and register the issue.
2159 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002160 self.SetIssue(self.GetIssue())
2161 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002162 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2163 'patch from issue %(i)s at patchset '
2164 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2165 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002166 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002167 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002168 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002169 return 0
2170
2171 @staticmethod
2172 def ParseIssueURL(parsed_url):
2173 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2174 return None
wychen3c1c1722016-08-04 11:46:36 -07002175 # Rietveld patch: https://domain/<number>/#ps<patchset>
2176 match = re.match(r'/(\d+)/$', parsed_url.path)
2177 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2178 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002179 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002180 issue=int(match.group(1)),
2181 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002182 hostname=parsed_url.netloc,
2183 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002184 # Typical url: https://domain/<issue_number>[/[other]]
2185 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2186 if match:
skobes6468b902016-10-24 08:45:10 -07002187 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002188 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002189 hostname=parsed_url.netloc,
2190 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2192 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2193 if match:
skobes6468b902016-10-24 08:45:10 -07002194 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002195 issue=int(match.group(1)),
2196 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002197 hostname=parsed_url.netloc,
2198 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002199 return None
2200
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002201 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002202 """Upload the patch to Rietveld."""
2203 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2204 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002205 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2206 if options.emulate_svn_auto_props:
2207 upload_args.append('--emulate_svn_auto_props')
2208
2209 change_desc = None
2210
2211 if options.email is not None:
2212 upload_args.extend(['--email', options.email])
2213
2214 if self.GetIssue():
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])
2217 if options.message:
2218 upload_args.extend(['--message', options.message])
2219 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002220 print('This branch is associated with issue %s. '
2221 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002222 else:
nodirca166002016-06-27 10:59:51 -07002223 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002224 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002225 if options.message:
2226 message = options.message
2227 else:
2228 message = CreateDescriptionFromLog(args)
2229 if options.title:
2230 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002231 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002232 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002233 change_desc.update_reviewers(options.reviewers, options.tbrs,
2234 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002235 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002236 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002237
2238 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002239 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002240 return 1
2241
2242 upload_args.extend(['--message', change_desc.description])
2243 if change_desc.get_reviewers():
2244 upload_args.append('--reviewers=%s' % ','.join(
2245 change_desc.get_reviewers()))
2246 if options.send_mail:
2247 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002248 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002249 upload_args.append('--send_mail')
2250
2251 # We check this before applying rietveld.private assuming that in
2252 # rietveld.cc only addresses which we can send private CLs to are listed
2253 # if rietveld.private is set, and so we should ignore rietveld.cc only
2254 # when --private is specified explicitly on the command line.
2255 if options.private:
2256 logging.warn('rietveld.cc is ignored since private flag is specified. '
2257 'You need to review and add them manually if necessary.')
2258 cc = self.GetCCListWithoutDefault()
2259 else:
2260 cc = self.GetCCList()
2261 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002262 if change_desc.get_cced():
2263 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002264 if cc:
2265 upload_args.extend(['--cc', cc])
2266
2267 if options.private or settings.GetDefaultPrivateFlag() == "True":
2268 upload_args.append('--private')
2269
2270 upload_args.extend(['--git_similarity', str(options.similarity)])
2271 if not options.find_copies:
2272 upload_args.extend(['--git_no_find_copies'])
2273
2274 # Include the upstream repo's URL in the change -- this is useful for
2275 # projects that have their source spread across multiple repos.
2276 remote_url = self.GetGitBaseUrlFromConfig()
2277 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002278 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2279 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2280 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002281 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002282 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002283 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284 if target_ref:
2285 upload_args.extend(['--target_ref', target_ref])
2286
2287 # Look for dependent patchsets. See crbug.com/480453 for more details.
2288 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2289 upstream_branch = ShortBranchName(upstream_branch)
2290 if remote is '.':
2291 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002292 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002293 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002294 print()
2295 print('Skipping dependency patchset upload because git config '
2296 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2297 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002298 else:
2299 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002300 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002301 auth_config=auth_config)
2302 branch_cl_issue_url = branch_cl.GetIssueURL()
2303 branch_cl_issue = branch_cl.GetIssue()
2304 branch_cl_patchset = branch_cl.GetPatchset()
2305 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2306 upload_args.extend(
2307 ['--depends_on_patchset', '%s:%s' % (
2308 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002309 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002310 '\n'
2311 'The current branch (%s) is tracking a local branch (%s) with '
2312 'an associated CL.\n'
2313 'Adding %s/#ps%s as a dependency patchset.\n'
2314 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2315 branch_cl_patchset))
2316
2317 project = settings.GetProject()
2318 if project:
2319 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002320 else:
2321 print()
2322 print('WARNING: Uploading without a project specified. Please ensure '
2323 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2324 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002325
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002326 try:
2327 upload_args = ['upload'] + upload_args + args
2328 logging.info('upload.RealMain(%s)', upload_args)
2329 issue, patchset = upload.RealMain(upload_args)
2330 issue = int(issue)
2331 patchset = int(patchset)
2332 except KeyboardInterrupt:
2333 sys.exit(1)
2334 except:
2335 # If we got an exception after the user typed a description for their
2336 # change, back up the description before re-raising.
2337 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002338 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002339 raise
2340
2341 if not self.GetIssue():
2342 self.SetIssue(issue)
2343 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 return 0
2345
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002346
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002347class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002348 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002349 # auth_config is Rietveld thing, kept here to preserve interface only.
2350 super(_GerritChangelistImpl, self).__init__(changelist)
2351 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002352 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002353 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002354 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002355 # Map from change number (issue) to its detail cache.
2356 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002357
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002358 if codereview_host is not None:
2359 assert not codereview_host.startswith('https://'), codereview_host
2360 self._gerrit_host = codereview_host
2361 self._gerrit_server = 'https://%s' % codereview_host
2362
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002363 def _GetGerritHost(self):
2364 # Lazy load of configs.
2365 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002366 if self._gerrit_host and '.' not in self._gerrit_host:
2367 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2368 # This happens for internal stuff http://crbug.com/614312.
2369 parsed = urlparse.urlparse(self.GetRemoteUrl())
2370 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002371 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002372 ' Your current remote is: %s' % self.GetRemoteUrl())
2373 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2374 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002375 return self._gerrit_host
2376
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002377 def _GetGitHost(self):
2378 """Returns git host to be used when uploading change to Gerrit."""
2379 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2380
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002381 def GetCodereviewServer(self):
2382 if not self._gerrit_server:
2383 # If we're on a branch then get the server potentially associated
2384 # with that branch.
2385 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002386 self._gerrit_server = self._GitGetBranchConfigValue(
2387 self.CodereviewServerConfigKey())
2388 if self._gerrit_server:
2389 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002390 if not self._gerrit_server:
2391 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2392 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002393 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002394 parts[0] = parts[0] + '-review'
2395 self._gerrit_host = '.'.join(parts)
2396 self._gerrit_server = 'https://%s' % self._gerrit_host
2397 return self._gerrit_server
2398
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002399 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002400 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002401 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002402
tandrii5d48c322016-08-18 16:19:37 -07002403 @classmethod
2404 def PatchsetConfigKey(cls):
2405 return 'gerritpatchset'
2406
2407 @classmethod
2408 def CodereviewServerConfigKey(cls):
2409 return 'gerritserver'
2410
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002411 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002412 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002413 if settings.GetGerritSkipEnsureAuthenticated():
2414 # For projects with unusual authentication schemes.
2415 # See http://crbug.com/603378.
2416 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002417 # Lazy-loader to identify Gerrit and Git hosts.
2418 if gerrit_util.GceAuthenticator.is_gce():
2419 return
2420 self.GetCodereviewServer()
2421 git_host = self._GetGitHost()
2422 assert self._gerrit_server and self._gerrit_host
2423 cookie_auth = gerrit_util.CookiesAuthenticator()
2424
2425 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2426 git_auth = cookie_auth.get_auth_header(git_host)
2427 if gerrit_auth and git_auth:
2428 if gerrit_auth == git_auth:
2429 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002430 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002431 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002432 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002433 ' %s\n'
2434 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002435 ' Consider running the following command:\n'
2436 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002437 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002438 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002439 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002440 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002441 cookie_auth.get_new_password_message(git_host)))
2442 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002443 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002444 return
2445 else:
2446 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002447 ([] if gerrit_auth else [self._gerrit_host]) +
2448 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002449 DieWithError('Credentials for the following hosts are required:\n'
2450 ' %s\n'
2451 'These are read from %s (or legacy %s)\n'
2452 '%s' % (
2453 '\n '.join(missing),
2454 cookie_auth.get_gitcookies_path(),
2455 cookie_auth.get_netrc_path(),
2456 cookie_auth.get_new_password_message(git_host)))
2457
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002458 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002459 if not self.GetIssue():
2460 return
2461
2462 # Warm change details cache now to avoid RPCs later, reducing latency for
2463 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002464 self._GetChangeDetail(
2465 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002466
2467 status = self._GetChangeDetail()['status']
2468 if status in ('MERGED', 'ABANDONED'):
2469 DieWithError('Change %s has been %s, new uploads are not allowed' %
2470 (self.GetIssueURL(),
2471 'submitted' if status == 'MERGED' else 'abandoned'))
2472
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002473 if gerrit_util.GceAuthenticator.is_gce():
2474 return
2475 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2476 self._GetGerritHost())
2477 if self.GetIssueOwner() == cookies_user:
2478 return
2479 logging.debug('change %s owner is %s, cookies user is %s',
2480 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002481 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002482 # so ask what Gerrit thinks of this user.
2483 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2484 if details['email'] == self.GetIssueOwner():
2485 return
2486 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002487 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002488 'as %s.\n'
2489 'Uploading may fail due to lack of permissions.' %
2490 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2491 confirm_or_exit(action='upload')
2492
2493
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002494 def _PostUnsetIssueProperties(self):
2495 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002496 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002497
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002498 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002499 class ThisIsNotRietveldIssue(object):
2500 def __nonzero__(self):
2501 # This is a hack to make presubmit_support think that rietveld is not
2502 # defined, yet still ensure that calls directly result in a decent
2503 # exception message below.
2504 return False
2505
2506 def __getattr__(self, attr):
2507 print(
2508 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2509 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002510 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002511 'or use Rietveld for codereview.\n'
2512 'See also http://crbug.com/579160.' % attr)
2513 raise NotImplementedError()
2514 return ThisIsNotRietveldIssue()
2515
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002516 def GetGerritObjForPresubmit(self):
2517 return presubmit_support.GerritAccessor(self._GetGerritHost())
2518
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002519 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002520 """Apply a rough heuristic to give a simple summary of an issue's review
2521 or CQ status, assuming adherence to a common workflow.
2522
2523 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002524 * 'error' - error from review tool (including deleted issues)
2525 * 'unsent' - no reviewers added
2526 * 'waiting' - waiting for review
2527 * 'reply' - waiting for uploader to reply to review
2528 * 'lgtm' - Code-Review label has been set
2529 * 'commit' - in the commit queue
2530 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531 """
2532 if not self.GetIssue():
2533 return None
2534
2535 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002536 data = self._GetChangeDetail([
2537 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002538 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002539 return 'error'
2540
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002541 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002542 return 'closed'
2543
Aaron Gable9ab38c62017-04-06 14:36:33 -07002544 if data['labels'].get('Commit-Queue', {}).get('approved'):
2545 # The section will have an "approved" subsection if anyone has voted
2546 # the maximum value on the label.
2547 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002548
Aaron Gable9ab38c62017-04-06 14:36:33 -07002549 if data['labels'].get('Code-Review', {}).get('approved'):
2550 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002551
2552 if not data.get('reviewers', {}).get('REVIEWER', []):
2553 return 'unsent'
2554
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002555 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002556 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2557 last_message_author = messages.pop().get('author', {})
2558 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002559 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2560 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002561 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002562 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002563 if last_message_author.get('_account_id') == owner:
2564 # Most recent message was by owner.
2565 return 'waiting'
2566 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002567 # Some reply from non-owner.
2568 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002569
2570 # Somehow there are no messages even though there are reviewers.
2571 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002572
2573 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002574 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002575 return data['revisions'][data['current_revision']]['_number']
2576
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002577 def FetchDescription(self, force=False):
2578 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2579 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002580 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002581 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002582
dsansomee2d6fd92016-09-08 00:10:47 -07002583 def UpdateDescriptionRemote(self, description, force=False):
2584 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2585 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002586 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002587 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002588 'unpublished edit. Either publish the edit in the Gerrit web UI '
2589 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002590
2591 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2592 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002593 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002594 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002595
Aaron Gable636b13f2017-07-14 10:42:48 -07002596 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002597 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002598 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002599
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002600 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002601 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002602 messages = self._GetChangeDetail(
2603 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2604 file_comments = gerrit_util.GetChangeComments(
2605 self._GetGerritHost(), self.GetIssue())
2606
2607 # Build dictionary of file comments for easy access and sorting later.
2608 # {author+date: {path: {patchset: {line: url+message}}}}
2609 comments = collections.defaultdict(
2610 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2611 for path, line_comments in file_comments.iteritems():
2612 for comment in line_comments:
2613 if comment.get('tag', '').startswith('autogenerated'):
2614 continue
2615 key = (comment['author']['email'], comment['updated'])
2616 if comment.get('side', 'REVISION') == 'PARENT':
2617 patchset = 'Base'
2618 else:
2619 patchset = 'PS%d' % comment['patch_set']
2620 line = comment.get('line', 0)
2621 url = ('https://%s/c/%s/%s/%s#%s%s' %
2622 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2623 'b' if comment.get('side') == 'PARENT' else '',
2624 str(line) if line else ''))
2625 comments[key][path][patchset][line] = (url, comment['message'])
2626
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002627 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002628 for msg in messages:
2629 # Don't bother showing autogenerated messages.
2630 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2631 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002632 # Gerrit spits out nanoseconds.
2633 assert len(msg['date'].split('.')[-1]) == 9
2634 date = datetime.datetime.strptime(msg['date'][:-3],
2635 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002636 message = msg['message']
2637 key = (msg['author']['email'], msg['date'])
2638 if key in comments:
2639 message += '\n'
2640 for path, patchsets in sorted(comments.get(key, {}).items()):
2641 if readable:
2642 message += '\n%s' % path
2643 for patchset, lines in sorted(patchsets.items()):
2644 for line, (url, content) in sorted(lines.items()):
2645 if line:
2646 line_str = 'Line %d' % line
2647 path_str = '%s:%d:' % (path, line)
2648 else:
2649 line_str = 'File comment'
2650 path_str = '%s:0:' % path
2651 if readable:
2652 message += '\n %s, %s: %s' % (patchset, line_str, url)
2653 message += '\n %s\n' % content
2654 else:
2655 message += '\n%s ' % path_str
2656 message += '\n%s\n' % content
2657
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002658 summary.append(_CommentSummary(
2659 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002660 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002661 sender=msg['author']['email'],
2662 # These could be inferred from the text messages and correlated with
2663 # Code-Review label maximum, however this is not reliable.
2664 # Leaving as is until the need arises.
2665 approval=False,
2666 disapproval=False,
2667 ))
2668 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002669
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002670 def CloseIssue(self):
2671 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2672
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002673 def SubmitIssue(self, wait_for_merge=True):
2674 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2675 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002676
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002677 def _GetChangeDetail(self, options=None, issue=None,
2678 no_cache=False):
2679 """Returns details of the issue by querying Gerrit and caching results.
2680
2681 If fresh data is needed, set no_cache=True which will clear cache and
2682 thus new data will be fetched from Gerrit.
2683 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002684 options = options or []
2685 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002686 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002687
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002688 # Optimization to avoid multiple RPCs:
2689 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2690 'CURRENT_COMMIT' not in options):
2691 options.append('CURRENT_COMMIT')
2692
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002693 # Normalize issue and options for consistent keys in cache.
2694 issue = str(issue)
2695 options = [o.upper() for o in options]
2696
2697 # Check in cache first unless no_cache is True.
2698 if no_cache:
2699 self._detail_cache.pop(issue, None)
2700 else:
2701 options_set = frozenset(options)
2702 for cached_options_set, data in self._detail_cache.get(issue, []):
2703 # Assumption: data fetched before with extra options is suitable
2704 # for return for a smaller set of options.
2705 # For example, if we cached data for
2706 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2707 # and request is for options=[CURRENT_REVISION],
2708 # THEN we can return prior cached data.
2709 if options_set.issubset(cached_options_set):
2710 return data
2711
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002712 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002713 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002714 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002715 except gerrit_util.GerritError as e:
2716 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002717 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002718 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002719
2720 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002721 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002722
agable32978d92016-11-01 12:55:02 -07002723 def _GetChangeCommit(self, issue=None):
2724 issue = issue or self.GetIssue()
2725 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002726 try:
2727 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2728 except gerrit_util.GerritError as e:
2729 if e.http_status == 404:
2730 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2731 raise
agable32978d92016-11-01 12:55:02 -07002732 return data
2733
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002734 def CMDLand(self, force, bypass_hooks, verbose):
2735 if git_common.is_dirty_git_tree('land'):
2736 return 1
tandriid60367b2016-06-22 05:25:12 -07002737 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2738 if u'Commit-Queue' in detail.get('labels', {}):
2739 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002740 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2741 'which can test and land changes for you. '
2742 'Are you sure you wish to bypass it?\n',
2743 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002744
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002745 differs = True
tandriic4344b52016-08-29 06:04:54 -07002746 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002747 # Note: git diff outputs nothing if there is no diff.
2748 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002749 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002750 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002751 if detail['current_revision'] == last_upload:
2752 differs = False
2753 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002754 print('WARNING: Local branch contents differ from latest uploaded '
2755 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002756 if differs:
2757 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002758 confirm_or_exit(
2759 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2760 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002761 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002762 elif not bypass_hooks:
2763 hook_results = self.RunHook(
2764 committing=True,
2765 may_prompt=not force,
2766 verbose=verbose,
2767 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2768 if not hook_results.should_continue():
2769 return 1
2770
2771 self.SubmitIssue(wait_for_merge=True)
2772 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002773 links = self._GetChangeCommit().get('web_links', [])
2774 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002775 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002776 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002777 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002778 return 0
2779
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002780 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002781 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002782 assert not reject
2783 assert not nocommit
2784 assert not directory
2785 assert parsed_issue_arg.valid
2786
2787 self._changelist.issue = parsed_issue_arg.issue
2788
2789 if parsed_issue_arg.hostname:
2790 self._gerrit_host = parsed_issue_arg.hostname
2791 self._gerrit_server = 'https://%s' % self._gerrit_host
2792
tandriic2405f52016-10-10 08:13:15 -07002793 try:
2794 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002795 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002796 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002797
2798 if not parsed_issue_arg.patchset:
2799 # Use current revision by default.
2800 revision_info = detail['revisions'][detail['current_revision']]
2801 patchset = int(revision_info['_number'])
2802 else:
2803 patchset = parsed_issue_arg.patchset
2804 for revision_info in detail['revisions'].itervalues():
2805 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2806 break
2807 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002808 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002809 (parsed_issue_arg.patchset, self.GetIssue()))
2810
2811 fetch_info = revision_info['fetch']['http']
2812 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002813
Aaron Gable62619a32017-06-16 08:22:09 -07002814 if force:
2815 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2816 print('Checked out commit for change %i patchset %i locally' %
2817 (parsed_issue_arg.issue, patchset))
2818 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002819 RunGit(['cherry-pick', 'FETCH_HEAD'])
2820 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002821 (parsed_issue_arg.issue, patchset))
2822 print('Note: this created a local commit which does not have '
2823 'the same hash as the one uploaded for review. This will make '
2824 'uploading changes based on top of this branch difficult.\n'
2825 'If you want to do that, use "git cl patch --force" instead.')
2826
2827 self.SetIssue(parsed_issue_arg.issue)
2828 self.SetPatchset(patchset)
2829 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2830 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2831 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002832 return 0
2833
2834 @staticmethod
2835 def ParseIssueURL(parsed_url):
2836 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2837 return None
2838 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2839 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2840 # Short urls like https://domain/<issue_number> can be used, but don't allow
2841 # specifying the patchset (you'd 404), but we allow that here.
2842 if parsed_url.path == '/':
2843 part = parsed_url.fragment
2844 else:
2845 part = parsed_url.path
2846 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2847 if match:
2848 return _ParsedIssueNumberArgument(
2849 issue=int(match.group(2)),
2850 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002851 hostname=parsed_url.netloc,
2852 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002853 return None
2854
tandrii16e0b4e2016-06-07 10:34:28 -07002855 def _GerritCommitMsgHookCheck(self, offer_removal):
2856 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2857 if not os.path.exists(hook):
2858 return
2859 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2860 # custom developer made one.
2861 data = gclient_utils.FileRead(hook)
2862 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2863 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002864 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002865 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002866 'and may interfere with it in subtle ways.\n'
2867 'We recommend you remove the commit-msg hook.')
2868 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002869 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002870 gclient_utils.rm_file_or_tree(hook)
2871 print('Gerrit commit-msg hook removed.')
2872 else:
2873 print('OK, will keep Gerrit commit-msg hook in place.')
2874
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002875 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002876 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002877 if options.squash and options.no_squash:
2878 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002879
2880 if not options.squash and not options.no_squash:
2881 # Load default for user, repo, squash=true, in this order.
2882 options.squash = settings.GetSquashGerritUploads()
2883 elif options.no_squash:
2884 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002885
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002886 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002887 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002888
Aaron Gableb56ad332017-01-06 15:24:31 -08002889 # This may be None; default fallback value is determined in logic below.
2890 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002891 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002892
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002893 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002894 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002895 if self.GetIssue():
2896 # Try to get the message from a previous upload.
2897 message = self.GetDescription()
2898 if not message:
2899 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002900 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002901 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002902 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002903 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002904 # When uploading a subsequent patchset, -m|--message is taken
2905 # as the patchset title if --title was not provided.
2906 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002907 else:
2908 default_title = RunGit(
2909 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002910 if options.force:
2911 title = default_title
2912 else:
2913 title = ask_for_data(
2914 'Title for patchset [%s]: ' % default_title) or default_title
2915 if title == default_title:
2916 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002917 change_id = self._GetChangeDetail()['change_id']
2918 while True:
2919 footer_change_ids = git_footers.get_footer_change_id(message)
2920 if footer_change_ids == [change_id]:
2921 break
2922 if not footer_change_ids:
2923 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002924 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002925 continue
2926 # There is already a valid footer but with different or several ids.
2927 # Doing this automatically is non-trivial as we don't want to lose
2928 # existing other footers, yet we want to append just 1 desired
2929 # Change-Id. Thus, just create a new footer, but let user verify the
2930 # new description.
2931 message = '%s\n\nChange-Id: %s' % (message, change_id)
2932 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002933 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002934 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002935 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002936 'Please, check the proposed correction to the description, '
2937 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2938 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2939 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002940 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002941 if not options.force:
2942 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002943 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002944 message = change_desc.description
2945 if not message:
2946 DieWithError("Description is empty. Aborting...")
2947 # Continue the while loop.
2948 # Sanity check of this code - we should end up with proper message
2949 # footer.
2950 assert [change_id] == git_footers.get_footer_change_id(message)
2951 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002952 else: # if not self.GetIssue()
2953 if options.message:
2954 message = options.message
2955 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002956 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002957 if options.title:
2958 message = options.title + '\n\n' + message
2959 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002960
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002961 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002962 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002963 # On first upload, patchset title is always this string, while
2964 # --title flag gets converted to first line of message.
2965 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002966 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002967 if not change_desc.description:
2968 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002969 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002970 if len(change_ids) > 1:
2971 DieWithError('too many Change-Id footers, at most 1 allowed.')
2972 if not change_ids:
2973 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002974 change_desc.set_description(git_footers.add_footer_change_id(
2975 change_desc.description,
2976 GenerateGerritChangeId(change_desc.description)))
2977 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002978 assert len(change_ids) == 1
2979 change_id = change_ids[0]
2980
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002981 if options.reviewers or options.tbrs or options.add_owners_to:
2982 change_desc.update_reviewers(options.reviewers, options.tbrs,
2983 options.add_owners_to, change)
2984
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002985 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002986 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2987 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002988 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2989 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002990 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002991 else:
2992 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002993 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002994 if not change_desc.description:
2995 DieWithError("Description is empty. Aborting...")
2996
2997 if not git_footers.get_footer_change_id(change_desc.description):
2998 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002999 change_desc.set_description(
3000 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003001 if options.reviewers or options.tbrs or options.add_owners_to:
3002 change_desc.update_reviewers(options.reviewers, options.tbrs,
3003 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003004 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003005 # For no-squash mode, we assume the remote called "origin" is the one we
3006 # want. It is not worthwhile to support different workflows for
3007 # no-squash mode.
3008 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003009 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3010
3011 assert change_desc
3012 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3013 ref_to_push)]).splitlines()
3014 if len(commits) > 1:
3015 print('WARNING: This will upload %d commits. Run the following command '
3016 'to see which commits will be uploaded: ' % len(commits))
3017 print('git log %s..%s' % (parent, ref_to_push))
3018 print('You can also use `git squash-branch` to squash these into a '
3019 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003020 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003021
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003022 if options.reviewers or options.tbrs or options.add_owners_to:
3023 change_desc.update_reviewers(options.reviewers, options.tbrs,
3024 options.add_owners_to, change)
3025
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003026 # Extra options that can be specified at push time. Doc:
3027 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003028 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003029
Aaron Gable844cf292017-06-28 11:32:59 -07003030 # By default, new changes are started in WIP mode, and subsequent patchsets
3031 # don't send email. At any time, passing --send-mail will mark the change
3032 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003033 if options.send_mail:
3034 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003035 refspec_opts.append('notify=ALL')
Aaron Gableafd52772017-06-27 16:40:10 -07003036 else:
Aaron Gable844cf292017-06-28 11:32:59 -07003037 if not self.GetIssue():
3038 refspec_opts.append('wip')
3039 else:
3040 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003041
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003042 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003043 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003044
Aaron Gable9b713dd2016-12-14 16:04:21 -08003045 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003046 if not re.match(r'^[\w ]+$', title):
3047 title = re.sub(r'[^\w ]', '', title)
3048 if not automatic_title:
3049 print('WARNING: Patchset title may only contain alphanumeric chars '
3050 'and spaces. You can edit it in the UI. '
3051 'See https://crbug.com/663787.\n'
3052 'Cleaned up title: %s' % title)
3053 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3054 # reverse on its side.
3055 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003056
agablec6787972016-09-09 16:13:34 -07003057 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003058 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003059
rmistry9eadede2016-09-19 11:22:43 -07003060 if options.topic:
3061 # Documentation on Gerrit topics is here:
3062 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003063 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003064
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003065 refspec_suffix = ''
3066 if refspec_opts:
3067 refspec_suffix = '%' + ','.join(refspec_opts)
3068 assert ' ' not in refspec_suffix, (
3069 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3070 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3071
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003072 try:
3073 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003074 ['git', 'push', self.GetRemoteUrl(), refspec],
3075 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003076 # Flush after every line: useful for seeing progress when running as
3077 # recipe.
3078 filter_fn=lambda _: sys.stdout.flush())
3079 except subprocess2.CalledProcessError:
3080 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003081 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003082 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003083 'credential problems:\n'
3084 ' git cl creds-check\n',
3085 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003086
3087 if options.squash:
3088 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3089 change_numbers = [m.group(1)
3090 for m in map(regex.match, push_stdout.splitlines())
3091 if m]
3092 if len(change_numbers) != 1:
3093 DieWithError(
3094 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003095 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003096 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003097 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003098
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003099 reviewers = sorted(change_desc.get_reviewers())
3100
tandrii88189772016-09-29 04:29:57 -07003101 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003102 if not options.private:
3103 cc = self.GetCCList().split(',')
3104 else:
3105 cc = []
tandrii88189772016-09-29 04:29:57 -07003106 if options.cc:
3107 cc.extend(options.cc)
3108 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003109 if change_desc.get_cced():
3110 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003111
3112 gerrit_util.AddReviewers(
3113 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3114 notify=bool(options.send_mail))
3115
Aaron Gablefd238082017-06-07 13:42:34 -07003116 if change_desc.get_reviewers(tbr_only=True):
3117 print('Adding self-LGTM (Code-Review +1) because of TBRs.')
3118 gerrit_util.SetReview(
3119 self._GetGerritHost(), self.GetIssue(),
Aaron Gablefc62f762017-07-17 11:12:07 -07003120 msg='Self-approving for TBR', labels={'Code-Review': 1})
Aaron Gablefd238082017-06-07 13:42:34 -07003121
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003122 return 0
3123
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003124 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3125 change_desc):
3126 """Computes parent of the generated commit to be uploaded to Gerrit.
3127
3128 Returns revision or a ref name.
3129 """
3130 if custom_cl_base:
3131 # Try to avoid creating additional unintended CLs when uploading, unless
3132 # user wants to take this risk.
3133 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3134 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3135 local_ref_of_target_remote])
3136 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003137 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003138 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3139 'If you proceed with upload, more than 1 CL may be created by '
3140 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3141 'If you are certain that specified base `%s` has already been '
3142 'uploaded to Gerrit as another CL, you may proceed.\n' %
3143 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3144 if not force:
3145 confirm_or_exit(
3146 'Do you take responsibility for cleaning up potential mess '
3147 'resulting from proceeding with upload?',
3148 action='upload')
3149 return custom_cl_base
3150
Aaron Gablef97e33d2017-03-30 15:44:27 -07003151 if remote != '.':
3152 return self.GetCommonAncestorWithUpstream()
3153
3154 # If our upstream branch is local, we base our squashed commit on its
3155 # squashed version.
3156 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3157
Aaron Gablef97e33d2017-03-30 15:44:27 -07003158 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003159 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003160
3161 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003162 # TODO(tandrii): consider checking parent change in Gerrit and using its
3163 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3164 # the tree hash of the parent branch. The upside is less likely bogus
3165 # requests to reupload parent change just because it's uploadhash is
3166 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003167 parent = RunGit(['config',
3168 'branch.%s.gerritsquashhash' % upstream_branch_name],
3169 error_ok=True).strip()
3170 # Verify that the upstream branch has been uploaded too, otherwise
3171 # Gerrit will create additional CLs when uploading.
3172 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3173 RunGitSilent(['rev-parse', parent + ':'])):
3174 DieWithError(
3175 '\nUpload upstream branch %s first.\n'
3176 'It is likely that this branch has been rebased since its last '
3177 'upload, so you just need to upload it again.\n'
3178 '(If you uploaded it with --no-squash, then branch dependencies '
3179 'are not supported, and you should reupload with --squash.)'
3180 % upstream_branch_name,
3181 change_desc)
3182 return parent
3183
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003184 def _AddChangeIdToCommitMessage(self, options, args):
3185 """Re-commits using the current message, assumes the commit hook is in
3186 place.
3187 """
3188 log_desc = options.message or CreateDescriptionFromLog(args)
3189 git_command = ['commit', '--amend', '-m', log_desc]
3190 RunGit(git_command)
3191 new_log_desc = CreateDescriptionFromLog(args)
3192 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003193 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003194 return new_log_desc
3195 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003196 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003197
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003198 def SetCQState(self, new_state):
3199 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003200 vote_map = {
3201 _CQState.NONE: 0,
3202 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003203 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003204 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003205 labels = {'Commit-Queue': vote_map[new_state]}
3206 notify = False if new_state == _CQState.DRY_RUN else None
3207 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3208 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003209
tandriie113dfd2016-10-11 10:20:12 -07003210 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003211 try:
3212 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003213 except GerritChangeNotExists:
3214 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003215
3216 if data['status'] in ('ABANDONED', 'MERGED'):
3217 return 'CL %s is closed' % self.GetIssue()
3218
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003219 def GetTryJobProperties(self, patchset=None):
3220 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003221 data = self._GetChangeDetail(['ALL_REVISIONS'])
3222 patchset = int(patchset or self.GetPatchset())
3223 assert patchset
3224 revision_data = None # Pylint wants it to be defined.
3225 for revision_data in data['revisions'].itervalues():
3226 if int(revision_data['_number']) == patchset:
3227 break
3228 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003229 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003230 (patchset, self.GetIssue()))
3231 return {
3232 'patch_issue': self.GetIssue(),
3233 'patch_set': patchset or self.GetPatchset(),
3234 'patch_project': data['project'],
3235 'patch_storage': 'gerrit',
3236 'patch_ref': revision_data['fetch']['http']['ref'],
3237 'patch_repository_url': revision_data['fetch']['http']['url'],
3238 'patch_gerrit_url': self.GetCodereviewServer(),
3239 }
tandriie113dfd2016-10-11 10:20:12 -07003240
tandriide281ae2016-10-12 06:02:30 -07003241 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003242 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003243
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003244
3245_CODEREVIEW_IMPLEMENTATIONS = {
3246 'rietveld': _RietveldChangelistImpl,
3247 'gerrit': _GerritChangelistImpl,
3248}
3249
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003250
iannuccie53c9352016-08-17 14:40:40 -07003251def _add_codereview_issue_select_options(parser, extra=""):
3252 _add_codereview_select_options(parser)
3253
3254 text = ('Operate on this issue number instead of the current branch\'s '
3255 'implicit issue.')
3256 if extra:
3257 text += ' '+extra
3258 parser.add_option('-i', '--issue', type=int, help=text)
3259
3260
3261def _process_codereview_issue_select_options(parser, options):
3262 _process_codereview_select_options(parser, options)
3263 if options.issue is not None and not options.forced_codereview:
3264 parser.error('--issue must be specified with either --rietveld or --gerrit')
3265
3266
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003267def _add_codereview_select_options(parser):
3268 """Appends --gerrit and --rietveld options to force specific codereview."""
3269 parser.codereview_group = optparse.OptionGroup(
3270 parser, 'EXPERIMENTAL! Codereview override options')
3271 parser.add_option_group(parser.codereview_group)
3272 parser.codereview_group.add_option(
3273 '--gerrit', action='store_true',
3274 help='Force the use of Gerrit for codereview')
3275 parser.codereview_group.add_option(
3276 '--rietveld', action='store_true',
3277 help='Force the use of Rietveld for codereview')
3278
3279
3280def _process_codereview_select_options(parser, options):
3281 if options.gerrit and options.rietveld:
3282 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3283 options.forced_codereview = None
3284 if options.gerrit:
3285 options.forced_codereview = 'gerrit'
3286 elif options.rietveld:
3287 options.forced_codereview = 'rietveld'
3288
3289
tandriif9aefb72016-07-01 09:06:51 -07003290def _get_bug_line_values(default_project, bugs):
3291 """Given default_project and comma separated list of bugs, yields bug line
3292 values.
3293
3294 Each bug can be either:
3295 * a number, which is combined with default_project
3296 * string, which is left as is.
3297
3298 This function may produce more than one line, because bugdroid expects one
3299 project per line.
3300
3301 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3302 ['v8:123', 'chromium:789']
3303 """
3304 default_bugs = []
3305 others = []
3306 for bug in bugs.split(','):
3307 bug = bug.strip()
3308 if bug:
3309 try:
3310 default_bugs.append(int(bug))
3311 except ValueError:
3312 others.append(bug)
3313
3314 if default_bugs:
3315 default_bugs = ','.join(map(str, default_bugs))
3316 if default_project:
3317 yield '%s:%s' % (default_project, default_bugs)
3318 else:
3319 yield default_bugs
3320 for other in sorted(others):
3321 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3322 yield other
3323
3324
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003325class ChangeDescription(object):
3326 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003327 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003328 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003329 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003330 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003331
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003332 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003333 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003334
agable@chromium.org42c20792013-09-12 17:34:49 +00003335 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003336 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003337 return '\n'.join(self._description_lines)
3338
3339 def set_description(self, desc):
3340 if isinstance(desc, basestring):
3341 lines = desc.splitlines()
3342 else:
3343 lines = [line.rstrip() for line in desc]
3344 while lines and not lines[0]:
3345 lines.pop(0)
3346 while lines and not lines[-1]:
3347 lines.pop(-1)
3348 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003349
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003350 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3351 """Rewrites the R=/TBR= line(s) as a single line each.
3352
3353 Args:
3354 reviewers (list(str)) - list of additional emails to use for reviewers.
3355 tbrs (list(str)) - list of additional emails to use for TBRs.
3356 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3357 the change that are missing OWNER coverage. If this is not None, you
3358 must also pass a value for `change`.
3359 change (Change) - The Change that should be used for OWNERS lookups.
3360 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003361 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003362 assert isinstance(tbrs, list), tbrs
3363
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003364 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003365 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003366
3367 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003368 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003369
3370 reviewers = set(reviewers)
3371 tbrs = set(tbrs)
3372 LOOKUP = {
3373 'TBR': tbrs,
3374 'R': reviewers,
3375 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003376
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003377 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003378 regexp = re.compile(self.R_LINE)
3379 matches = [regexp.match(line) for line in self._description_lines]
3380 new_desc = [l for i, l in enumerate(self._description_lines)
3381 if not matches[i]]
3382 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003383
agable@chromium.org42c20792013-09-12 17:34:49 +00003384 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003385
3386 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003387 for match in matches:
3388 if not match:
3389 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003390 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3391
3392 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003393 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003394 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003395 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003396 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003397 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003398 LOOKUP[add_owners_to].update(
3399 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003400
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003401 # If any folks ended up in both groups, remove them from tbrs.
3402 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003403
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003404 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3405 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003406
3407 # Put the new lines in the description where the old first R= line was.
3408 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3409 if 0 <= line_loc < len(self._description_lines):
3410 if new_tbr_line:
3411 self._description_lines.insert(line_loc, new_tbr_line)
3412 if new_r_line:
3413 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003414 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003415 if new_r_line:
3416 self.append_footer(new_r_line)
3417 if new_tbr_line:
3418 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003419
Aaron Gable3a16ed12017-03-23 10:51:55 -07003420 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003421 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003422 self.set_description([
3423 '# Enter a description of the change.',
3424 '# This will be displayed on the codereview site.',
3425 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003426 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003427 '--------------------',
3428 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003429
agable@chromium.org42c20792013-09-12 17:34:49 +00003430 regexp = re.compile(self.BUG_LINE)
3431 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003432 prefix = settings.GetBugPrefix()
3433 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003434 if git_footer:
3435 self.append_footer('Bug: %s' % ', '.join(values))
3436 else:
3437 for value in values:
3438 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003439
agable@chromium.org42c20792013-09-12 17:34:49 +00003440 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003441 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003442 if not content:
3443 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003444 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003445
3446 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003447 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3448 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003449 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003450 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003451
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003452 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003453 """Adds a footer line to the description.
3454
3455 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3456 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3457 that Gerrit footers are always at the end.
3458 """
3459 parsed_footer_line = git_footers.parse_footer(line)
3460 if parsed_footer_line:
3461 # Line is a gerrit footer in the form: Footer-Key: any value.
3462 # Thus, must be appended observing Gerrit footer rules.
3463 self.set_description(
3464 git_footers.add_footer(self.description,
3465 key=parsed_footer_line[0],
3466 value=parsed_footer_line[1]))
3467 return
3468
3469 if not self._description_lines:
3470 self._description_lines.append(line)
3471 return
3472
3473 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3474 if gerrit_footers:
3475 # git_footers.split_footers ensures that there is an empty line before
3476 # actual (gerrit) footers, if any. We have to keep it that way.
3477 assert top_lines and top_lines[-1] == ''
3478 top_lines, separator = top_lines[:-1], top_lines[-1:]
3479 else:
3480 separator = [] # No need for separator if there are no gerrit_footers.
3481
3482 prev_line = top_lines[-1] if top_lines else ''
3483 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3484 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3485 top_lines.append('')
3486 top_lines.append(line)
3487 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003488
tandrii99a72f22016-08-17 14:33:24 -07003489 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003490 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003491 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003492 reviewers = [match.group(2).strip()
3493 for match in matches
3494 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003495 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003496
bradnelsond975b302016-10-23 12:20:23 -07003497 def get_cced(self):
3498 """Retrieves the list of reviewers."""
3499 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3500 cced = [match.group(2).strip() for match in matches if match]
3501 return cleanup_list(cced)
3502
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003503 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3504 """Updates this commit description given the parent.
3505
3506 This is essentially what Gnumbd used to do.
3507 Consult https://goo.gl/WMmpDe for more details.
3508 """
3509 assert parent_msg # No, orphan branch creation isn't supported.
3510 assert parent_hash
3511 assert dest_ref
3512 parent_footer_map = git_footers.parse_footers(parent_msg)
3513 # This will also happily parse svn-position, which GnumbD is no longer
3514 # supporting. While we'd generate correct footers, the verifier plugin
3515 # installed in Gerrit will block such commit (ie git push below will fail).
3516 parent_position = git_footers.get_position(parent_footer_map)
3517
3518 # Cherry-picks may have last line obscuring their prior footers,
3519 # from git_footers perspective. This is also what Gnumbd did.
3520 cp_line = None
3521 if (self._description_lines and
3522 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3523 cp_line = self._description_lines.pop()
3524
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003525 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003526
3527 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3528 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003529 for i, line in enumerate(footer_lines):
3530 k, v = git_footers.parse_footer(line) or (None, None)
3531 if k and k.startswith('Cr-'):
3532 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003533
3534 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003535 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003536 if parent_position[0] == dest_ref:
3537 # Same branch as parent.
3538 number = int(parent_position[1]) + 1
3539 else:
3540 number = 1 # New branch, and extra lineage.
3541 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3542 int(parent_position[1])))
3543
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003544 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3545 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003546
3547 self._description_lines = top_lines
3548 if cp_line:
3549 self._description_lines.append(cp_line)
3550 if self._description_lines[-1] != '':
3551 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003552 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003553
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003554
Aaron Gablea1bab272017-04-11 16:38:18 -07003555def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003556 """Retrieves the reviewers that approved a CL from the issue properties with
3557 messages.
3558
3559 Note that the list may contain reviewers that are not committer, thus are not
3560 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003561
3562 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003563 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003564 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003565 return sorted(
3566 set(
3567 message['sender']
3568 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003569 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003570 )
3571 )
3572
3573
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003574def FindCodereviewSettingsFile(filename='codereview.settings'):
3575 """Finds the given file starting in the cwd and going up.
3576
3577 Only looks up to the top of the repository unless an
3578 'inherit-review-settings-ok' file exists in the root of the repository.
3579 """
3580 inherit_ok_file = 'inherit-review-settings-ok'
3581 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003582 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003583 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3584 root = '/'
3585 while True:
3586 if filename in os.listdir(cwd):
3587 if os.path.isfile(os.path.join(cwd, filename)):
3588 return open(os.path.join(cwd, filename))
3589 if cwd == root:
3590 break
3591 cwd = os.path.dirname(cwd)
3592
3593
3594def LoadCodereviewSettingsFromFile(fileobj):
3595 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003596 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003597
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003598 def SetProperty(name, setting, unset_error_ok=False):
3599 fullname = 'rietveld.' + name
3600 if setting in keyvals:
3601 RunGit(['config', fullname, keyvals[setting]])
3602 else:
3603 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3604
tandrii48df5812016-10-17 03:55:37 -07003605 if not keyvals.get('GERRIT_HOST', False):
3606 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003607 # Only server setting is required. Other settings can be absent.
3608 # In that case, we ignore errors raised during option deletion attempt.
3609 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003610 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003611 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3612 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003613 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003614 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3615 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003616 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003617 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3618 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003619
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003620 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003621 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003622
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003623 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003624 RunGit(['config', 'gerrit.squash-uploads',
3625 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003626
tandrii@chromium.org28253532016-04-14 13:46:56 +00003627 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003628 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003629 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3630
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003631 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003632 # should be of the form
3633 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3634 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003635 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3636 keyvals['ORIGIN_URL_CONFIG']])
3637
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003638
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003639def urlretrieve(source, destination):
3640 """urllib is broken for SSL connections via a proxy therefore we
3641 can't use urllib.urlretrieve()."""
3642 with open(destination, 'w') as f:
3643 f.write(urllib2.urlopen(source).read())
3644
3645
ukai@chromium.org712d6102013-11-27 00:52:58 +00003646def hasSheBang(fname):
3647 """Checks fname is a #! script."""
3648 with open(fname) as f:
3649 return f.read(2).startswith('#!')
3650
3651
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003652# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3653def DownloadHooks(*args, **kwargs):
3654 pass
3655
3656
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003657def DownloadGerritHook(force):
3658 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003659
3660 Args:
3661 force: True to update hooks. False to install hooks if not present.
3662 """
3663 if not settings.GetIsGerrit():
3664 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003665 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003666 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3667 if not os.access(dst, os.X_OK):
3668 if os.path.exists(dst):
3669 if not force:
3670 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003671 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003672 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003673 if not hasSheBang(dst):
3674 DieWithError('Not a script: %s\n'
3675 'You need to download from\n%s\n'
3676 'into .git/hooks/commit-msg and '
3677 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003678 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3679 except Exception:
3680 if os.path.exists(dst):
3681 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003682 DieWithError('\nFailed to download hooks.\n'
3683 'You need to download from\n%s\n'
3684 'into .git/hooks/commit-msg and '
3685 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003686
3687
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003688def GetRietveldCodereviewSettingsInteractively():
3689 """Prompt the user for settings."""
3690 server = settings.GetDefaultServerUrl(error_ok=True)
3691 prompt = 'Rietveld server (host[:port])'
3692 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3693 newserver = ask_for_data(prompt + ':')
3694 if not server and not newserver:
3695 newserver = DEFAULT_SERVER
3696 if newserver:
3697 newserver = gclient_utils.UpgradeToHttps(newserver)
3698 if newserver != server:
3699 RunGit(['config', 'rietveld.server', newserver])
3700
3701 def SetProperty(initial, caption, name, is_url):
3702 prompt = caption
3703 if initial:
3704 prompt += ' ("x" to clear) [%s]' % initial
3705 new_val = ask_for_data(prompt + ':')
3706 if new_val == 'x':
3707 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3708 elif new_val:
3709 if is_url:
3710 new_val = gclient_utils.UpgradeToHttps(new_val)
3711 if new_val != initial:
3712 RunGit(['config', 'rietveld.' + name, new_val])
3713
3714 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3715 SetProperty(settings.GetDefaultPrivateFlag(),
3716 'Private flag (rietveld only)', 'private', False)
3717 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3718 'tree-status-url', False)
3719 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3720 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3721 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3722 'run-post-upload-hook', False)
3723
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003724
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003725class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003726 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003727
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003728 _GOOGLESOURCE = 'googlesource.com'
3729
3730 def __init__(self):
3731 # Cached list of [host, identity, source], where source is either
3732 # .gitcookies or .netrc.
3733 self._all_hosts = None
3734
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003735 def ensure_configured_gitcookies(self):
3736 """Runs checks and suggests fixes to make git use .gitcookies from default
3737 path."""
3738 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3739 configured_path = RunGitSilent(
3740 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003741 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003742 if configured_path:
3743 self._ensure_default_gitcookies_path(configured_path, default)
3744 else:
3745 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003746
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003747 @staticmethod
3748 def _ensure_default_gitcookies_path(configured_path, default_path):
3749 assert configured_path
3750 if configured_path == default_path:
3751 print('git is already configured to use your .gitcookies from %s' %
3752 configured_path)
3753 return
3754
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003755 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003756 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3757 (configured_path, default_path))
3758
3759 if not os.path.exists(configured_path):
3760 print('However, your configured .gitcookies file is missing.')
3761 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3762 action='reconfigure')
3763 RunGit(['config', '--global', 'http.cookiefile', default_path])
3764 return
3765
3766 if os.path.exists(default_path):
3767 print('WARNING: default .gitcookies file already exists %s' %
3768 default_path)
3769 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3770 default_path)
3771
3772 confirm_or_exit('Move existing .gitcookies to default location?',
3773 action='move')
3774 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003775 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003776 print('Moved and reconfigured git to use .gitcookies from %s' %
3777 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003778
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003779 @staticmethod
3780 def _configure_gitcookies_path(default_path):
3781 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3782 if os.path.exists(netrc_path):
3783 print('You seem to be using outdated .netrc for git credentials: %s' %
3784 netrc_path)
3785 print('This tool will guide you through setting up recommended '
3786 '.gitcookies store for git credentials.\n'
3787 '\n'
3788 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3789 ' git config --global --unset http.cookiefile\n'
3790 ' mv %s %s.backup\n\n' % (default_path, default_path))
3791 confirm_or_exit(action='setup .gitcookies')
3792 RunGit(['config', '--global', 'http.cookiefile', default_path])
3793 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003794
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003795 def get_hosts_with_creds(self, include_netrc=False):
3796 if self._all_hosts is None:
3797 a = gerrit_util.CookiesAuthenticator()
3798 self._all_hosts = [
3799 (h, u, s)
3800 for h, u, s in itertools.chain(
3801 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3802 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3803 )
3804 if h.endswith(self._GOOGLESOURCE)
3805 ]
3806
3807 if include_netrc:
3808 return self._all_hosts
3809 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3810
3811 def print_current_creds(self, include_netrc=False):
3812 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3813 if not hosts:
3814 print('No Git/Gerrit credentials found')
3815 return
3816 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3817 header = [('Host', 'User', 'Which file'),
3818 ['=' * l for l in lengths]]
3819 for row in (header + hosts):
3820 print('\t'.join((('%%+%ds' % l) % s)
3821 for l, s in zip(lengths, row)))
3822
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003823 @staticmethod
3824 def _parse_identity(identity):
3825 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3826 username, domain = identity.split('.', 1)
3827 if username.startswith('git-'):
3828 username = username[len('git-'):]
3829 return username, domain
3830
3831 def _get_usernames_of_domain(self, domain):
3832 """Returns list of usernames referenced by .gitcookies in a given domain."""
3833 identities_by_domain = {}
3834 for _, identity, _ in self.get_hosts_with_creds():
3835 username, domain = self._parse_identity(identity)
3836 identities_by_domain.setdefault(domain, []).append(username)
3837 return identities_by_domain.get(domain)
3838
3839 def _canonical_git_googlesource_host(self, host):
3840 """Normalizes Gerrit hosts (with '-review') to Git host."""
3841 assert host.endswith(self._GOOGLESOURCE)
3842 # Prefix doesn't include '.' at the end.
3843 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3844 if prefix.endswith('-review'):
3845 prefix = prefix[:-len('-review')]
3846 return prefix + '.' + self._GOOGLESOURCE
3847
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003848 def _canonical_gerrit_googlesource_host(self, host):
3849 git_host = self._canonical_git_googlesource_host(host)
3850 prefix = git_host.split('.', 1)[0]
3851 return prefix + '-review.' + self._GOOGLESOURCE
3852
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003853 def _get_counterpart_host(self, host):
3854 assert host.endswith(self._GOOGLESOURCE)
3855 git = self._canonical_git_googlesource_host(host)
3856 gerrit = self._canonical_gerrit_googlesource_host(git)
3857 return git if gerrit == host else gerrit
3858
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003859 def has_generic_host(self):
3860 """Returns whether generic .googlesource.com has been configured.
3861
3862 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3863 """
3864 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3865 if host == '.' + self._GOOGLESOURCE:
3866 return True
3867 return False
3868
3869 def _get_git_gerrit_identity_pairs(self):
3870 """Returns map from canonic host to pair of identities (Git, Gerrit).
3871
3872 One of identities might be None, meaning not configured.
3873 """
3874 host_to_identity_pairs = {}
3875 for host, identity, _ in self.get_hosts_with_creds():
3876 canonical = self._canonical_git_googlesource_host(host)
3877 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3878 idx = 0 if canonical == host else 1
3879 pair[idx] = identity
3880 return host_to_identity_pairs
3881
3882 def get_partially_configured_hosts(self):
3883 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003884 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3885 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3886 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003887
3888 def get_conflicting_hosts(self):
3889 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003890 host
3891 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003892 if None not in (i1, i2) and i1 != i2)
3893
3894 def get_duplicated_hosts(self):
3895 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3896 return set(host for host, count in counters.iteritems() if count > 1)
3897
3898 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3899 'chromium.googlesource.com': 'chromium.org',
3900 'chrome-internal.googlesource.com': 'google.com',
3901 }
3902
3903 def get_hosts_with_wrong_identities(self):
3904 """Finds hosts which **likely** reference wrong identities.
3905
3906 Note: skips hosts which have conflicting identities for Git and Gerrit.
3907 """
3908 hosts = set()
3909 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3910 pair = self._get_git_gerrit_identity_pairs().get(host)
3911 if pair and pair[0] == pair[1]:
3912 _, domain = self._parse_identity(pair[0])
3913 if domain != expected:
3914 hosts.add(host)
3915 return hosts
3916
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003917 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003918 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003919 hosts = sorted(hosts)
3920 assert hosts
3921 if extra_column_func is None:
3922 extras = [''] * len(hosts)
3923 else:
3924 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003925 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3926 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003927 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003928 lines.append(tmpl % he)
3929 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003930
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003931 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003932 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003933 yield ('.googlesource.com wildcard record detected',
3934 ['Chrome Infrastructure team recommends to list full host names '
3935 'explicitly.'],
3936 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003937
3938 dups = self.get_duplicated_hosts()
3939 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003940 yield ('The following hosts were defined twice',
3941 self._format_hosts(dups),
3942 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003943
3944 partial = self.get_partially_configured_hosts()
3945 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003946 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3947 'These hosts are missing',
3948 self._format_hosts(partial, lambda host: 'but %s defined' %
3949 self._get_counterpart_host(host)),
3950 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003951
3952 conflicting = self.get_conflicting_hosts()
3953 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003954 yield ('The following Git hosts have differing credentials from their '
3955 'Gerrit counterparts',
3956 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3957 tuple(self._get_git_gerrit_identity_pairs()[host])),
3958 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003959
3960 wrong = self.get_hosts_with_wrong_identities()
3961 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003962 yield ('These hosts likely use wrong identity',
3963 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3964 (self._get_git_gerrit_identity_pairs()[host][0],
3965 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3966 wrong)
3967
3968 def find_and_report_problems(self):
3969 """Returns True if there was at least one problem, else False."""
3970 found = False
3971 bad_hosts = set()
3972 for title, sublines, hosts in self._find_problems():
3973 if not found:
3974 found = True
3975 print('\n\n.gitcookies problem report:\n')
3976 bad_hosts.update(hosts or [])
3977 print(' %s%s' % (title , (':' if sublines else '')))
3978 if sublines:
3979 print()
3980 print(' %s' % '\n '.join(sublines))
3981 print()
3982
3983 if bad_hosts:
3984 assert found
3985 print(' You can manually remove corresponding lines in your %s file and '
3986 'visit the following URLs with correct account to generate '
3987 'correct credential lines:\n' %
3988 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
3989 print(' %s' % '\n '.join(sorted(set(
3990 gerrit_util.CookiesAuthenticator().get_new_password_url(
3991 self._canonical_git_googlesource_host(host))
3992 for host in bad_hosts
3993 ))))
3994 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003995
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003996
3997def CMDcreds_check(parser, args):
3998 """Checks credentials and suggests changes."""
3999 _, _ = parser.parse_args(args)
4000
4001 if gerrit_util.GceAuthenticator.is_gce():
4002 DieWithError('this command is not designed for GCE, are you on a bot?')
4003
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004004 checker = _GitCookiesChecker()
4005 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004006
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004007 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004008 checker.print_current_creds(include_netrc=True)
4009
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004010 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004011 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004012 return 0
4013 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004014
4015
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004016@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004017def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004018 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004019
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004020 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004021 # TODO(tandrii): remove this once we switch to Gerrit.
4022 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004023 parser.add_option('--activate-update', action='store_true',
4024 help='activate auto-updating [rietveld] section in '
4025 '.git/config')
4026 parser.add_option('--deactivate-update', action='store_true',
4027 help='deactivate auto-updating [rietveld] section in '
4028 '.git/config')
4029 options, args = parser.parse_args(args)
4030
4031 if options.deactivate_update:
4032 RunGit(['config', 'rietveld.autoupdate', 'false'])
4033 return
4034
4035 if options.activate_update:
4036 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4037 return
4038
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004039 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004040 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004041 return 0
4042
4043 url = args[0]
4044 if not url.endswith('codereview.settings'):
4045 url = os.path.join(url, 'codereview.settings')
4046
4047 # Load code review settings and download hooks (if available).
4048 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4049 return 0
4050
4051
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004052def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004053 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004054 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4055 branch = ShortBranchName(branchref)
4056 _, args = parser.parse_args(args)
4057 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004058 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004059 return RunGit(['config', 'branch.%s.base-url' % branch],
4060 error_ok=False).strip()
4061 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004062 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004063 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4064 error_ok=False).strip()
4065
4066
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004067def color_for_status(status):
4068 """Maps a Changelist status to color, for CMDstatus and other tools."""
4069 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004070 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004071 'waiting': Fore.BLUE,
4072 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004073 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004074 'lgtm': Fore.GREEN,
4075 'commit': Fore.MAGENTA,
4076 'closed': Fore.CYAN,
4077 'error': Fore.WHITE,
4078 }.get(status, Fore.WHITE)
4079
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004080
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004081def get_cl_statuses(changes, fine_grained, max_processes=None):
4082 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004083
4084 If fine_grained is true, this will fetch CL statuses from the server.
4085 Otherwise, simply indicate if there's a matching url for the given branches.
4086
4087 If max_processes is specified, it is used as the maximum number of processes
4088 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4089 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004090
4091 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004092 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004093 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004094 upload.verbosity = 0
4095
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004096 if not changes:
4097 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004098
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004099 if not fine_grained:
4100 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004101 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004102 for cl in changes:
4103 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004104 return
4105
4106 # First, sort out authentication issues.
4107 logging.debug('ensuring credentials exist')
4108 for cl in changes:
4109 cl.EnsureAuthenticated(force=False, refresh=True)
4110
4111 def fetch(cl):
4112 try:
4113 return (cl, cl.GetStatus())
4114 except:
4115 # See http://crbug.com/629863.
4116 logging.exception('failed to fetch status for %s:', cl)
4117 raise
4118
4119 threads_count = len(changes)
4120 if max_processes:
4121 threads_count = max(1, min(threads_count, max_processes))
4122 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4123
4124 pool = ThreadPool(threads_count)
4125 fetched_cls = set()
4126 try:
4127 it = pool.imap_unordered(fetch, changes).__iter__()
4128 while True:
4129 try:
4130 cl, status = it.next(timeout=5)
4131 except multiprocessing.TimeoutError:
4132 break
4133 fetched_cls.add(cl)
4134 yield cl, status
4135 finally:
4136 pool.close()
4137
4138 # Add any branches that failed to fetch.
4139 for cl in set(changes) - fetched_cls:
4140 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004141
rmistry@google.com2dd99862015-06-22 12:22:18 +00004142
4143def upload_branch_deps(cl, args):
4144 """Uploads CLs of local branches that are dependents of the current branch.
4145
4146 If the local branch dependency tree looks like:
4147 test1 -> test2.1 -> test3.1
4148 -> test3.2
4149 -> test2.2 -> test3.3
4150
4151 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4152 run on the dependent branches in this order:
4153 test2.1, test3.1, test3.2, test2.2, test3.3
4154
4155 Note: This function does not rebase your local dependent branches. Use it when
4156 you make a change to the parent branch that will not conflict with its
4157 dependent branches, and you would like their dependencies updated in
4158 Rietveld.
4159 """
4160 if git_common.is_dirty_git_tree('upload-branch-deps'):
4161 return 1
4162
4163 root_branch = cl.GetBranch()
4164 if root_branch is None:
4165 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4166 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004167 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004168 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4169 'patchset dependencies without an uploaded CL.')
4170
4171 branches = RunGit(['for-each-ref',
4172 '--format=%(refname:short) %(upstream:short)',
4173 'refs/heads'])
4174 if not branches:
4175 print('No local branches found.')
4176 return 0
4177
4178 # Create a dictionary of all local branches to the branches that are dependent
4179 # on it.
4180 tracked_to_dependents = collections.defaultdict(list)
4181 for b in branches.splitlines():
4182 tokens = b.split()
4183 if len(tokens) == 2:
4184 branch_name, tracked = tokens
4185 tracked_to_dependents[tracked].append(branch_name)
4186
vapiera7fbd5a2016-06-16 09:17:49 -07004187 print()
4188 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004189 dependents = []
4190 def traverse_dependents_preorder(branch, padding=''):
4191 dependents_to_process = tracked_to_dependents.get(branch, [])
4192 padding += ' '
4193 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004194 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004195 dependents.append(dependent)
4196 traverse_dependents_preorder(dependent, padding)
4197 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004198 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004199
4200 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004201 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004202 return 0
4203
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004204 confirm_or_exit('This command will checkout all dependent branches and run '
4205 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004206
andybons@chromium.org962f9462016-02-03 20:00:42 +00004207 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004208 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004209 args.extend(['-t', 'Updated patchset dependency'])
4210
rmistry@google.com2dd99862015-06-22 12:22:18 +00004211 # Record all dependents that failed to upload.
4212 failures = {}
4213 # Go through all dependents, checkout the branch and upload.
4214 try:
4215 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004216 print()
4217 print('--------------------------------------')
4218 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004219 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004220 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004221 try:
4222 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004223 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004224 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004225 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004226 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004227 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004228 finally:
4229 # Swap back to the original root branch.
4230 RunGit(['checkout', '-q', root_branch])
4231
vapiera7fbd5a2016-06-16 09:17:49 -07004232 print()
4233 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004234 for dependent_branch in dependents:
4235 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004236 print(' %s : %s' % (dependent_branch, upload_status))
4237 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004238
4239 return 0
4240
4241
kmarshall3bff56b2016-06-06 18:31:47 -07004242def CMDarchive(parser, args):
4243 """Archives and deletes branches associated with closed changelists."""
4244 parser.add_option(
4245 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004246 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004247 parser.add_option(
4248 '-f', '--force', action='store_true',
4249 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004250 parser.add_option(
4251 '-d', '--dry-run', action='store_true',
4252 help='Skip the branch tagging and removal steps.')
4253 parser.add_option(
4254 '-t', '--notags', action='store_true',
4255 help='Do not tag archived branches. '
4256 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004257
4258 auth.add_auth_options(parser)
4259 options, args = parser.parse_args(args)
4260 if args:
4261 parser.error('Unsupported args: %s' % ' '.join(args))
4262 auth_config = auth.extract_auth_config_from_options(options)
4263
4264 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4265 if not branches:
4266 return 0
4267
vapiera7fbd5a2016-06-16 09:17:49 -07004268 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004269 changes = [Changelist(branchref=b, auth_config=auth_config)
4270 for b in branches.splitlines()]
4271 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4272 statuses = get_cl_statuses(changes,
4273 fine_grained=True,
4274 max_processes=options.maxjobs)
4275 proposal = [(cl.GetBranch(),
4276 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4277 for cl, status in statuses
4278 if status == 'closed']
4279 proposal.sort()
4280
4281 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004282 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004283 return 0
4284
4285 current_branch = GetCurrentBranch()
4286
vapiera7fbd5a2016-06-16 09:17:49 -07004287 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004288 if options.notags:
4289 for next_item in proposal:
4290 print(' ' + next_item[0])
4291 else:
4292 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4293 for next_item in proposal:
4294 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004295
kmarshall9249e012016-08-23 12:02:16 -07004296 # Quit now on precondition failure or if instructed by the user, either
4297 # via an interactive prompt or by command line flags.
4298 if options.dry_run:
4299 print('\nNo changes were made (dry run).\n')
4300 return 0
4301 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004302 print('You are currently on a branch \'%s\' which is associated with a '
4303 'closed codereview issue, so archive cannot proceed. Please '
4304 'checkout another branch and run this command again.' %
4305 current_branch)
4306 return 1
kmarshall9249e012016-08-23 12:02:16 -07004307 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004308 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4309 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004310 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004311 return 1
4312
4313 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004314 if not options.notags:
4315 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004316 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004317
vapiera7fbd5a2016-06-16 09:17:49 -07004318 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004319
4320 return 0
4321
4322
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004323def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004324 """Show status of changelists.
4325
4326 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004327 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004328 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004329 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004330 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004331 - Magenta in the commit queue
4332 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004333 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004334
4335 Also see 'git cl comments'.
4336 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004337 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004338 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004339 parser.add_option('-f', '--fast', action='store_true',
4340 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004341 parser.add_option(
4342 '-j', '--maxjobs', action='store', type=int,
4343 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004344
4345 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004346 _add_codereview_issue_select_options(
4347 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004348 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004349 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004350 if args:
4351 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004352 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004353
iannuccie53c9352016-08-17 14:40:40 -07004354 if options.issue is not None and not options.field:
4355 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004356
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004357 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004358 cl = Changelist(auth_config=auth_config, issue=options.issue,
4359 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004360 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004361 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004362 elif options.field == 'id':
4363 issueid = cl.GetIssue()
4364 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004365 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004366 elif options.field == 'patch':
4367 patchset = cl.GetPatchset()
4368 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004369 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004370 elif options.field == 'status':
4371 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004372 elif options.field == 'url':
4373 url = cl.GetIssueURL()
4374 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004375 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004376 return 0
4377
4378 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4379 if not branches:
4380 print('No local branch found.')
4381 return 0
4382
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004383 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004384 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004385 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004386 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004387 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004388 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004389 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004390
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004391 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004392 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4393 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4394 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004395 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004396 c, status = output.next()
4397 branch_statuses[c.GetBranch()] = status
4398 status = branch_statuses.pop(branch)
4399 url = cl.GetIssueURL()
4400 if url and (not status or status == 'error'):
4401 # The issue probably doesn't exist anymore.
4402 url += ' (broken)'
4403
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004404 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004405 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004406 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004407 color = ''
4408 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004409 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004410 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004411 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004412 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004413
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004414
4415 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004416 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004417 print('Current branch: %s' % branch)
4418 for cl in changes:
4419 if cl.GetBranch() == branch:
4420 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004421 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004422 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004423 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004424 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004425 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004426 print('Issue description:')
4427 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004428 return 0
4429
4430
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004431def colorize_CMDstatus_doc():
4432 """To be called once in main() to add colors to git cl status help."""
4433 colors = [i for i in dir(Fore) if i[0].isupper()]
4434
4435 def colorize_line(line):
4436 for color in colors:
4437 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004438 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004439 indent = len(line) - len(line.lstrip(' ')) + 1
4440 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4441 return line
4442
4443 lines = CMDstatus.__doc__.splitlines()
4444 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4445
4446
phajdan.jre328cf92016-08-22 04:12:17 -07004447def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004448 if path == '-':
4449 json.dump(contents, sys.stdout)
4450 else:
4451 with open(path, 'w') as f:
4452 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004453
4454
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004455@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004456def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004457 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004458
4459 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004460 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004461 parser.add_option('-r', '--reverse', action='store_true',
4462 help='Lookup the branch(es) for the specified issues. If '
4463 'no issues are specified, all branches with mapped '
4464 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004465 parser.add_option('--json',
4466 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004467 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004468 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004469 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004470
dnj@chromium.org406c4402015-03-03 17:22:28 +00004471 if options.reverse:
4472 branches = RunGit(['for-each-ref', 'refs/heads',
4473 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004474 # Reverse issue lookup.
4475 issue_branch_map = {}
4476 for branch in branches:
4477 cl = Changelist(branchref=branch)
4478 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4479 if not args:
4480 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004481 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004482 for issue in args:
4483 if not issue:
4484 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004485 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004486 print('Branch for issue number %s: %s' % (
4487 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004488 if options.json:
4489 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004490 return 0
4491
4492 if len(args) > 0:
4493 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4494 if not issue.valid:
4495 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4496 'or no argument to list it.\n'
4497 'Maybe you want to run git cl status?')
4498 cl = Changelist(codereview=issue.codereview)
4499 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004500 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004501 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004502 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4503 if options.json:
4504 write_json(options.json, {
4505 'issue': cl.GetIssue(),
4506 'issue_url': cl.GetIssueURL(),
4507 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004508 return 0
4509
4510
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004511def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004512 """Shows or posts review comments for any changelist."""
4513 parser.add_option('-a', '--add-comment', dest='comment',
4514 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004515 parser.add_option('-i', '--issue', dest='issue',
4516 help='review issue id (defaults to current issue). '
4517 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004518 parser.add_option('-m', '--machine-readable', dest='readable',
4519 action='store_false', default=True,
4520 help='output comments in a format compatible with '
4521 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004522 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004523 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004524 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004525 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004526 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004527 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004528 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004529
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004530 issue = None
4531 if options.issue:
4532 try:
4533 issue = int(options.issue)
4534 except ValueError:
4535 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004536 if not options.forced_codereview:
4537 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004538
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004539 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004540 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004541 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004542
4543 if options.comment:
4544 cl.AddComment(options.comment)
4545 return 0
4546
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004547 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4548 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004549 for comment in summary:
4550 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004551 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004552 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004553 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004554 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004555 color = Fore.MAGENTA
4556 else:
4557 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004558 print('\n%s%s %s%s\n%s' % (
4559 color,
4560 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4561 comment.sender,
4562 Fore.RESET,
4563 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4564
smut@google.comc85ac942015-09-15 16:34:43 +00004565 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004566 def pre_serialize(c):
4567 dct = c.__dict__.copy()
4568 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4569 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004570 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004571 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004572 return 0
4573
4574
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004575@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004576def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004577 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004578 parser.add_option('-d', '--display', action='store_true',
4579 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004580 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004581 help='New description to set for this issue (- for stdin, '
4582 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004583 parser.add_option('-f', '--force', action='store_true',
4584 help='Delete any unpublished Gerrit edits for this issue '
4585 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004586
4587 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004588 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004589 options, args = parser.parse_args(args)
4590 _process_codereview_select_options(parser, options)
4591
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004592 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004593 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004594 target_issue_arg = ParseIssueNumberArgument(args[0],
4595 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004596 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004597 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004598
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004599 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004600
martiniss6eda05f2016-06-30 10:18:35 -07004601 kwargs = {
4602 'auth_config': auth_config,
4603 'codereview': options.forced_codereview,
4604 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004605 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004606 if target_issue_arg:
4607 kwargs['issue'] = target_issue_arg.issue
4608 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004609 if target_issue_arg.codereview and not options.forced_codereview:
4610 detected_codereview_from_url = True
4611 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004612
4613 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004614 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004615 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004616 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004617
4618 if detected_codereview_from_url:
4619 logging.info('canonical issue/change URL: %s (type: %s)\n',
4620 cl.GetIssueURL(), target_issue_arg.codereview)
4621
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004622 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004623
smut@google.com34fb6b12015-07-13 20:03:26 +00004624 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004625 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004626 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004627
4628 if options.new_description:
4629 text = options.new_description
4630 if text == '-':
4631 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004632 elif text == '+':
4633 base_branch = cl.GetCommonAncestorWithUpstream()
4634 change = cl.GetChange(base_branch, None, local_description=True)
4635 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004636
4637 description.set_description(text)
4638 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004639 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004640
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004641 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004642 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004643 return 0
4644
4645
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004646def CreateDescriptionFromLog(args):
4647 """Pulls out the commit log to use as a base for the CL description."""
4648 log_args = []
4649 if len(args) == 1 and not args[0].endswith('.'):
4650 log_args = [args[0] + '..']
4651 elif len(args) == 1 and args[0].endswith('...'):
4652 log_args = [args[0][:-1]]
4653 elif len(args) == 2:
4654 log_args = [args[0] + '..' + args[1]]
4655 else:
4656 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004657 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004658
4659
thestig@chromium.org44202a22014-03-11 19:22:18 +00004660def CMDlint(parser, args):
4661 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004662 parser.add_option('--filter', action='append', metavar='-x,+y',
4663 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004664 auth.add_auth_options(parser)
4665 options, args = parser.parse_args(args)
4666 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004667
4668 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004669 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004670 try:
4671 import cpplint
4672 import cpplint_chromium
4673 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004674 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004675 return 1
4676
4677 # Change the current working directory before calling lint so that it
4678 # shows the correct base.
4679 previous_cwd = os.getcwd()
4680 os.chdir(settings.GetRoot())
4681 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004682 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004683 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4684 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004685 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004686 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004687 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004688
4689 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004690 command = args + files
4691 if options.filter:
4692 command = ['--filter=' + ','.join(options.filter)] + command
4693 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004694
4695 white_regex = re.compile(settings.GetLintRegex())
4696 black_regex = re.compile(settings.GetLintIgnoreRegex())
4697 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4698 for filename in filenames:
4699 if white_regex.match(filename):
4700 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004701 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004702 else:
4703 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4704 extra_check_functions)
4705 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004706 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004707 finally:
4708 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004709 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004710 if cpplint._cpplint_state.error_count != 0:
4711 return 1
4712 return 0
4713
4714
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004715def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004716 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004717 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004718 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004719 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004720 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004721 auth.add_auth_options(parser)
4722 options, args = parser.parse_args(args)
4723 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004724
sbc@chromium.org71437c02015-04-09 19:29:40 +00004725 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004726 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004727 return 1
4728
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004729 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004730 if args:
4731 base_branch = args[0]
4732 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004733 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004734 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004735
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004736 cl.RunHook(
4737 committing=not options.upload,
4738 may_prompt=False,
4739 verbose=options.verbose,
4740 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004741 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004742
4743
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004744def GenerateGerritChangeId(message):
4745 """Returns Ixxxxxx...xxx change id.
4746
4747 Works the same way as
4748 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4749 but can be called on demand on all platforms.
4750
4751 The basic idea is to generate git hash of a state of the tree, original commit
4752 message, author/committer info and timestamps.
4753 """
4754 lines = []
4755 tree_hash = RunGitSilent(['write-tree'])
4756 lines.append('tree %s' % tree_hash.strip())
4757 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4758 if code == 0:
4759 lines.append('parent %s' % parent.strip())
4760 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4761 lines.append('author %s' % author.strip())
4762 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4763 lines.append('committer %s' % committer.strip())
4764 lines.append('')
4765 # Note: Gerrit's commit-hook actually cleans message of some lines and
4766 # whitespace. This code is not doing this, but it clearly won't decrease
4767 # entropy.
4768 lines.append(message)
4769 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4770 stdin='\n'.join(lines))
4771 return 'I%s' % change_hash.strip()
4772
4773
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004774def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004775 """Computes the remote branch ref to use for the CL.
4776
4777 Args:
4778 remote (str): The git remote for the CL.
4779 remote_branch (str): The git remote branch for the CL.
4780 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004781 """
4782 if not (remote and remote_branch):
4783 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004784
wittman@chromium.org455dc922015-01-26 20:15:50 +00004785 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004786 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004787 # refs, which are then translated into the remote full symbolic refs
4788 # below.
4789 if '/' not in target_branch:
4790 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4791 else:
4792 prefix_replacements = (
4793 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4794 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4795 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4796 )
4797 match = None
4798 for regex, replacement in prefix_replacements:
4799 match = re.search(regex, target_branch)
4800 if match:
4801 remote_branch = target_branch.replace(match.group(0), replacement)
4802 break
4803 if not match:
4804 # This is a branch path but not one we recognize; use as-is.
4805 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004806 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4807 # Handle the refs that need to land in different refs.
4808 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004809
wittman@chromium.org455dc922015-01-26 20:15:50 +00004810 # Create the true path to the remote branch.
4811 # Does the following translation:
4812 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4813 # * refs/remotes/origin/master -> refs/heads/master
4814 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4815 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4816 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4817 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4818 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4819 'refs/heads/')
4820 elif remote_branch.startswith('refs/remotes/branch-heads'):
4821 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004822
wittman@chromium.org455dc922015-01-26 20:15:50 +00004823 return remote_branch
4824
4825
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004826def cleanup_list(l):
4827 """Fixes a list so that comma separated items are put as individual items.
4828
4829 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4830 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4831 """
4832 items = sum((i.split(',') for i in l), [])
4833 stripped_items = (i.strip() for i in items)
4834 return sorted(filter(None, stripped_items))
4835
4836
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004837@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004838def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004839 """Uploads the current changelist to codereview.
4840
4841 Can skip dependency patchset uploads for a branch by running:
4842 git config branch.branch_name.skip-deps-uploads True
4843 To unset run:
4844 git config --unset branch.branch_name.skip-deps-uploads
4845 Can also set the above globally by using the --global flag.
4846 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004847 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4848 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004849 parser.add_option('--bypass-watchlists', action='store_true',
4850 dest='bypass_watchlists',
4851 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004852 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004853 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004854 parser.add_option('--message', '-m', dest='message',
4855 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004856 parser.add_option('-b', '--bug',
4857 help='pre-populate the bug number(s) for this issue. '
4858 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004859 parser.add_option('--message-file', dest='message_file',
4860 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004861 parser.add_option('--title', '-t', dest='title',
4862 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004863 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004864 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004865 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004866 parser.add_option('--tbrs',
4867 action='append', default=[],
4868 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004869 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004870 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004871 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004872 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004873 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004874 parser.add_option('--emulate_svn_auto_props',
4875 '--emulate-svn-auto-props',
4876 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004877 dest="emulate_svn_auto_props",
4878 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004879 parser.add_option('-c', '--use-commit-queue', action='store_true',
4880 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004881 parser.add_option('--private', action='store_true',
4882 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004883 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004884 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004885 metavar='TARGET',
4886 help='Apply CL to remote ref TARGET. ' +
4887 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004888 parser.add_option('--squash', action='store_true',
4889 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004890 parser.add_option('--no-squash', action='store_true',
4891 help='Don\'t squash multiple commits into one ' +
4892 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004893 parser.add_option('--topic', default=None,
4894 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004895 parser.add_option('--email', default=None,
4896 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004897 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4898 const='TBR', help='add a set of OWNERS to TBR')
4899 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4900 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004901 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4902 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004903 help='Send the patchset to do a CQ dry run right after '
4904 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004905 parser.add_option('--dependencies', action='store_true',
4906 help='Uploads CLs of all the local branches that depend on '
4907 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004908
rmistry@google.com2dd99862015-06-22 12:22:18 +00004909 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004910 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004911 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004912 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004913 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004914 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004915 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004916
sbc@chromium.org71437c02015-04-09 19:29:40 +00004917 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004918 return 1
4919
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004920 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004921 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004922 options.cc = cleanup_list(options.cc)
4923
tandriib80458a2016-06-23 12:20:07 -07004924 if options.message_file:
4925 if options.message:
4926 parser.error('only one of --message and --message-file allowed.')
4927 options.message = gclient_utils.FileRead(options.message_file)
4928 options.message_file = None
4929
tandrii4d0545a2016-07-06 03:56:49 -07004930 if options.cq_dry_run and options.use_commit_queue:
4931 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4932
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004933 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4934 settings.GetIsGerrit()
4935
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004936 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004937 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004938
4939
Francois Dorayd42c6812017-05-30 15:10:20 -04004940@subcommand.usage('--description=<description file>')
4941def CMDsplit(parser, args):
4942 """Splits a branch into smaller branches and uploads CLs.
4943
4944 Creates a branch and uploads a CL for each group of files modified in the
4945 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004946 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004947 the shared OWNERS file.
4948 """
4949 parser.add_option("-d", "--description", dest="description_file",
4950 help="A text file containing a CL description. ")
4951 parser.add_option("-c", "--comment", dest="comment_file",
4952 help="A text file containing a CL comment.")
4953 options, _ = parser.parse_args(args)
4954
4955 if not options.description_file:
4956 parser.error('No --description flag specified.')
4957
4958 def WrappedCMDupload(args):
4959 return CMDupload(OptionParser(), args)
4960
4961 return split_cl.SplitCl(options.description_file, options.comment_file,
4962 Changelist, WrappedCMDupload)
4963
4964
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004965@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004966def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004967 """DEPRECATED: Used to commit the current changelist via git-svn."""
4968 message = ('git-cl no longer supports committing to SVN repositories via '
4969 'git-svn. You probably want to use `git cl land` instead.')
4970 print(message)
4971 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004972
4973
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004974# Two special branches used by git cl land.
4975MERGE_BRANCH = 'git-cl-commit'
4976CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4977
4978
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004979@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004980def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004981 """Commits the current changelist via git.
4982
4983 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4984 upstream and closes the issue automatically and atomically.
4985
4986 Otherwise (in case of Rietveld):
4987 Squashes branch into a single commit.
4988 Updates commit message with metadata (e.g. pointer to review).
4989 Pushes the code upstream.
4990 Updates review and closes.
4991 """
4992 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4993 help='bypass upload presubmit hook')
4994 parser.add_option('-m', dest='message',
4995 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07004996 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004997 help="force yes to questions (don't prompt)")
4998 parser.add_option('-c', dest='contributor',
4999 help="external contributor for patch (appended to " +
5000 "description and used as author for git). Should be " +
5001 "formatted as 'First Last <email@example.com>'")
5002 add_git_similarity(parser)
5003 auth.add_auth_options(parser)
5004 (options, args) = parser.parse_args(args)
5005 auth_config = auth.extract_auth_config_from_options(options)
5006
5007 cl = Changelist(auth_config=auth_config)
5008
5009 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5010 if cl.IsGerrit():
5011 if options.message:
5012 # This could be implemented, but it requires sending a new patch to
5013 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5014 # Besides, Gerrit has the ability to change the commit message on submit
5015 # automatically, thus there is no need to support this option (so far?).
5016 parser.error('-m MESSAGE option is not supported for Gerrit.')
5017 if options.contributor:
5018 parser.error(
5019 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5020 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5021 'the contributor\'s "name <email>". If you can\'t upload such a '
5022 'commit for review, contact your repository admin and request'
5023 '"Forge-Author" permission.')
5024 if not cl.GetIssue():
5025 DieWithError('You must upload the change first to Gerrit.\n'
5026 ' If you would rather have `git cl land` upload '
5027 'automatically for you, see http://crbug.com/642759')
5028 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5029 options.verbose)
5030
5031 current = cl.GetBranch()
5032 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5033 if remote == '.':
5034 print()
5035 print('Attempting to push branch %r into another local branch!' % current)
5036 print()
5037 print('Either reparent this branch on top of origin/master:')
5038 print(' git reparent-branch --root')
5039 print()
5040 print('OR run `git rebase-update` if you think the parent branch is ')
5041 print('already committed.')
5042 print()
5043 print(' Current parent: %r' % upstream_branch)
5044 return 1
5045
5046 if not args:
5047 # Default to merging against our best guess of the upstream branch.
5048 args = [cl.GetUpstreamBranch()]
5049
5050 if options.contributor:
5051 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005052 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005053 return 1
5054
5055 base_branch = args[0]
5056
5057 if git_common.is_dirty_git_tree('land'):
5058 return 1
5059
5060 # This rev-list syntax means "show all commits not in my branch that
5061 # are in base_branch".
5062 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5063 base_branch]).splitlines()
5064 if upstream_commits:
5065 print('Base branch "%s" has %d commits '
5066 'not in this branch.' % (base_branch, len(upstream_commits)))
5067 print('Run "git merge %s" before attempting to land.' % base_branch)
5068 return 1
5069
5070 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5071 if not options.bypass_hooks:
5072 author = None
5073 if options.contributor:
5074 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5075 hook_results = cl.RunHook(
5076 committing=True,
5077 may_prompt=not options.force,
5078 verbose=options.verbose,
5079 change=cl.GetChange(merge_base, author))
5080 if not hook_results.should_continue():
5081 return 1
5082
5083 # Check the tree status if the tree status URL is set.
5084 status = GetTreeStatus()
5085 if 'closed' == status:
5086 print('The tree is closed. Please wait for it to reopen. Use '
5087 '"git cl land --bypass-hooks" to commit on a closed tree.')
5088 return 1
5089 elif 'unknown' == status:
5090 print('Unable to determine tree status. Please verify manually and '
5091 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5092 return 1
5093
5094 change_desc = ChangeDescription(options.message)
5095 if not change_desc.description and cl.GetIssue():
5096 change_desc = ChangeDescription(cl.GetDescription())
5097
5098 if not change_desc.description:
5099 if not cl.GetIssue() and options.bypass_hooks:
5100 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5101 else:
5102 print('No description set.')
5103 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5104 return 1
5105
5106 # Keep a separate copy for the commit message, because the commit message
5107 # contains the link to the Rietveld issue, while the Rietveld message contains
5108 # the commit viewvc url.
5109 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005110 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005111 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005112
5113 commit_desc = ChangeDescription(change_desc.description)
5114 if cl.GetIssue():
5115 # Xcode won't linkify this URL unless there is a non-whitespace character
5116 # after it. Add a period on a new line to circumvent this. Also add a space
5117 # before the period to make sure that Gitiles continues to correctly resolve
5118 # the URL.
5119 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5120 if options.contributor:
5121 commit_desc.append_footer('Patch from %s.' % options.contributor)
5122
5123 print('Description:')
5124 print(commit_desc.description)
5125
5126 branches = [merge_base, cl.GetBranchRef()]
5127 if not options.force:
5128 print_stats(options.similarity, options.find_copies, branches)
5129
5130 # We want to squash all this branch's commits into one commit with the proper
5131 # description. We do this by doing a "reset --soft" to the base branch (which
5132 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005133 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005134 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5135 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5136 result = RunGitWithCode(showref_cmd)
5137 if result[0] == 0:
5138 RunGit(['branch', '-D', branch])
5139
5140 # We might be in a directory that's present in this branch but not in the
5141 # trunk. Move up to the top of the tree so that git commands that expect a
5142 # valid CWD won't fail after we check out the merge branch.
5143 rel_base_path = settings.GetRelativeRoot()
5144 if rel_base_path:
5145 os.chdir(rel_base_path)
5146
5147 # Stuff our change into the merge branch.
5148 # We wrap in a try...finally block so if anything goes wrong,
5149 # we clean up the branches.
5150 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005151 revision = None
5152 try:
5153 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5154 RunGit(['reset', '--soft', merge_base])
5155 if options.contributor:
5156 RunGit(
5157 [
5158 'commit', '--author', options.contributor,
5159 '-m', commit_desc.description,
5160 ])
5161 else:
5162 RunGit(['commit', '-m', commit_desc.description])
5163
5164 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5165 mirror = settings.GetGitMirror(remote)
5166 if mirror:
5167 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005168 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005169 else:
5170 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005171 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005172 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5173
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005174 retcode = PushToGitWithAutoRebase(
5175 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005176 if retcode == 0:
5177 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005178 if git_numberer_enabled:
5179 change_desc = ChangeDescription(
5180 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005181 except: # pylint: disable=bare-except
5182 if _IS_BEING_TESTED:
5183 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5184 + '-' * 30 + '8<' + '-' * 30)
5185 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5186 raise
5187 finally:
5188 # And then swap back to the original branch and clean up.
5189 RunGit(['checkout', '-q', cl.GetBranch()])
5190 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005191 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005192
5193 if not revision:
5194 print('Failed to push. If this persists, please file a bug.')
5195 return 1
5196
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005197 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005198 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005199 if viewvc_url and revision:
5200 change_desc.append_footer(
5201 'Committed: %s%s' % (viewvc_url, revision))
5202 elif revision:
5203 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005204 print('Closing issue '
5205 '(you may be prompted for your codereview password)...')
5206 cl.UpdateDescription(change_desc.description)
5207 cl.CloseIssue()
5208 props = cl.GetIssueProperties()
5209 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005210 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5211 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005212 if options.bypass_hooks:
5213 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5214 else:
5215 comment += ' (presubmit successful).'
5216 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5217
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005218 if os.path.isfile(POSTUPSTREAM_HOOK):
5219 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5220
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005221 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005222
5223
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005224def PushToGitWithAutoRebase(remote, branch, original_description,
5225 git_numberer_enabled, max_attempts=3):
5226 """Pushes current HEAD commit on top of remote's branch.
5227
5228 Attempts to fetch and autorebase on push failures.
5229 Adds git number footers on the fly.
5230
5231 Returns integer code from last command.
5232 """
5233 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5234 code = 0
5235 attempts_left = max_attempts
5236 while attempts_left:
5237 attempts_left -= 1
5238 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5239
5240 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5241 # If fetch fails, retry.
5242 print('Fetching %s/%s...' % (remote, branch))
5243 code, out = RunGitWithCode(
5244 ['retry', 'fetch', remote,
5245 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5246 if code:
5247 print('Fetch failed with exit code %d.' % code)
5248 print(out.strip())
5249 continue
5250
5251 print('Cherry-picking commit on top of latest %s' % branch)
5252 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5253 suppress_stderr=True)
5254 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5255 code, out = RunGitWithCode(['cherry-pick', cherry])
5256 if code:
5257 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5258 'the following files have merge conflicts:' %
5259 (branch, parent_hash))
5260 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5261 print('Please rebase your patch and try again.')
5262 RunGitWithCode(['cherry-pick', '--abort'])
5263 break
5264
5265 commit_desc = ChangeDescription(original_description)
5266 if git_numberer_enabled:
5267 logging.debug('Adding git number footers')
5268 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5269 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5270 branch)
5271 # Ensure timestamps are monotonically increasing.
5272 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5273 _get_committer_timestamp('HEAD'))
5274 _git_amend_head(commit_desc.description, timestamp)
5275
5276 code, out = RunGitWithCode(
5277 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5278 print(out)
5279 if code == 0:
5280 break
5281 if IsFatalPushFailure(out):
5282 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005283 'user.email are correct and you have push access to the repo.\n'
5284 'Hint: run command below to diangose common Git/Gerrit credential '
5285 'problems:\n'
5286 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005287 break
5288 return code
5289
5290
5291def IsFatalPushFailure(push_stdout):
5292 """True if retrying push won't help."""
5293 return '(prohibited by Gerrit)' in push_stdout
5294
5295
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005296@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005297def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005298 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005299 parser.add_option('-b', dest='newbranch',
5300 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005301 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005302 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005303 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005304 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005305 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005306 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005307 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005308 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005309 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005310 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005311
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005312
5313 group = optparse.OptionGroup(
5314 parser,
5315 'Options for continuing work on the current issue uploaded from a '
5316 'different clone (e.g. different machine). Must be used independently '
5317 'from the other options. No issue number should be specified, and the '
5318 'branch must have an issue number associated with it')
5319 group.add_option('--reapply', action='store_true', dest='reapply',
5320 help='Reset the branch and reapply the issue.\n'
5321 'CAUTION: This will undo any local changes in this '
5322 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005323
5324 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005325 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005326 parser.add_option_group(group)
5327
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005328 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005329 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005330 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005331 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005332 auth_config = auth.extract_auth_config_from_options(options)
5333
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005334 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005335 if options.newbranch:
5336 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005337 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005338 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005339
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005340 cl = Changelist(auth_config=auth_config,
5341 codereview=options.forced_codereview)
5342 if not cl.GetIssue():
5343 parser.error('current branch must have an associated issue')
5344
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005345 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005346 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005347 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005348
5349 RunGit(['reset', '--hard', upstream])
5350 if options.pull:
5351 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005352
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005353 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5354 options.directory)
5355
5356 if len(args) != 1 or not args[0]:
5357 parser.error('Must specify issue number or url')
5358
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005359 target_issue_arg = ParseIssueNumberArgument(args[0],
5360 options.forced_codereview)
5361 if not target_issue_arg.valid:
5362 parser.error('invalid codereview url or CL id')
5363
5364 cl_kwargs = {
5365 'auth_config': auth_config,
5366 'codereview_host': target_issue_arg.hostname,
5367 'codereview': options.forced_codereview,
5368 }
5369 detected_codereview_from_url = False
5370 if target_issue_arg.codereview and not options.forced_codereview:
5371 detected_codereview_from_url = True
5372 cl_kwargs['codereview'] = target_issue_arg.codereview
5373 cl_kwargs['issue'] = target_issue_arg.issue
5374
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005375 # We don't want uncommitted changes mixed up with the patch.
5376 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005377 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005378
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005379 if options.newbranch:
5380 if options.force:
5381 RunGit(['branch', '-D', options.newbranch],
5382 stderr=subprocess2.PIPE, error_ok=True)
5383 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005384 elif not GetCurrentBranch():
5385 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005386
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005387 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005388
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005389 if cl.IsGerrit():
5390 if options.reject:
5391 parser.error('--reject is not supported with Gerrit codereview.')
5392 if options.nocommit:
5393 parser.error('--nocommit is not supported with Gerrit codereview.')
5394 if options.directory:
5395 parser.error('--directory is not supported with Gerrit codereview.')
5396
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005397 if detected_codereview_from_url:
5398 print('canonical issue/change URL: %s (type: %s)\n' %
5399 (cl.GetIssueURL(), target_issue_arg.codereview))
5400
5401 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005402 options.nocommit, options.directory,
5403 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005404
5405
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005406def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005407 """Fetches the tree status and returns either 'open', 'closed',
5408 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005409 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005410 if url:
5411 status = urllib2.urlopen(url).read().lower()
5412 if status.find('closed') != -1 or status == '0':
5413 return 'closed'
5414 elif status.find('open') != -1 or status == '1':
5415 return 'open'
5416 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005417 return 'unset'
5418
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005419
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005420def GetTreeStatusReason():
5421 """Fetches the tree status from a json url and returns the message
5422 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005423 url = settings.GetTreeStatusUrl()
5424 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005425 connection = urllib2.urlopen(json_url)
5426 status = json.loads(connection.read())
5427 connection.close()
5428 return status['message']
5429
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005430
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005431def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005432 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005433 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005434 status = GetTreeStatus()
5435 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005436 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005437 return 2
5438
vapiera7fbd5a2016-06-16 09:17:49 -07005439 print('The tree is %s' % status)
5440 print()
5441 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005442 if status != 'open':
5443 return 1
5444 return 0
5445
5446
maruel@chromium.org15192402012-09-06 12:38:29 +00005447def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005448 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005449 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005450 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005451 '-b', '--bot', action='append',
5452 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5453 'times to specify multiple builders. ex: '
5454 '"-b win_rel -b win_layout". See '
5455 'the try server waterfall for the builders name and the tests '
5456 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005457 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005458 '-B', '--bucket', default='',
5459 help=('Buildbucket bucket to send the try requests.'))
5460 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005461 '-m', '--master', default='',
5462 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005463 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005464 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005465 help='Revision to use for the try job; default: the revision will '
5466 'be determined by the try recipe that builder runs, which usually '
5467 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005468 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005469 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005470 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005471 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005472 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005473 '--project',
5474 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005475 'in recipe to determine to which repository or directory to '
5476 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005477 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005478 '-p', '--property', dest='properties', action='append', default=[],
5479 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005480 'key2=value2 etc. The value will be treated as '
5481 'json if decodable, or as string otherwise. '
5482 'NOTE: using this may make your try job not usable for CQ, '
5483 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005484 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005485 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5486 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005487 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005488 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005489 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005490 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005491
machenbach@chromium.org45453142015-09-15 08:45:22 +00005492 # Make sure that all properties are prop=value pairs.
5493 bad_params = [x for x in options.properties if '=' not in x]
5494 if bad_params:
5495 parser.error('Got properties with missing "=": %s' % bad_params)
5496
maruel@chromium.org15192402012-09-06 12:38:29 +00005497 if args:
5498 parser.error('Unknown arguments: %s' % args)
5499
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005500 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005501 if not cl.GetIssue():
5502 parser.error('Need to upload first')
5503
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005504 if cl.IsGerrit():
5505 # HACK: warm up Gerrit change detail cache to save on RPCs.
5506 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5507
tandriie113dfd2016-10-11 10:20:12 -07005508 error_message = cl.CannotTriggerTryJobReason()
5509 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005510 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005511
borenet6c0efe62016-10-19 08:13:29 -07005512 if options.bucket and options.master:
5513 parser.error('Only one of --bucket and --master may be used.')
5514
qyearsley1fdfcb62016-10-24 13:22:03 -07005515 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005516
qyearsleydd49f942016-10-28 11:57:22 -07005517 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5518 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005519 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005520 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005521 print('git cl try with no bots now defaults to CQ dry run.')
5522 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5523 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005524
borenet6c0efe62016-10-19 08:13:29 -07005525 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005526 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005527 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005528 'of bot requires an initial job from a parent (usually a builder). '
5529 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005530 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005531 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005532
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005533 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005534 # TODO(tandrii): Checking local patchset against remote patchset is only
5535 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5536 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005537 print('Warning: Codereview server has newer patchsets (%s) than most '
5538 'recent upload from local checkout (%s). Did a previous upload '
5539 'fail?\n'
5540 'By default, git cl try uses the latest patchset from '
5541 'codereview, continuing to use patchset %s.\n' %
5542 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005543
tandrii568043b2016-10-11 07:49:18 -07005544 try:
borenet6c0efe62016-10-19 08:13:29 -07005545 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5546 patchset)
tandrii568043b2016-10-11 07:49:18 -07005547 except BuildbucketResponseException as ex:
5548 print('ERROR: %s' % ex)
5549 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005550 return 0
5551
5552
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005553def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005554 """Prints info about try jobs associated with current CL."""
5555 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005556 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005557 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005558 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005559 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005560 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005561 '--color', action='store_true', default=setup_color.IS_TTY,
5562 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005563 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005564 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5565 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005566 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005567 '--json', help=('Path of JSON output file to write try job results to,'
5568 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005569 parser.add_option_group(group)
5570 auth.add_auth_options(parser)
5571 options, args = parser.parse_args(args)
5572 if args:
5573 parser.error('Unrecognized args: %s' % ' '.join(args))
5574
5575 auth_config = auth.extract_auth_config_from_options(options)
5576 cl = Changelist(auth_config=auth_config)
5577 if not cl.GetIssue():
5578 parser.error('Need to upload first')
5579
tandrii221ab252016-10-06 08:12:04 -07005580 patchset = options.patchset
5581 if not patchset:
5582 patchset = cl.GetMostRecentPatchset()
5583 if not patchset:
5584 parser.error('Codereview doesn\'t know about issue %s. '
5585 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005586 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005587 cl.GetIssue())
5588
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005589 # TODO(tandrii): Checking local patchset against remote patchset is only
5590 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5591 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005592 print('Warning: Codereview server has newer patchsets (%s) than most '
5593 'recent upload from local checkout (%s). Did a previous upload '
5594 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005595 'By default, git cl try-results uses the latest patchset from '
5596 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005597 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005598 try:
tandrii221ab252016-10-06 08:12:04 -07005599 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005600 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005601 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005602 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005603 if options.json:
5604 write_try_results_json(options.json, jobs)
5605 else:
5606 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005607 return 0
5608
5609
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005610@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005611def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005612 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005613 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005614 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005615 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005616
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005617 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005618 if args:
5619 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005620 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005621 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005622 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005623 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005624
5625 # Clear configured merge-base, if there is one.
5626 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005627 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005628 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005629 return 0
5630
5631
thestig@chromium.org00858c82013-12-02 23:08:03 +00005632def CMDweb(parser, args):
5633 """Opens the current CL in the web browser."""
5634 _, args = parser.parse_args(args)
5635 if args:
5636 parser.error('Unrecognized args: %s' % ' '.join(args))
5637
5638 issue_url = Changelist().GetIssueURL()
5639 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005640 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005641 return 1
5642
5643 webbrowser.open(issue_url)
5644 return 0
5645
5646
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005647def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005648 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005649 parser.add_option('-d', '--dry-run', action='store_true',
5650 help='trigger in dry run mode')
5651 parser.add_option('-c', '--clear', action='store_true',
5652 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005653 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005654 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005655 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005656 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005657 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005658 if args:
5659 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005660 if options.dry_run and options.clear:
5661 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5662
iannuccie53c9352016-08-17 14:40:40 -07005663 cl = Changelist(auth_config=auth_config, issue=options.issue,
5664 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005665 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005666 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005667 elif options.dry_run:
5668 state = _CQState.DRY_RUN
5669 else:
5670 state = _CQState.COMMIT
5671 if not cl.GetIssue():
5672 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005673 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005674 return 0
5675
5676
groby@chromium.org411034a2013-02-26 15:12:01 +00005677def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005678 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005679 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005680 auth.add_auth_options(parser)
5681 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005682 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005683 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005684 if args:
5685 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005686 cl = Changelist(auth_config=auth_config, issue=options.issue,
5687 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005688 # Ensure there actually is an issue to close.
5689 cl.GetDescription()
5690 cl.CloseIssue()
5691 return 0
5692
5693
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005694def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005695 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005696 parser.add_option(
5697 '--stat',
5698 action='store_true',
5699 dest='stat',
5700 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005701 auth.add_auth_options(parser)
5702 options, args = parser.parse_args(args)
5703 auth_config = auth.extract_auth_config_from_options(options)
5704 if args:
5705 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005706
5707 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005708 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005709 # Staged changes would be committed along with the patch from last
5710 # upload, hence counted toward the "last upload" side in the final
5711 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005712 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005713 return 1
5714
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005715 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005716 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005717 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005718 if not issue:
5719 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005720 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005721 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005722
5723 # Create a new branch based on the merge-base
5724 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005725 # Clear cached branch in cl object, to avoid overwriting original CL branch
5726 # properties.
5727 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005728 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005729 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005730 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005731 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005732 return rtn
5733
wychen@chromium.org06928532015-02-03 02:11:29 +00005734 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005735 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005736 cmd = ['git', 'diff']
5737 if options.stat:
5738 cmd.append('--stat')
5739 cmd.extend([TMP_BRANCH, branch, '--'])
5740 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005741 finally:
5742 RunGit(['checkout', '-q', branch])
5743 RunGit(['branch', '-D', TMP_BRANCH])
5744
5745 return 0
5746
5747
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005748def CMDowners(parser, args):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005749 """Interactively finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005750 parser.add_option(
5751 '--no-color',
5752 action='store_true',
5753 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005754 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005755 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005756 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005757
5758 author = RunGit(['config', 'user.email']).strip() or None
5759
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005760 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005761
5762 if args:
5763 if len(args) > 1:
5764 parser.error('Unknown args')
5765 base_branch = args[0]
5766 else:
5767 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005768 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005769
5770 change = cl.GetChange(base_branch, None)
5771 return owners_finder.OwnersFinder(
5772 [f.LocalPath() for f in
5773 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005774 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005775 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005776 disable_color=options.no_color,
5777 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005778
5779
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005780def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005781 """Generates a diff command."""
5782 # Generate diff for the current branch's changes.
5783 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005784 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005785
5786 if args:
5787 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005788 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005789 diff_cmd.append(arg)
5790 else:
5791 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005792
5793 return diff_cmd
5794
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005795
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005796def MatchingFileType(file_name, extensions):
5797 """Returns true if the file name ends with one of the given extensions."""
5798 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005799
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005800
enne@chromium.org555cfe42014-01-29 18:21:39 +00005801@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005802def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005803 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005804 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005805 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005806 parser.add_option('--full', action='store_true',
5807 help='Reformat the full content of all touched files')
5808 parser.add_option('--dry-run', action='store_true',
5809 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005810 parser.add_option('--python', action='store_true',
5811 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005812 parser.add_option('--js', action='store_true',
5813 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005814 parser.add_option('--diff', action='store_true',
5815 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005816 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005817
Daniel Chengc55eecf2016-12-30 03:11:02 -08005818 # Normalize any remaining args against the current path, so paths relative to
5819 # the current directory are still resolved as expected.
5820 args = [os.path.join(os.getcwd(), arg) for arg in args]
5821
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005822 # git diff generates paths against the root of the repository. Change
5823 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005824 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005825 if rel_base_path:
5826 os.chdir(rel_base_path)
5827
digit@chromium.org29e47272013-05-17 17:01:46 +00005828 # Grab the merge-base commit, i.e. the upstream commit of the current
5829 # branch when it was created or the last time it was rebased. This is
5830 # to cover the case where the user may have called "git fetch origin",
5831 # moving the origin branch to a newer commit, but hasn't rebased yet.
5832 upstream_commit = None
5833 cl = Changelist()
5834 upstream_branch = cl.GetUpstreamBranch()
5835 if upstream_branch:
5836 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5837 upstream_commit = upstream_commit.strip()
5838
5839 if not upstream_commit:
5840 DieWithError('Could not find base commit for this branch. '
5841 'Are you in detached state?')
5842
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005843 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5844 diff_output = RunGit(changed_files_cmd)
5845 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005846 # Filter out files deleted by this CL
5847 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005848
Christopher Lamc5ba6922017-01-24 11:19:14 +11005849 if opts.js:
5850 CLANG_EXTS.append('.js')
5851
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005852 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5853 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5854 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005855 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005856
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005857 top_dir = os.path.normpath(
5858 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5859
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005860 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5861 # formatted. This is used to block during the presubmit.
5862 return_value = 0
5863
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005864 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005865 # Locate the clang-format binary in the checkout
5866 try:
5867 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005868 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005869 DieWithError(e)
5870
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005871 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005872 cmd = [clang_format_tool]
5873 if not opts.dry_run and not opts.diff:
5874 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005875 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005876 if opts.diff:
5877 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005878 else:
5879 env = os.environ.copy()
5880 env['PATH'] = str(os.path.dirname(clang_format_tool))
5881 try:
5882 script = clang_format.FindClangFormatScriptInChromiumTree(
5883 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005884 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005885 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005886
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005887 cmd = [sys.executable, script, '-p0']
5888 if not opts.dry_run and not opts.diff:
5889 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005890
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005891 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5892 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005893
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005894 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5895 if opts.diff:
5896 sys.stdout.write(stdout)
5897 if opts.dry_run and len(stdout) > 0:
5898 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005899
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005900 # Similar code to above, but using yapf on .py files rather than clang-format
5901 # on C/C++ files
5902 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005903 yapf_tool = gclient_utils.FindExecutable('yapf')
5904 if yapf_tool is None:
5905 DieWithError('yapf not found in PATH')
5906
5907 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005908 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005909 cmd = [yapf_tool]
5910 if not opts.dry_run and not opts.diff:
5911 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005912 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005913 if opts.diff:
5914 sys.stdout.write(stdout)
5915 else:
5916 # TODO(sbc): yapf --lines mode still has some issues.
5917 # https://github.com/google/yapf/issues/154
5918 DieWithError('--python currently only works with --full')
5919
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005920 # Dart's formatter does not have the nice property of only operating on
5921 # modified chunks, so hard code full.
5922 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005923 try:
5924 command = [dart_format.FindDartFmtToolInChromiumTree()]
5925 if not opts.dry_run and not opts.diff:
5926 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005927 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005928
ppi@chromium.org6593d932016-03-03 15:41:15 +00005929 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005930 if opts.dry_run and stdout:
5931 return_value = 2
5932 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005933 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5934 'found in this checkout. Files in other languages are still '
5935 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005936
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005937 # Format GN build files. Always run on full build files for canonical form.
5938 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005939 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005940 if opts.dry_run or opts.diff:
5941 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005942 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005943 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5944 shell=sys.platform == 'win32',
5945 cwd=top_dir)
5946 if opts.dry_run and gn_ret == 2:
5947 return_value = 2 # Not formatted.
5948 elif opts.diff and gn_ret == 2:
5949 # TODO this should compute and print the actual diff.
5950 print("This change has GN build file diff for " + gn_diff_file)
5951 elif gn_ret != 0:
5952 # For non-dry run cases (and non-2 return values for dry-run), a
5953 # nonzero error code indicates a failure, probably because the file
5954 # doesn't parse.
5955 DieWithError("gn format failed on " + gn_diff_file +
5956 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005957
Steven Holte2e664bf2017-04-21 13:10:47 -07005958 for xml_dir in GetDirtyMetricsDirs(diff_files):
5959 tool_dir = os.path.join(top_dir, xml_dir)
5960 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5961 if opts.dry_run or opts.diff:
5962 cmd.append('--diff')
5963 stdout = RunCommand(cmd, cwd=top_dir)
5964 if opts.diff:
5965 sys.stdout.write(stdout)
5966 if opts.dry_run and stdout:
5967 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005968
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005969 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005970
Steven Holte2e664bf2017-04-21 13:10:47 -07005971def GetDirtyMetricsDirs(diff_files):
5972 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5973 metrics_xml_dirs = [
5974 os.path.join('tools', 'metrics', 'actions'),
5975 os.path.join('tools', 'metrics', 'histograms'),
5976 os.path.join('tools', 'metrics', 'rappor'),
5977 os.path.join('tools', 'metrics', 'ukm')]
5978 for xml_dir in metrics_xml_dirs:
5979 if any(file.startswith(xml_dir) for file in xml_diff_files):
5980 yield xml_dir
5981
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005982
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005983@subcommand.usage('<codereview url or issue id>')
5984def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005985 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005986 _, args = parser.parse_args(args)
5987
5988 if len(args) != 1:
5989 parser.print_help()
5990 return 1
5991
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005992 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005993 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005994 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005995
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005996 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005997
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005998 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005999 output = RunGit(['config', '--local', '--get-regexp',
6000 r'branch\..*\.%s' % issueprefix],
6001 error_ok=True)
6002 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006003 if issue == target_issue:
6004 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006005
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006006 branches = []
6007 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006008 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006009 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006010 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006011 return 1
6012 if len(branches) == 1:
6013 RunGit(['checkout', branches[0]])
6014 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006015 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006016 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006017 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006018 which = raw_input('Choose by index: ')
6019 try:
6020 RunGit(['checkout', branches[int(which)]])
6021 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006022 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006023 return 1
6024
6025 return 0
6026
6027
maruel@chromium.org29404b52014-09-08 22:58:00 +00006028def CMDlol(parser, args):
6029 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006030 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006031 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6032 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6033 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006034 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006035 return 0
6036
6037
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006038class OptionParser(optparse.OptionParser):
6039 """Creates the option parse and add --verbose support."""
6040 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006041 optparse.OptionParser.__init__(
6042 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006043 self.add_option(
6044 '-v', '--verbose', action='count', default=0,
6045 help='Use 2 times for more debugging info')
6046
6047 def parse_args(self, args=None, values=None):
6048 options, args = optparse.OptionParser.parse_args(self, args, values)
6049 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006050 logging.basicConfig(
6051 level=levels[min(options.verbose, len(levels) - 1)],
6052 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6053 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006054 return options, args
6055
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006056
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006057def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006058 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006059 print('\nYour python version %s is unsupported, please upgrade.\n' %
6060 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006061 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006062
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006063 # Reload settings.
6064 global settings
6065 settings = Settings()
6066
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006067 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006068 dispatcher = subcommand.CommandDispatcher(__name__)
6069 try:
6070 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006071 except auth.AuthenticationError as e:
6072 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006073 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006074 if e.code != 500:
6075 raise
6076 DieWithError(
6077 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6078 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006079 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006080
6081
6082if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006083 # These affect sys.stdout so do it outside of main() to simplify mocks in
6084 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006085 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006086 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006087 try:
6088 sys.exit(main(sys.argv[1:]))
6089 except KeyboardInterrupt:
6090 sys.stderr.write('interrupted\n')
6091 sys.exit(1)