blob: ba00fb938e622f6b875d8c9710bfee603ad38862 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02002# Copyright (c) 2013 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070030import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000031import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000032import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000034import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000035import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000036import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000037import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000038
39try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080040 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000041except ImportError:
42 pass
43
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000044from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000045from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000046from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000047import auth
skobes6468b902016-10-24 08:45:10 -070048import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000049import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000050import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000051import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000052import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000053import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000054import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000055import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000056import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000057import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000058import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000059import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000060import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000061import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000062import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040063import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000064import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000065import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000066import watchlists
67
tandrii7400cf02016-06-21 08:48:07 -070068__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000069
tandrii9d2c7a32016-06-22 03:42:45 -070070COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070071DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080072POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000073DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000074REFS_THAT_ALIAS_TO_OTHER_REFS = {
75 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
76 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
77}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000078
thestig@chromium.org44202a22014-03-11 19:22:18 +000079# Valid extensions for files we want to lint.
80DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
81DEFAULT_LINT_IGNORE_REGEX = r"$^"
82
borenet6c0efe62016-10-19 08:13:29 -070083# Buildbucket master name prefix.
84MASTER_PREFIX = 'master.'
85
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000086# Shortcut since it quickly becomes redundant.
87Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000088
maruel@chromium.orgddd59412011-11-30 14:20:38 +000089# Initialized in main()
90settings = None
91
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010092# Used by tests/git_cl_test.py to add extra logging.
93# Inside the weirdly failing test, add this:
94# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -070095# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010096_IS_BEING_TESTED = False
97
maruel@chromium.orgddd59412011-11-30 14:20:38 +000098
Christopher Lamf732cd52017-01-24 12:40:11 +110099def DieWithError(message, change_desc=None):
100 if change_desc:
101 SaveDescriptionBackup(change_desc)
102
vapiera7fbd5a2016-06-16 09:17:49 -0700103 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000104 sys.exit(1)
105
106
Christopher Lamf732cd52017-01-24 12:40:11 +1100107def SaveDescriptionBackup(change_desc):
108 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
109 print('\nError after CL description prompt -- saving description to %s\n' %
110 backup_path)
111 backup_file = open(backup_path, 'w')
112 backup_file.write(change_desc.description)
113 backup_file.close()
114
115
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000116def GetNoGitPagerEnv():
117 env = os.environ.copy()
118 # 'cat' is a magical git string that disables pagers on all platforms.
119 env['GIT_PAGER'] = 'cat'
120 return env
121
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000122
bsep@chromium.org627d9002016-04-29 00:00:52 +0000123def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000124 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000125 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000126 except subprocess2.CalledProcessError as e:
127 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000128 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000129 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000130 'Command "%s" failed.\n%s' % (
131 ' '.join(args), error_message or e.stdout or ''))
132 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000133
134
135def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000136 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000137 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000138
139
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000140def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000141 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700142 if suppress_stderr:
143 stderr = subprocess2.VOID
144 else:
145 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000146 try:
tandrii5d48c322016-08-18 16:19:37 -0700147 (out, _), code = subprocess2.communicate(['git'] + args,
148 env=GetNoGitPagerEnv(),
149 stdout=subprocess2.PIPE,
150 stderr=stderr)
151 return code, out
152 except subprocess2.CalledProcessError as e:
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +0900153 logging.debug('Failed running %s', ['git'] + args)
tandrii5d48c322016-08-18 16:19:37 -0700154 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000155
156
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000157def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000158 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000159 return RunGitWithCode(args, suppress_stderr=True)[1]
160
161
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000162def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000163 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000164 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000165 return (version.startswith(prefix) and
166 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000167
168
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000169def BranchExists(branch):
170 """Return True if specified branch exists."""
171 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
172 suppress_stderr=True)
173 return not code
174
175
tandrii2a16b952016-10-19 07:09:44 -0700176def time_sleep(seconds):
177 # Use this so that it can be mocked in tests without interfering with python
178 # system machinery.
179 import time # Local import to discourage others from importing time globally.
180 return time.sleep(seconds)
181
182
maruel@chromium.org90541732011-04-01 17:54:18 +0000183def ask_for_data(prompt):
184 try:
185 return raw_input(prompt)
186 except KeyboardInterrupt:
187 # Hide the exception.
188 sys.exit(1)
189
190
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100191def confirm_or_exit(prefix='', action='confirm'):
192 """Asks user to press enter to continue or press Ctrl+C to abort."""
193 if not prefix or prefix.endswith('\n'):
194 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100195 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100196 mid = ' Press'
197 elif prefix.endswith(' '):
198 mid = 'press'
199 else:
200 mid = ' press'
201 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
202
203
204def ask_for_explicit_yes(prompt):
205 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
206 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
207 while True:
208 if 'yes'.startswith(result):
209 return True
210 if 'no'.startswith(result):
211 return False
212 result = ask_for_data('Please, type yes or no: ').lower()
213
214
tandrii5d48c322016-08-18 16:19:37 -0700215def _git_branch_config_key(branch, key):
216 """Helper method to return Git config key for a branch."""
217 assert branch, 'branch name is required to set git config for it'
218 return 'branch.%s.%s' % (branch, key)
219
220
221def _git_get_branch_config_value(key, default=None, value_type=str,
222 branch=False):
223 """Returns git config value of given or current branch if any.
224
225 Returns default in all other cases.
226 """
227 assert value_type in (int, str, bool)
228 if branch is False: # Distinguishing default arg value from None.
229 branch = GetCurrentBranch()
230
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000231 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700232 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000233
tandrii5d48c322016-08-18 16:19:37 -0700234 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700235 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700236 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700237 # git config also has --int, but apparently git config suffers from integer
238 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700239 args.append(_git_branch_config_key(branch, key))
240 code, out = RunGitWithCode(args)
241 if code == 0:
242 value = out.strip()
243 if value_type == int:
244 return int(value)
245 if value_type == bool:
246 return bool(value.lower() == 'true')
247 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000248 return default
249
250
tandrii5d48c322016-08-18 16:19:37 -0700251def _git_set_branch_config_value(key, value, branch=None, **kwargs):
252 """Sets the value or unsets if it's None of a git branch config.
253
254 Valid, though not necessarily existing, branch must be provided,
255 otherwise currently checked out branch is used.
256 """
257 if not branch:
258 branch = GetCurrentBranch()
259 assert branch, 'a branch name OR currently checked out branch is required'
260 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700261 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700262 if value is None:
263 args.append('--unset')
264 elif isinstance(value, bool):
265 args.append('--bool')
266 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700267 else:
tandrii33a46ff2016-08-23 05:53:40 -0700268 # git config also has --int, but apparently git config suffers from integer
269 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700270 value = str(value)
271 args.append(_git_branch_config_key(branch, key))
272 if value is not None:
273 args.append(value)
274 RunGit(args, **kwargs)
275
276
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100277def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700278 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100279
280 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
281 """
282 # Git also stores timezone offset, but it only affects visual display,
283 # actual point in time is defined by this timestamp only.
284 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
285
286
287def _git_amend_head(message, committer_timestamp):
288 """Amends commit with new message and desired committer_timestamp.
289
290 Sets committer timezone to UTC.
291 """
292 env = os.environ.copy()
293 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
294 return RunGit(['commit', '--amend', '-m', message], env=env)
295
296
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000297def add_git_similarity(parser):
298 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700299 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000300 help='Sets the percentage that a pair of files need to match in order to'
301 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000302 parser.add_option(
303 '--find-copies', action='store_true',
304 help='Allows git to look for copies.')
305 parser.add_option(
306 '--no-find-copies', action='store_false', dest='find_copies',
307 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000308
309 old_parser_args = parser.parse_args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700310
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000311 def Parse(args):
312 options, args = old_parser_args(args)
313
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000314 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700315 options.similarity = _git_get_branch_config_value(
316 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000317 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000318 print('Note: Saving similarity of %d%% in git config.'
319 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700320 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000321
iannucci@chromium.org79540052012-10-19 23:15:26 +0000322 options.similarity = max(0, min(options.similarity, 100))
323
324 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700325 options.find_copies = _git_get_branch_config_value(
326 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000327 else:
tandrii5d48c322016-08-18 16:19:37 -0700328 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000329
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000330 return options, args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700331
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000332 parser.parse_args = Parse
333
334
machenbach@chromium.org45453142015-09-15 08:45:22 +0000335def _get_properties_from_options(options):
336 properties = dict(x.split('=', 1) for x in options.properties)
337 for key, val in properties.iteritems():
338 try:
339 properties[key] = json.loads(val)
340 except ValueError:
341 pass # If a value couldn't be evaluated, treat it as a string.
342 return properties
343
344
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000345def _prefix_master(master):
346 """Convert user-specified master name to full master name.
347
348 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
349 name, while the developers always use shortened master name
350 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
351 function does the conversion for buildbucket migration.
352 """
borenet6c0efe62016-10-19 08:13:29 -0700353 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000354 return master
borenet6c0efe62016-10-19 08:13:29 -0700355 return '%s%s' % (MASTER_PREFIX, master)
356
357
358def _unprefix_master(bucket):
359 """Convert bucket name to shortened master name.
360
361 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
362 name, while the developers always use shortened master name
363 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
364 function does the conversion for buildbucket migration.
365 """
366 if bucket.startswith(MASTER_PREFIX):
367 return bucket[len(MASTER_PREFIX):]
368 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000369
370
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000371def _buildbucket_retry(operation_name, http, *args, **kwargs):
372 """Retries requests to buildbucket service and returns parsed json content."""
373 try_count = 0
374 while True:
375 response, content = http.request(*args, **kwargs)
376 try:
377 content_json = json.loads(content)
378 except ValueError:
379 content_json = None
380
381 # Buildbucket could return an error even if status==200.
382 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000383 error = content_json.get('error')
384 if error.get('code') == 403:
385 raise BuildbucketResponseException(
386 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000387 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000388 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000389 raise BuildbucketResponseException(msg)
390
391 if response.status == 200:
392 if not content_json:
393 raise BuildbucketResponseException(
394 'Buildbucket returns invalid json content: %s.\n'
395 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
396 content)
397 return content_json
398 if response.status < 500 or try_count >= 2:
399 raise httplib2.HttpLib2Error(content)
400
401 # status >= 500 means transient failures.
402 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700403 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000404 try_count += 1
405 assert False, 'unreachable'
406
407
qyearsley1fdfcb62016-10-24 13:22:03 -0700408def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700409 """Returns a dict mapping bucket names to builders and tests,
410 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700411 """
qyearsleydd49f942016-10-28 11:57:22 -0700412 # If no bots are listed, we try to get a set of builders and tests based
413 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700414 if not options.bot:
415 change = changelist.GetChange(
416 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700417 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700418 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700419 change=change,
420 changed_files=change.LocalPaths(),
421 repository_root=settings.GetRoot(),
422 default_presubmit=None,
423 project=None,
424 verbose=options.verbose,
425 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700426 if masters is None:
427 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100428 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700429
qyearsley1fdfcb62016-10-24 13:22:03 -0700430 if options.bucket:
431 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700432 if options.master:
433 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700434
qyearsleydd49f942016-10-28 11:57:22 -0700435 # If bots are listed but no master or bucket, then we need to find out
436 # the corresponding master for each bot.
437 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
438 if error_message:
439 option_parser.error(
440 'Tryserver master cannot be found because: %s\n'
441 'Please manually specify the tryserver master, e.g. '
442 '"-m tryserver.chromium.linux".' % error_message)
443 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700444
445
qyearsley123a4682016-10-26 09:12:17 -0700446def _get_bucket_map_for_builders(builders):
447 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700448 map_url = 'https://builders-map.appspot.com/'
449 try:
qyearsley123a4682016-10-26 09:12:17 -0700450 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700451 except urllib2.URLError as e:
452 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
453 (map_url, e))
454 except ValueError as e:
455 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700456 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700457 return None, 'Failed to build master map.'
458
qyearsley123a4682016-10-26 09:12:17 -0700459 bucket_map = {}
460 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700461 masters = builders_map.get(builder, [])
462 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700463 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700464 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700465 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700466 (builder, masters))
467 bucket = _prefix_master(masters[0])
468 bucket_map.setdefault(bucket, {})[builder] = []
469
470 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700471
472
borenet6c0efe62016-10-19 08:13:29 -0700473def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700474 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700475 """Sends a request to Buildbucket to trigger try jobs for a changelist.
476
477 Args:
478 auth_config: AuthConfig for Rietveld.
479 changelist: Changelist that the try jobs are associated with.
480 buckets: A nested dict mapping bucket names to builders to tests.
481 options: Command-line options.
482 """
tandriide281ae2016-10-12 06:02:30 -0700483 assert changelist.GetIssue(), 'CL must be uploaded first'
484 codereview_url = changelist.GetCodereviewServer()
485 assert codereview_url, 'CL must be uploaded first'
486 patchset = patchset or changelist.GetMostRecentPatchset()
487 assert patchset, 'CL must be uploaded first'
488
489 codereview_host = urlparse.urlparse(codereview_url).hostname
490 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000491 http = authenticator.authorize(httplib2.Http())
492 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700493
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000494 buildbucket_put_url = (
495 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000496 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700497 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
498 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
499 hostname=codereview_host,
500 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000501 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700502
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700503 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700504 shared_parameters_properties['category'] = category
505 if options.clobber:
506 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700507 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700508 if extra_properties:
509 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000510
511 batch_req_body = {'builds': []}
512 print_text = []
513 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700514 for bucket, builders_and_tests in sorted(buckets.iteritems()):
515 print_text.append('Bucket: %s' % bucket)
516 master = None
517 if bucket.startswith(MASTER_PREFIX):
518 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000519 for builder, tests in sorted(builders_and_tests.iteritems()):
520 print_text.append(' %s: %s' % (builder, tests))
521 parameters = {
522 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000523 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100524 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000525 'revision': options.revision,
526 }],
tandrii8c5a3532016-11-04 07:52:02 -0700527 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000528 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000529 if 'presubmit' in builder.lower():
530 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000531 if tests:
532 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700533
534 tags = [
535 'builder:%s' % builder,
536 'buildset:%s' % buildset,
537 'user_agent:git_cl_try',
538 ]
539 if master:
540 parameters['properties']['master'] = master
541 tags.append('master:%s' % master)
542
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000543 batch_req_body['builds'].append(
544 {
545 'bucket': bucket,
546 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000547 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700548 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000549 }
550 )
551
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000552 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700553 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000554 http,
555 buildbucket_put_url,
556 'PUT',
557 body=json.dumps(batch_req_body),
558 headers={'Content-Type': 'application/json'}
559 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000560 print_text.append('To see results here, run: git cl try-results')
561 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700562 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000563
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000564
tandrii221ab252016-10-06 08:12:04 -0700565def fetch_try_jobs(auth_config, changelist, buildbucket_host,
566 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700567 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000568
qyearsley53f48a12016-09-01 10:45:13 -0700569 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000570 """
tandrii221ab252016-10-06 08:12:04 -0700571 assert buildbucket_host
572 assert changelist.GetIssue(), 'CL must be uploaded first'
573 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
574 patchset = patchset or changelist.GetMostRecentPatchset()
575 assert patchset, 'CL must be uploaded first'
576
577 codereview_url = changelist.GetCodereviewServer()
578 codereview_host = urlparse.urlparse(codereview_url).hostname
579 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000580 if authenticator.has_cached_credentials():
581 http = authenticator.authorize(httplib2.Http())
582 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700583 print('Warning: Some results might be missing because %s' %
584 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700585 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000586 http = httplib2.Http()
587
588 http.force_exception_to_status_code = True
589
tandrii221ab252016-10-06 08:12:04 -0700590 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
591 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
592 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000593 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700594 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000595 params = {'tag': 'buildset:%s' % buildset}
596
597 builds = {}
598 while True:
599 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700600 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700602 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000603 for build in content.get('builds', []):
604 builds[build['id']] = build
605 if 'next_cursor' in content:
606 params['start_cursor'] = content['next_cursor']
607 else:
608 break
609 return builds
610
611
qyearsleyeab3c042016-08-24 09:18:28 -0700612def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000613 """Prints nicely result of fetch_try_jobs."""
614 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700615 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000616 return
617
618 # Make a copy, because we'll be modifying builds dictionary.
619 builds = builds.copy()
620 builder_names_cache = {}
621
622 def get_builder(b):
623 try:
624 return builder_names_cache[b['id']]
625 except KeyError:
626 try:
627 parameters = json.loads(b['parameters_json'])
628 name = parameters['builder_name']
629 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700630 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700631 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000632 name = None
633 builder_names_cache[b['id']] = name
634 return name
635
636 def get_bucket(b):
637 bucket = b['bucket']
638 if bucket.startswith('master.'):
639 return bucket[len('master.'):]
640 return bucket
641
642 if options.print_master:
643 name_fmt = '%%-%ds %%-%ds' % (
644 max(len(str(get_bucket(b))) for b in builds.itervalues()),
645 max(len(str(get_builder(b))) for b in builds.itervalues()))
646 def get_name(b):
647 return name_fmt % (get_bucket(b), get_builder(b))
648 else:
649 name_fmt = '%%-%ds' % (
650 max(len(str(get_builder(b))) for b in builds.itervalues()))
651 def get_name(b):
652 return name_fmt % get_builder(b)
653
654 def sort_key(b):
655 return b['status'], b.get('result'), get_name(b), b.get('url')
656
657 def pop(title, f, color=None, **kwargs):
658 """Pop matching builds from `builds` dict and print them."""
659
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000660 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000661 colorize = str
662 else:
663 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
664
665 result = []
666 for b in builds.values():
667 if all(b.get(k) == v for k, v in kwargs.iteritems()):
668 builds.pop(b['id'])
669 result.append(b)
670 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700671 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000672 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700673 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000674
675 total = len(builds)
676 pop(status='COMPLETED', result='SUCCESS',
677 title='Successes:', color=Fore.GREEN,
678 f=lambda b: (get_name(b), b.get('url')))
679 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
680 title='Infra Failures:', color=Fore.MAGENTA,
681 f=lambda b: (get_name(b), b.get('url')))
682 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
683 title='Failures:', color=Fore.RED,
684 f=lambda b: (get_name(b), b.get('url')))
685 pop(status='COMPLETED', result='CANCELED',
686 title='Canceled:', color=Fore.MAGENTA,
687 f=lambda b: (get_name(b),))
688 pop(status='COMPLETED', result='FAILURE',
689 failure_reason='INVALID_BUILD_DEFINITION',
690 title='Wrong master/builder name:', color=Fore.MAGENTA,
691 f=lambda b: (get_name(b),))
692 pop(status='COMPLETED', result='FAILURE',
693 title='Other failures:',
694 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
695 pop(status='COMPLETED',
696 title='Other finished:',
697 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
698 pop(status='STARTED',
699 title='Started:', color=Fore.YELLOW,
700 f=lambda b: (get_name(b), b.get('url')))
701 pop(status='SCHEDULED',
702 title='Scheduled:',
703 f=lambda b: (get_name(b), 'id=%s' % b['id']))
704 # The last section is just in case buildbucket API changes OR there is a bug.
705 pop(title='Other:',
706 f=lambda b: (get_name(b), 'id=%s' % b['id']))
707 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700708 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000709
710
qyearsley53f48a12016-09-01 10:45:13 -0700711def write_try_results_json(output_file, builds):
712 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
713
714 The input |builds| dict is assumed to be generated by Buildbucket.
715 Buildbucket documentation: http://goo.gl/G0s101
716 """
717
718 def convert_build_dict(build):
719 return {
720 'buildbucket_id': build.get('id'),
721 'status': build.get('status'),
722 'result': build.get('result'),
723 'bucket': build.get('bucket'),
724 'builder_name': json.loads(
725 build.get('parameters_json', '{}')).get('builder_name'),
726 'failure_reason': build.get('failure_reason'),
727 'url': build.get('url'),
728 }
729
730 converted = []
731 for _, build in sorted(builds.items()):
732 converted.append(convert_build_dict(build))
733 write_json(output_file, converted)
734
735
iannucci@chromium.org79540052012-10-19 23:15:26 +0000736def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000737 """Prints statistics about the change to the user."""
738 # --no-ext-diff is broken in some versions of Git, so try to work around
739 # this by overriding the environment (but there is still a problem if the
740 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000741 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000742 if 'GIT_EXTERNAL_DIFF' in env:
743 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000744
745 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800746 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000747 else:
748 similarity_options = ['-M%s' % similarity]
749
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000750 try:
751 stdout = sys.stdout.fileno()
752 except AttributeError:
753 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000754 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000755 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000756 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000757 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000758
759
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000760class BuildbucketResponseException(Exception):
761 pass
762
763
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000764class Settings(object):
765 def __init__(self):
766 self.default_server = None
767 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000768 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000769 self.tree_status_url = None
770 self.viewvc_url = None
771 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000772 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000773 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000774 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000775 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000776 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000777 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000778
779 def LazyUpdateIfNeeded(self):
780 """Updates the settings from a codereview.settings file, if available."""
781 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000782 # The only value that actually changes the behavior is
783 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000784 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000785 error_ok=True
786 ).strip().lower()
787
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000789 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000790 LoadCodereviewSettingsFromFile(cr_settings_file)
791 self.updated = True
792
793 def GetDefaultServerUrl(self, error_ok=False):
794 if not self.default_server:
795 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000796 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000797 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000798 if error_ok:
799 return self.default_server
800 if not self.default_server:
801 error_message = ('Could not find settings file. You must configure '
802 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000803 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000804 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000805 return self.default_server
806
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000807 @staticmethod
808 def GetRelativeRoot():
809 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000810
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000811 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000812 if self.root is None:
813 self.root = os.path.abspath(self.GetRelativeRoot())
814 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000815
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000816 def GetGitMirror(self, remote='origin'):
817 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000818 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000819 if not os.path.isdir(local_url):
820 return None
821 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
822 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100823 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100824 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000825 if mirror.exists():
826 return mirror
827 return None
828
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000829 def GetTreeStatusUrl(self, error_ok=False):
830 if not self.tree_status_url:
831 error_message = ('You must configure your tree status URL by running '
832 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000833 self.tree_status_url = self._GetRietveldConfig(
834 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000835 return self.tree_status_url
836
837 def GetViewVCUrl(self):
838 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000839 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000840 return self.viewvc_url
841
rmistry@google.com90752582014-01-14 21:04:50 +0000842 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000843 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000844
rmistry@google.com78948ed2015-07-08 23:09:57 +0000845 def GetIsSkipDependencyUpload(self, branch_name):
846 """Returns true if specified branch should skip dep uploads."""
847 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
848 error_ok=True)
849
rmistry@google.com5626a922015-02-26 14:03:30 +0000850 def GetRunPostUploadHook(self):
851 run_post_upload_hook = self._GetRietveldConfig(
852 'run-post-upload-hook', error_ok=True)
853 return run_post_upload_hook == "True"
854
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000855 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000856 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000857
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000858 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000859 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000860
ukai@chromium.orge8077812012-02-03 03:41:46 +0000861 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700862 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000863 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700864 self.is_gerrit = (
865 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000866 return self.is_gerrit
867
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000868 def GetSquashGerritUploads(self):
869 """Return true if uploads to Gerrit should be squashed by default."""
870 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700871 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
872 if self.squash_gerrit_uploads is None:
873 # Default is squash now (http://crbug.com/611892#c23).
874 self.squash_gerrit_uploads = not (
875 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
876 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000877 return self.squash_gerrit_uploads
878
tandriia60502f2016-06-20 02:01:53 -0700879 def GetSquashGerritUploadsOverride(self):
880 """Return True or False if codereview.settings should be overridden.
881
882 Returns None if no override has been defined.
883 """
884 # See also http://crbug.com/611892#c23
885 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
886 error_ok=True).strip()
887 if result == 'true':
888 return True
889 if result == 'false':
890 return False
891 return None
892
tandrii@chromium.org28253532016-04-14 13:46:56 +0000893 def GetGerritSkipEnsureAuthenticated(self):
894 """Return True if EnsureAuthenticated should not be done for Gerrit
895 uploads."""
896 if self.gerrit_skip_ensure_authenticated is None:
897 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000898 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000899 error_ok=True).strip() == 'true')
900 return self.gerrit_skip_ensure_authenticated
901
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000902 def GetGitEditor(self):
903 """Return the editor specified in the git config, or None if none is."""
904 if self.git_editor is None:
905 self.git_editor = self._GetConfig('core.editor', error_ok=True)
906 return self.git_editor or None
907
thestig@chromium.org44202a22014-03-11 19:22:18 +0000908 def GetLintRegex(self):
909 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
910 DEFAULT_LINT_REGEX)
911
912 def GetLintIgnoreRegex(self):
913 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
914 DEFAULT_LINT_IGNORE_REGEX)
915
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000916 def GetProject(self):
917 if not self.project:
918 self.project = self._GetRietveldConfig('project', error_ok=True)
919 return self.project
920
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000921 def _GetRietveldConfig(self, param, **kwargs):
922 return self._GetConfig('rietveld.' + param, **kwargs)
923
rmistry@google.com78948ed2015-07-08 23:09:57 +0000924 def _GetBranchConfig(self, branch_name, param, **kwargs):
925 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
926
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000927 def _GetConfig(self, param, **kwargs):
928 self.LazyUpdateIfNeeded()
929 return RunGit(['config', param], **kwargs).strip()
930
931
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100932@contextlib.contextmanager
933def _get_gerrit_project_config_file(remote_url):
934 """Context manager to fetch and store Gerrit's project.config from
935 refs/meta/config branch and store it in temp file.
936
937 Provides a temporary filename or None if there was error.
938 """
939 error, _ = RunGitWithCode([
940 'fetch', remote_url,
941 '+refs/meta/config:refs/git_cl/meta/config'])
942 if error:
943 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700944 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100945 (remote_url, error))
946 yield None
947 return
948
949 error, project_config_data = RunGitWithCode(
950 ['show', 'refs/git_cl/meta/config:project.config'])
951 if error:
952 print('WARNING: project.config file not found')
953 yield None
954 return
955
956 with gclient_utils.temporary_directory() as tempdir:
957 project_config_file = os.path.join(tempdir, 'project.config')
958 gclient_utils.FileWrite(project_config_file, project_config_data)
959 yield project_config_file
960
961
962def _is_git_numberer_enabled(remote_url, remote_ref):
963 """Returns True if Git Numberer is enabled on this ref."""
964 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100965 KNOWN_PROJECTS_WHITELIST = [
966 'chromium/src',
967 'external/webrtc',
968 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100969 'infra/experimental',
Edward Lemur32357d32017-09-11 20:22:45 +0200970 # For webrtc.googlesource.com/src.
971 'src',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100972 ]
973
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100974 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
975 url_parts = urlparse.urlparse(remote_url)
976 project_name = url_parts.path.lstrip('/').rstrip('git./')
977 for known in KNOWN_PROJECTS_WHITELIST:
978 if project_name.endswith(known):
979 break
980 else:
981 # Early exit to avoid extra fetches for repos that aren't using Git
982 # Numberer.
983 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100984
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100985 with _get_gerrit_project_config_file(remote_url) as project_config_file:
986 if project_config_file is None:
987 # Failed to fetch project.config, which shouldn't happen on open source
988 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100989 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100990 def get_opts(x):
991 code, out = RunGitWithCode(
992 ['config', '-f', project_config_file, '--get-all',
993 'plugin.git-numberer.validate-%s-refglob' % x])
994 if code == 0:
995 return out.strip().splitlines()
996 return []
997 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100998
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100999 logging.info('validator config enabled %s disabled %s refglobs for '
1000 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001001
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001002 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001003 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001004 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001005 return True
1006 return False
1007
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001008 if match_refglobs(disabled):
1009 return False
1010 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001011
1012
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001013def ShortBranchName(branch):
1014 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001015 return branch.replace('refs/heads/', '', 1)
1016
1017
1018def GetCurrentBranchRef():
1019 """Returns branch ref (e.g., refs/heads/master) or None."""
1020 return RunGit(['symbolic-ref', 'HEAD'],
1021 stderr=subprocess2.VOID, error_ok=True).strip() or None
1022
1023
1024def GetCurrentBranch():
1025 """Returns current branch or None.
1026
1027 For refs/heads/* branches, returns just last part. For others, full ref.
1028 """
1029 branchref = GetCurrentBranchRef()
1030 if branchref:
1031 return ShortBranchName(branchref)
1032 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001033
1034
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001035class _CQState(object):
1036 """Enum for states of CL with respect to Commit Queue."""
1037 NONE = 'none'
1038 DRY_RUN = 'dry_run'
1039 COMMIT = 'commit'
1040
1041 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1042
1043
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001044class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001045 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001046 self.issue = issue
1047 self.patchset = patchset
1048 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001049 assert codereview in (None, 'rietveld', 'gerrit')
1050 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001051
1052 @property
1053 def valid(self):
1054 return self.issue is not None
1055
1056
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001057def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001058 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1059 fail_result = _ParsedIssueNumberArgument()
1060
1061 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001062 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001063 if not arg.startswith('http'):
1064 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001065
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001066 url = gclient_utils.UpgradeToHttps(arg)
1067 try:
1068 parsed_url = urlparse.urlparse(url)
1069 except ValueError:
1070 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001071
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001072 if codereview is not None:
1073 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1074 return parsed or fail_result
1075
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001076 results = {}
1077 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1078 parsed = cls.ParseIssueURL(parsed_url)
1079 if parsed is not None:
1080 results[name] = parsed
1081
1082 if not results:
1083 return fail_result
1084 if len(results) == 1:
1085 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001086
1087 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1088 # This is likely Gerrit.
1089 return results['gerrit']
1090 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001091 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001092
1093
Aaron Gablea45ee112016-11-22 15:14:38 -08001094class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001095 def __init__(self, issue, url):
1096 self.issue = issue
1097 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001098 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001099
1100 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001101 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001102 self.issue, self.url)
1103
1104
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001105_CommentSummary = collections.namedtuple(
1106 '_CommentSummary', ['date', 'message', 'sender',
1107 # TODO(tandrii): these two aren't known in Gerrit.
1108 'approval', 'disapproval'])
1109
1110
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001111class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001112 """Changelist works with one changelist in local branch.
1113
1114 Supports two codereview backends: Rietveld or Gerrit, selected at object
1115 creation.
1116
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001117 Notes:
1118 * Not safe for concurrent multi-{thread,process} use.
1119 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001120 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001121 """
1122
1123 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1124 """Create a new ChangeList instance.
1125
1126 If issue is given, the codereview must be given too.
1127
1128 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1129 Otherwise, it's decided based on current configuration of the local branch,
1130 with default being 'rietveld' for backwards compatibility.
1131 See _load_codereview_impl for more details.
1132
1133 **kwargs will be passed directly to codereview implementation.
1134 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001136 global settings
1137 if not settings:
1138 # Happens when git_cl.py is used as a utility library.
1139 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001140
1141 if issue:
1142 assert codereview, 'codereview must be known, if issue is known'
1143
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.branchref = branchref
1145 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001146 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.branch = ShortBranchName(self.branchref)
1148 else:
1149 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001151 self.lookedup_issue = False
1152 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 self.has_description = False
1154 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001155 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001157 self.cc = None
1158 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001159 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001160
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001161 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001162 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001163 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001164 assert self._codereview_impl
1165 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001166
1167 def _load_codereview_impl(self, codereview=None, **kwargs):
1168 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001169 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1170 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1171 self._codereview = codereview
1172 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001173 return
1174
1175 # Automatic selection based on issue number set for a current branch.
1176 # Rietveld takes precedence over Gerrit.
1177 assert not self.issue
1178 # Whether we find issue or not, we are doing the lookup.
1179 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001180 if self.GetBranch():
1181 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1182 issue = _git_get_branch_config_value(
1183 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1184 if issue:
1185 self._codereview = codereview
1186 self._codereview_impl = cls(self, **kwargs)
1187 self.issue = int(issue)
1188 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001189
1190 # No issue is set for this branch, so decide based on repo-wide settings.
1191 return self._load_codereview_impl(
1192 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1193 **kwargs)
1194
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001195 def IsGerrit(self):
1196 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197
1198 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001199 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001201 The return value is a string suitable for passing to git cl with the --cc
1202 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001203 """
1204 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001205 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001206 more_cc = ','.join(self.watchers)
1207 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1208 return self.cc
1209
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001210 def GetCCListWithoutDefault(self):
1211 """Return the users cc'd on this CL excluding default ones."""
1212 if self.cc is None:
1213 self.cc = ','.join(self.watchers)
1214 return self.cc
1215
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001216 def SetWatchers(self, watchers):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001217 """Sets the list of email addresses that should be cc'd based on the changed
1218 files in this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001219 """
1220 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001221
1222 def GetBranch(self):
1223 """Returns the short branch name, e.g. 'master'."""
1224 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001225 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001226 if not branchref:
1227 return None
1228 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001229 self.branch = ShortBranchName(self.branchref)
1230 return self.branch
1231
1232 def GetBranchRef(self):
1233 """Returns the full branch name, e.g. 'refs/heads/master'."""
1234 self.GetBranch() # Poke the lazy loader.
1235 return self.branchref
1236
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001237 def ClearBranch(self):
1238 """Clears cached branch data of this object."""
1239 self.branch = self.branchref = None
1240
tandrii5d48c322016-08-18 16:19:37 -07001241 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1242 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1243 kwargs['branch'] = self.GetBranch()
1244 return _git_get_branch_config_value(key, default, **kwargs)
1245
1246 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1247 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1248 assert self.GetBranch(), (
1249 'this CL must have an associated branch to %sset %s%s' %
1250 ('un' if value is None else '',
1251 key,
1252 '' if value is None else ' to %r' % value))
1253 kwargs['branch'] = self.GetBranch()
1254 return _git_set_branch_config_value(key, value, **kwargs)
1255
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001256 @staticmethod
1257 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001258 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001259 e.g. 'origin', 'refs/heads/master'
1260 """
1261 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001262 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1263
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001264 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001265 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001266 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001267 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1268 error_ok=True).strip()
1269 if upstream_branch:
1270 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001271 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001272 # Else, try to guess the origin remote.
1273 remote_branches = RunGit(['branch', '-r']).split()
1274 if 'origin/master' in remote_branches:
1275 # Fall back on origin/master if it exits.
1276 remote = 'origin'
1277 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001278 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001279 DieWithError(
1280 'Unable to determine default branch to diff against.\n'
1281 'Either pass complete "git diff"-style arguments, like\n'
1282 ' git cl upload origin/master\n'
1283 'or verify this branch is set up to track another \n'
1284 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285
1286 return remote, upstream_branch
1287
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001288 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001289 upstream_branch = self.GetUpstreamBranch()
1290 if not BranchExists(upstream_branch):
1291 DieWithError('The upstream for the current branch (%s) does not exist '
1292 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001293 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001294 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001295
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 def GetUpstreamBranch(self):
1297 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001298 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001299 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001300 upstream_branch = upstream_branch.replace('refs/heads/',
1301 'refs/remotes/%s/' % remote)
1302 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1303 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001304 self.upstream_branch = upstream_branch
1305 return self.upstream_branch
1306
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001307 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001308 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 remote, branch = None, self.GetBranch()
1310 seen_branches = set()
1311 while branch not in seen_branches:
1312 seen_branches.add(branch)
1313 remote, branch = self.FetchUpstreamTuple(branch)
1314 branch = ShortBranchName(branch)
1315 if remote != '.' or branch.startswith('refs/remotes'):
1316 break
1317 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001318 remotes = RunGit(['remote'], error_ok=True).split()
1319 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001320 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001321 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001322 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001323 logging.warn('Could not determine which remote this change is '
1324 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001325 else:
1326 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001327 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001328 branch = 'HEAD'
1329 if branch.startswith('refs/remotes'):
1330 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001331 elif branch.startswith('refs/branch-heads/'):
1332 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001333 else:
1334 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001335 return self._remote
1336
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001337 def GitSanityChecks(self, upstream_git_obj):
1338 """Checks git repo status and ensures diff is from local commits."""
1339
sbc@chromium.org79706062015-01-14 21:18:12 +00001340 if upstream_git_obj is None:
1341 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001342 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001343 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001344 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001345 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001346 return False
1347
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001348 # Verify the commit we're diffing against is in our current branch.
1349 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1350 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1351 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001352 print('ERROR: %s is not in the current branch. You may need to rebase '
1353 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001354 return False
1355
1356 # List the commits inside the diff, and verify they are all local.
1357 commits_in_diff = RunGit(
1358 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1359 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1360 remote_branch = remote_branch.strip()
1361 if code != 0:
1362 _, remote_branch = self.GetRemoteBranch()
1363
1364 commits_in_remote = RunGit(
1365 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1366
1367 common_commits = set(commits_in_diff) & set(commits_in_remote)
1368 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001369 print('ERROR: Your diff contains %d commits already in %s.\n'
1370 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1371 'the diff. If you are using a custom git flow, you can override'
1372 ' the reference used for this check with "git config '
1373 'gitcl.remotebranch <git-ref>".' % (
1374 len(common_commits), remote_branch, upstream_git_obj),
1375 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001376 return False
1377 return True
1378
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001379 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001380 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001381
1382 Returns None if it is not set.
1383 """
tandrii5d48c322016-08-18 16:19:37 -07001384 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001385
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001386 def GetRemoteUrl(self):
1387 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1388
1389 Returns None if there is no remote.
1390 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001391 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001392 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1393
1394 # If URL is pointing to a local directory, it is probably a git cache.
1395 if os.path.isdir(url):
1396 url = RunGit(['config', 'remote.%s.url' % remote],
1397 error_ok=True,
1398 cwd=url).strip()
1399 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001400
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001401 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001402 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001403 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001404 self.issue = self._GitGetBranchConfigValue(
1405 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001406 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001407 return self.issue
1408
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001409 def GetIssueURL(self):
1410 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001411 issue = self.GetIssue()
1412 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001413 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001414 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001416 def GetDescription(self, pretty=False, force=False):
1417 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001418 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001419 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001420 self.has_description = True
1421 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001422 # Set width to 72 columns + 2 space indent.
1423 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001424 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001425 lines = self.description.splitlines()
1426 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001427 return self.description
1428
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001429 def GetDescriptionFooters(self):
1430 """Returns (non_footer_lines, footers) for the commit message.
1431
1432 Returns:
1433 non_footer_lines (list(str)) - Simple list of description lines without
1434 any footer. The lines do not contain newlines, nor does the list contain
1435 the empty line between the message and the footers.
1436 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1437 [("Change-Id", "Ideadbeef...."), ...]
1438 """
1439 raw_description = self.GetDescription()
1440 msg_lines, _, footers = git_footers.split_footers(raw_description)
1441 if footers:
1442 msg_lines = msg_lines[:len(msg_lines)-1]
1443 return msg_lines, footers
1444
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001445 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001446 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001447 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001448 self.patchset = self._GitGetBranchConfigValue(
1449 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001450 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001451 return self.patchset
1452
1453 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001454 """Set this branch's patchset. If patchset=0, clears the patchset."""
1455 assert self.GetBranch()
1456 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001457 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001458 else:
1459 self.patchset = int(patchset)
1460 self._GitSetBranchConfigValue(
1461 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001462
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001463 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001464 """Set this branch's issue. If issue isn't given, clears the issue."""
1465 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001466 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001467 issue = int(issue)
1468 self._GitSetBranchConfigValue(
1469 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001470 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001471 codereview_server = self._codereview_impl.GetCodereviewServer()
1472 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001473 self._GitSetBranchConfigValue(
1474 self._codereview_impl.CodereviewServerConfigKey(),
1475 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001476 else:
tandrii5d48c322016-08-18 16:19:37 -07001477 # Reset all of these just to be clean.
1478 reset_suffixes = [
1479 'last-upload-hash',
1480 self._codereview_impl.IssueConfigKey(),
1481 self._codereview_impl.PatchsetConfigKey(),
1482 self._codereview_impl.CodereviewServerConfigKey(),
1483 ] + self._PostUnsetIssueProperties()
1484 for prop in reset_suffixes:
1485 self._GitSetBranchConfigValue(prop, None, error_ok=True)
Aaron Gableca01e2c2017-07-19 11:16:02 -07001486 msg = RunGit(['log', '-1', '--format=%B']).strip()
1487 if msg and git_footers.get_footer_change_id(msg):
1488 print('WARNING: The change patched into this branch has a Change-Id. '
1489 'Removing it.')
1490 RunGit(['commit', '--amend', '-m',
1491 git_footers.remove_footer(msg, 'Change-Id')])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001492 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001493 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001494
dnjba1b0f32016-09-02 12:37:42 -07001495 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001496 if not self.GitSanityChecks(upstream_branch):
1497 DieWithError('\nGit sanity check failure')
1498
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001499 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001500 if not root:
1501 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001502 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001503
1504 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001505 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001506 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001507 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001508 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001509 except subprocess2.CalledProcessError:
1510 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001511 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001512 'This branch probably doesn\'t exist anymore. To reset the\n'
1513 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001514 ' git branch --set-upstream-to origin/master %s\n'
1515 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001516 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001517
maruel@chromium.org52424302012-08-29 15:14:30 +00001518 issue = self.GetIssue()
1519 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001520 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001521 description = self.GetDescription()
1522 else:
1523 # If the change was never uploaded, use the log messages of all commits
1524 # up to the branch point, as git cl upload will prefill the description
1525 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001526 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1527 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001528
1529 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001530 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001531 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001532 name,
1533 description,
1534 absroot,
1535 files,
1536 issue,
1537 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001538 author,
1539 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001540
dsansomee2d6fd92016-09-08 00:10:47 -07001541 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001542 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001543 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001544 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001545
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001546 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1547 """Sets the description for this CL remotely.
1548
1549 You can get description_lines and footers with GetDescriptionFooters.
1550
1551 Args:
1552 description_lines (list(str)) - List of CL description lines without
1553 newline characters.
1554 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1555 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1556 `List-Of-Tokens`). It will be case-normalized so that each token is
1557 title-cased.
1558 """
1559 new_description = '\n'.join(description_lines)
1560 if footers:
1561 new_description += '\n'
1562 for k, v in footers:
1563 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1564 if not git_footers.FOOTER_PATTERN.match(foot):
1565 raise ValueError('Invalid footer %r' % foot)
1566 new_description += foot + '\n'
1567 self.UpdateDescription(new_description, force)
1568
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001569 def RunHook(self, committing, may_prompt, verbose, change):
1570 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1571 try:
1572 return presubmit_support.DoPresubmitChecks(change, committing,
1573 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1574 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001575 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001576 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001577 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001578 DieWithError(
1579 ('%s\nMaybe your depot_tools is out of date?\n'
1580 'If all fails, contact maruel@') % e)
1581
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001582 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1583 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001584 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1585 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001586 else:
1587 # Assume url.
1588 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1589 urlparse.urlparse(issue_arg))
1590 if not parsed_issue_arg or not parsed_issue_arg.valid:
1591 DieWithError('Failed to parse issue argument "%s". '
1592 'Must be an issue number or a valid URL.' % issue_arg)
1593 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001594 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001595
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001596 def CMDUpload(self, options, git_diff_args, orig_args):
1597 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001598 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001599 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001600 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 else:
1602 if self.GetBranch() is None:
1603 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1604
1605 # Default to diffing against common ancestor of upstream branch
1606 base_branch = self.GetCommonAncestorWithUpstream()
1607 git_diff_args = [base_branch, 'HEAD']
1608
Aaron Gablec4c40d12017-05-22 11:49:53 -07001609 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1610 if not self.IsGerrit() and not self.GetIssue():
1611 print('=====================================')
1612 print('NOTICE: Rietveld is being deprecated. '
1613 'You can upload changes to Gerrit with')
1614 print(' git cl upload --gerrit')
1615 print('or set Gerrit to be your default code review tool with')
1616 print(' git config gerrit.host true')
1617 print('=====================================')
1618
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001619 # Fast best-effort checks to abort before running potentially
1620 # expensive hooks if uploading is likely to fail anyway. Passing these
1621 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001622 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001623 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001624
1625 # Apply watchlists on upload.
1626 change = self.GetChange(base_branch, None)
1627 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1628 files = [f.LocalPath() for f in change.AffectedFiles()]
1629 if not options.bypass_watchlists:
1630 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1631
1632 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001633 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001634 # Set the reviewer list now so that presubmit checks can access it.
1635 change_description = ChangeDescription(change.FullDescriptionText())
1636 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001637 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001638 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001639 change)
1640 change.SetDescriptionText(change_description.description)
1641 hook_results = self.RunHook(committing=False,
1642 may_prompt=not options.force,
1643 verbose=options.verbose,
1644 change=change)
1645 if not hook_results.should_continue():
1646 return 1
1647 if not options.reviewers and hook_results.reviewers:
1648 options.reviewers = hook_results.reviewers.split(',')
1649
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001650 # TODO(tandrii): Checking local patchset against remote patchset is only
1651 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1652 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001653 latest_patchset = self.GetMostRecentPatchset()
1654 local_patchset = self.GetPatchset()
1655 if (latest_patchset and local_patchset and
1656 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001657 print('The last upload made from this repository was patchset #%d but '
1658 'the most recent patchset on the server is #%d.'
1659 % (local_patchset, latest_patchset))
1660 print('Uploading will still work, but if you\'ve uploaded to this '
1661 'issue from another machine or branch the patch you\'re '
1662 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001663 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001664
1665 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001666 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001667 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001668 if options.use_commit_queue:
1669 self.SetCQState(_CQState.COMMIT)
1670 elif options.cq_dry_run:
1671 self.SetCQState(_CQState.DRY_RUN)
1672
tandrii5d48c322016-08-18 16:19:37 -07001673 _git_set_branch_config_value('last-upload-hash',
1674 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001675 # Run post upload hooks, if specified.
1676 if settings.GetRunPostUploadHook():
1677 presubmit_support.DoPostUploadExecuter(
1678 change,
1679 self,
1680 settings.GetRoot(),
1681 options.verbose,
1682 sys.stdout)
1683
1684 # Upload all dependencies if specified.
1685 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001686 print()
1687 print('--dependencies has been specified.')
1688 print('All dependent local branches will be re-uploaded.')
1689 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001690 # Remove the dependencies flag from args so that we do not end up in a
1691 # loop.
1692 orig_args.remove('--dependencies')
1693 ret = upload_branch_deps(self, orig_args)
1694 return ret
1695
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001696 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001697 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001698
1699 Issue must have been already uploaded and known.
1700 """
1701 assert new_state in _CQState.ALL_STATES
1702 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001703 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001704 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001705 return 0
1706 except KeyboardInterrupt:
1707 raise
1708 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001709 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001710 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001711 ' * Your project has no CQ,\n'
1712 ' * You don\'t have permission to change the CQ state,\n'
1713 ' * There\'s a bug in this code (see stack trace below).\n'
1714 'Consider specifying which bots to trigger manually or asking your '
1715 'project owners for permissions or contacting Chrome Infra at:\n'
1716 'https://www.chromium.org/infra\n\n' %
1717 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001718 # Still raise exception so that stack trace is printed.
1719 raise
1720
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001721 # Forward methods to codereview specific implementation.
1722
Aaron Gable636b13f2017-07-14 10:42:48 -07001723 def AddComment(self, message, publish=None):
1724 return self._codereview_impl.AddComment(message, publish=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001725
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001726 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001727 """Returns list of _CommentSummary for each comment.
1728
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001729 args:
1730 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001731 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001732 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001733
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001734 def CloseIssue(self):
1735 return self._codereview_impl.CloseIssue()
1736
1737 def GetStatus(self):
1738 return self._codereview_impl.GetStatus()
1739
1740 def GetCodereviewServer(self):
1741 return self._codereview_impl.GetCodereviewServer()
1742
tandriide281ae2016-10-12 06:02:30 -07001743 def GetIssueOwner(self):
1744 """Get owner from codereview, which may differ from this checkout."""
1745 return self._codereview_impl.GetIssueOwner()
1746
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001747 def GetMostRecentPatchset(self):
1748 return self._codereview_impl.GetMostRecentPatchset()
1749
tandriide281ae2016-10-12 06:02:30 -07001750 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001751 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001752 return self._codereview_impl.CannotTriggerTryJobReason()
1753
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001754 def GetTryJobProperties(self, patchset=None):
1755 """Returns dictionary of properties to launch try job."""
1756 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001757
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001758 def __getattr__(self, attr):
1759 # This is because lots of untested code accesses Rietveld-specific stuff
1760 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001761 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001762 # Note that child method defines __getattr__ as well, and forwards it here,
1763 # because _RietveldChangelistImpl is not cleaned up yet, and given
1764 # deprecation of Rietveld, it should probably be just removed.
1765 # Until that time, avoid infinite recursion by bypassing __getattr__
1766 # of implementation class.
1767 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001768
1769
1770class _ChangelistCodereviewBase(object):
1771 """Abstract base class encapsulating codereview specifics of a changelist."""
1772 def __init__(self, changelist):
1773 self._changelist = changelist # instance of Changelist
1774
1775 def __getattr__(self, attr):
1776 # Forward methods to changelist.
1777 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1778 # _RietveldChangelistImpl to avoid this hack?
1779 return getattr(self._changelist, attr)
1780
1781 def GetStatus(self):
1782 """Apply a rough heuristic to give a simple summary of an issue's review
1783 or CQ status, assuming adherence to a common workflow.
1784
1785 Returns None if no issue for this branch, or specific string keywords.
1786 """
1787 raise NotImplementedError()
1788
1789 def GetCodereviewServer(self):
1790 """Returns server URL without end slash, like "https://codereview.com"."""
1791 raise NotImplementedError()
1792
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001793 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001794 """Fetches and returns description from the codereview server."""
1795 raise NotImplementedError()
1796
tandrii5d48c322016-08-18 16:19:37 -07001797 @classmethod
1798 def IssueConfigKey(cls):
1799 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001800 raise NotImplementedError()
1801
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001802 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001803 def PatchsetConfigKey(cls):
1804 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001805 raise NotImplementedError()
1806
tandrii5d48c322016-08-18 16:19:37 -07001807 @classmethod
1808 def CodereviewServerConfigKey(cls):
1809 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001810 raise NotImplementedError()
1811
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001812 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001813 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001814 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001815
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001816 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001817 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001818 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001819 raise NotImplementedError()
1820
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001821 def GetGerritObjForPresubmit(self):
1822 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1823 return None
1824
dsansomee2d6fd92016-09-08 00:10:47 -07001825 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001826 """Update the description on codereview site."""
1827 raise NotImplementedError()
1828
Aaron Gable636b13f2017-07-14 10:42:48 -07001829 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001830 """Posts a comment to the codereview site."""
1831 raise NotImplementedError()
1832
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001833 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001834 raise NotImplementedError()
1835
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001836 def CloseIssue(self):
1837 """Closes the issue."""
1838 raise NotImplementedError()
1839
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001840 def GetMostRecentPatchset(self):
1841 """Returns the most recent patchset number from the codereview site."""
1842 raise NotImplementedError()
1843
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001844 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001845 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001846 """Fetches and applies the issue.
1847
1848 Arguments:
1849 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1850 reject: if True, reject the failed patch instead of switching to 3-way
1851 merge. Rietveld only.
1852 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1853 only.
1854 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001855 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001856 """
1857 raise NotImplementedError()
1858
1859 @staticmethod
1860 def ParseIssueURL(parsed_url):
1861 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1862 failed."""
1863 raise NotImplementedError()
1864
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001865 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001866 """Best effort check that user is authenticated with codereview server.
1867
1868 Arguments:
1869 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001870 refresh: whether to attempt to refresh credentials. Ignored if not
1871 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001872 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001873 raise NotImplementedError()
1874
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001875 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001876 """Best effort check that uploading isn't supposed to fail for predictable
1877 reasons.
1878
1879 This method should raise informative exception if uploading shouldn't
1880 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001881
1882 Arguments:
1883 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001884 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001885 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001886
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001887 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001888 """Uploads a change to codereview."""
1889 raise NotImplementedError()
1890
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001891 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001892 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001893
1894 Issue must have been already uploaded and known.
1895 """
1896 raise NotImplementedError()
1897
tandriie113dfd2016-10-11 10:20:12 -07001898 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001899 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001900 raise NotImplementedError()
1901
tandriide281ae2016-10-12 06:02:30 -07001902 def GetIssueOwner(self):
1903 raise NotImplementedError()
1904
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001905 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001906 raise NotImplementedError()
1907
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001908
1909class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001910
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001911 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001912 super(_RietveldChangelistImpl, self).__init__(changelist)
1913 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001914 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001915 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001916
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001917 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001918 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001919 self._props = None
1920 self._rpc_server = None
1921
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001922 def GetCodereviewServer(self):
1923 if not self._rietveld_server:
1924 # If we're on a branch then get the server potentially associated
1925 # with that branch.
1926 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001927 self._rietveld_server = gclient_utils.UpgradeToHttps(
1928 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001929 if not self._rietveld_server:
1930 self._rietveld_server = settings.GetDefaultServerUrl()
1931 return self._rietveld_server
1932
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001933 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001934 """Best effort check that user is authenticated with Rietveld server."""
1935 if self._auth_config.use_oauth2:
1936 authenticator = auth.get_authenticator_for_host(
1937 self.GetCodereviewServer(), self._auth_config)
1938 if not authenticator.has_cached_credentials():
1939 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001940 if refresh:
1941 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001942
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001943 def EnsureCanUploadPatchset(self, force):
1944 # No checks for Rietveld because we are deprecating Rietveld.
1945 pass
1946
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001947 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001948 issue = self.GetIssue()
1949 assert issue
1950 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001951 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001952 except urllib2.HTTPError as e:
1953 if e.code == 404:
1954 DieWithError(
1955 ('\nWhile fetching the description for issue %d, received a '
1956 '404 (not found)\n'
1957 'error. It is likely that you deleted this '
1958 'issue on the server. If this is the\n'
1959 'case, please run\n\n'
1960 ' git cl issue 0\n\n'
1961 'to clear the association with the deleted issue. Then run '
1962 'this command again.') % issue)
1963 else:
1964 DieWithError(
1965 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1966 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001967 print('Warning: Failed to retrieve CL description due to network '
1968 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001969 return ''
1970
1971 def GetMostRecentPatchset(self):
1972 return self.GetIssueProperties()['patchsets'][-1]
1973
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001974 def GetIssueProperties(self):
1975 if self._props is None:
1976 issue = self.GetIssue()
1977 if not issue:
1978 self._props = {}
1979 else:
1980 self._props = self.RpcServer().get_issue_properties(issue, True)
1981 return self._props
1982
tandriie113dfd2016-10-11 10:20:12 -07001983 def CannotTriggerTryJobReason(self):
1984 props = self.GetIssueProperties()
1985 if not props:
1986 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1987 if props.get('closed'):
1988 return 'CL %s is closed' % self.GetIssue()
1989 if props.get('private'):
1990 return 'CL %s is private' % self.GetIssue()
1991 return None
1992
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001993 def GetTryJobProperties(self, patchset=None):
1994 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001995 project = (self.GetIssueProperties() or {}).get('project')
1996 return {
1997 'issue': self.GetIssue(),
1998 'patch_project': project,
1999 'patch_storage': 'rietveld',
2000 'patchset': patchset or self.GetPatchset(),
2001 'rietveld': self.GetCodereviewServer(),
2002 }
2003
tandriide281ae2016-10-12 06:02:30 -07002004 def GetIssueOwner(self):
2005 return (self.GetIssueProperties() or {}).get('owner_email')
2006
Aaron Gable636b13f2017-07-14 10:42:48 -07002007 def AddComment(self, message, publish=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002008 return self.RpcServer().add_comment(self.GetIssue(), message)
2009
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002010 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002011 summary = []
2012 for message in self.GetIssueProperties().get('messages', []):
2013 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2014 summary.append(_CommentSummary(
2015 date=date,
2016 disapproval=bool(message['disapproval']),
2017 approval=bool(message['approval']),
2018 sender=message['sender'],
2019 message=message['text'],
2020 ))
2021 return summary
2022
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002023 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002024 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002025 or CQ status, assuming adherence to a common workflow.
2026
2027 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002028 * 'error' - error from review tool (including deleted issues)
2029 * 'unsent' - not sent for review
2030 * 'waiting' - waiting for review
2031 * 'reply' - waiting for owner to reply to review
2032 * 'not lgtm' - Code-Review label has been set negatively
2033 * 'lgtm' - LGTM from at least one approved reviewer
2034 * 'commit' - in the commit queue
2035 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002036 """
2037 if not self.GetIssue():
2038 return None
2039
2040 try:
2041 props = self.GetIssueProperties()
2042 except urllib2.HTTPError:
2043 return 'error'
2044
2045 if props.get('closed'):
2046 # Issue is closed.
2047 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002048 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002049 # Issue is in the commit queue.
2050 return 'commit'
2051
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002052 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002053 if not messages:
2054 # No message was sent.
2055 return 'unsent'
2056
2057 if get_approving_reviewers(props):
2058 return 'lgtm'
2059 elif get_approving_reviewers(props, disapproval=True):
2060 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002061
tandrii9d2c7a32016-06-22 03:42:45 -07002062 # Skip CQ messages that don't require owner's action.
2063 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2064 if 'Dry run:' in messages[-1]['text']:
2065 messages.pop()
2066 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2067 # This message always follows prior messages from CQ,
2068 # so skip this too.
2069 messages.pop()
2070 else:
2071 # This is probably a CQ messages warranting user attention.
2072 break
2073
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002074 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002075 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002076 return 'reply'
2077 return 'waiting'
2078
dsansomee2d6fd92016-09-08 00:10:47 -07002079 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002080 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002081
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002082 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002083 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002084
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002085 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002086 return self.SetFlags({flag: value})
2087
2088 def SetFlags(self, flags):
2089 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002090 """
phajdan.jr68598232016-08-10 03:28:28 -07002091 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002092 try:
tandrii4b233bd2016-07-06 03:50:29 -07002093 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002094 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002095 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002096 if e.code == 404:
2097 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2098 if e.code == 403:
2099 DieWithError(
2100 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002101 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002102 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002103
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002104 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002105 """Returns an upload.RpcServer() to access this review's rietveld instance.
2106 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002107 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002108 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002109 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002110 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002111 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002112
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002113 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002114 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002115 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002116
tandrii5d48c322016-08-18 16:19:37 -07002117 @classmethod
2118 def PatchsetConfigKey(cls):
2119 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002120
tandrii5d48c322016-08-18 16:19:37 -07002121 @classmethod
2122 def CodereviewServerConfigKey(cls):
2123 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002124
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002125 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002126 return self.RpcServer()
2127
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002128 def SetCQState(self, new_state):
2129 props = self.GetIssueProperties()
2130 if props.get('private'):
2131 DieWithError('Cannot set-commit on private issue')
2132
2133 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002134 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002135 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002136 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002137 else:
tandrii4b233bd2016-07-06 03:50:29 -07002138 assert new_state == _CQState.DRY_RUN
2139 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002140
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002141 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002142 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002143 # PatchIssue should never be called with a dirty tree. It is up to the
2144 # caller to check this, but just in case we assert here since the
2145 # consequences of the caller not checking this could be dire.
2146 assert(not git_common.is_dirty_git_tree('apply'))
2147 assert(parsed_issue_arg.valid)
2148 self._changelist.issue = parsed_issue_arg.issue
2149 if parsed_issue_arg.hostname:
2150 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2151
skobes6468b902016-10-24 08:45:10 -07002152 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2153 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2154 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002155 try:
skobes6468b902016-10-24 08:45:10 -07002156 scm_obj.apply_patch(patchset_object)
2157 except Exception as e:
2158 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002159 return 1
2160
2161 # If we had an issue, commit the current state and register the issue.
2162 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002163 self.SetIssue(self.GetIssue())
2164 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002165 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2166 'patch from issue %(i)s at patchset '
2167 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2168 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002169 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002170 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002171 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002172 return 0
2173
2174 @staticmethod
2175 def ParseIssueURL(parsed_url):
2176 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2177 return None
wychen3c1c1722016-08-04 11:46:36 -07002178 # Rietveld patch: https://domain/<number>/#ps<patchset>
2179 match = re.match(r'/(\d+)/$', parsed_url.path)
2180 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2181 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002182 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002183 issue=int(match.group(1)),
2184 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002185 hostname=parsed_url.netloc,
2186 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002187 # Typical url: https://domain/<issue_number>[/[other]]
2188 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2189 if match:
skobes6468b902016-10-24 08:45:10 -07002190 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002191 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002192 hostname=parsed_url.netloc,
2193 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2195 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2196 if match:
skobes6468b902016-10-24 08:45:10 -07002197 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002198 issue=int(match.group(1)),
2199 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002200 hostname=parsed_url.netloc,
2201 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 return None
2203
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002204 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002205 """Upload the patch to Rietveld."""
2206 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2207 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002208 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2209 if options.emulate_svn_auto_props:
2210 upload_args.append('--emulate_svn_auto_props')
2211
2212 change_desc = None
2213
2214 if options.email is not None:
2215 upload_args.extend(['--email', options.email])
2216
2217 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002218 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002219 upload_args.extend(['--title', options.title])
2220 if options.message:
2221 upload_args.extend(['--message', options.message])
2222 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002223 print('This branch is associated with issue %s. '
2224 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225 else:
nodirca166002016-06-27 10:59:51 -07002226 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002227 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002228 if options.message:
2229 message = options.message
2230 else:
2231 message = CreateDescriptionFromLog(args)
2232 if options.title:
2233 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002234 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002235 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002236 change_desc.update_reviewers(options.reviewers, options.tbrs,
2237 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002238 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002239 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002240
2241 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002242 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002243 return 1
2244
2245 upload_args.extend(['--message', change_desc.description])
2246 if change_desc.get_reviewers():
2247 upload_args.append('--reviewers=%s' % ','.join(
2248 change_desc.get_reviewers()))
2249 if options.send_mail:
2250 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002251 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002252 upload_args.append('--send_mail')
2253
2254 # We check this before applying rietveld.private assuming that in
2255 # rietveld.cc only addresses which we can send private CLs to are listed
2256 # if rietveld.private is set, and so we should ignore rietveld.cc only
2257 # when --private is specified explicitly on the command line.
2258 if options.private:
2259 logging.warn('rietveld.cc is ignored since private flag is specified. '
2260 'You need to review and add them manually if necessary.')
2261 cc = self.GetCCListWithoutDefault()
2262 else:
2263 cc = self.GetCCList()
2264 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002265 if change_desc.get_cced():
2266 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002267 if cc:
2268 upload_args.extend(['--cc', cc])
2269
2270 if options.private or settings.GetDefaultPrivateFlag() == "True":
2271 upload_args.append('--private')
2272
2273 upload_args.extend(['--git_similarity', str(options.similarity)])
2274 if not options.find_copies:
2275 upload_args.extend(['--git_no_find_copies'])
2276
2277 # Include the upstream repo's URL in the change -- this is useful for
2278 # projects that have their source spread across multiple repos.
2279 remote_url = self.GetGitBaseUrlFromConfig()
2280 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002281 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2282 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2283 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002284 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002285 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002286 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002287 if target_ref:
2288 upload_args.extend(['--target_ref', target_ref])
2289
2290 # Look for dependent patchsets. See crbug.com/480453 for more details.
2291 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2292 upstream_branch = ShortBranchName(upstream_branch)
2293 if remote is '.':
2294 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002295 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002296 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002297 print()
2298 print('Skipping dependency patchset upload because git config '
2299 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2300 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002301 else:
2302 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002303 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002304 auth_config=auth_config)
2305 branch_cl_issue_url = branch_cl.GetIssueURL()
2306 branch_cl_issue = branch_cl.GetIssue()
2307 branch_cl_patchset = branch_cl.GetPatchset()
2308 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2309 upload_args.extend(
2310 ['--depends_on_patchset', '%s:%s' % (
2311 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002312 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002313 '\n'
2314 'The current branch (%s) is tracking a local branch (%s) with '
2315 'an associated CL.\n'
2316 'Adding %s/#ps%s as a dependency patchset.\n'
2317 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2318 branch_cl_patchset))
2319
2320 project = settings.GetProject()
2321 if project:
2322 upload_args.extend(['--project', project])
Aaron Gable665a4392017-06-29 10:53:46 -07002323 else:
2324 print()
2325 print('WARNING: Uploading without a project specified. Please ensure '
2326 'your repo\'s codereview.settings has a "PROJECT: foo" line.')
2327 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002329 try:
2330 upload_args = ['upload'] + upload_args + args
2331 logging.info('upload.RealMain(%s)', upload_args)
2332 issue, patchset = upload.RealMain(upload_args)
2333 issue = int(issue)
2334 patchset = int(patchset)
2335 except KeyboardInterrupt:
2336 sys.exit(1)
2337 except:
2338 # If we got an exception after the user typed a description for their
2339 # change, back up the description before re-raising.
2340 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002341 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002342 raise
2343
2344 if not self.GetIssue():
2345 self.SetIssue(issue)
2346 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002347 return 0
2348
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002349
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002350class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002351 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002352 # auth_config is Rietveld thing, kept here to preserve interface only.
2353 super(_GerritChangelistImpl, self).__init__(changelist)
2354 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002355 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002356 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002357 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002358 # Map from change number (issue) to its detail cache.
2359 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002360
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002361 if codereview_host is not None:
2362 assert not codereview_host.startswith('https://'), codereview_host
2363 self._gerrit_host = codereview_host
2364 self._gerrit_server = 'https://%s' % codereview_host
2365
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002366 def _GetGerritHost(self):
2367 # Lazy load of configs.
2368 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002369 if self._gerrit_host and '.' not in self._gerrit_host:
2370 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2371 # This happens for internal stuff http://crbug.com/614312.
2372 parsed = urlparse.urlparse(self.GetRemoteUrl())
2373 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002374 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002375 ' Your current remote is: %s' % self.GetRemoteUrl())
2376 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2377 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002378 return self._gerrit_host
2379
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002380 def _GetGitHost(self):
2381 """Returns git host to be used when uploading change to Gerrit."""
2382 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2383
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002384 def GetCodereviewServer(self):
2385 if not self._gerrit_server:
2386 # If we're on a branch then get the server potentially associated
2387 # with that branch.
2388 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002389 self._gerrit_server = self._GitGetBranchConfigValue(
2390 self.CodereviewServerConfigKey())
2391 if self._gerrit_server:
2392 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002393 if not self._gerrit_server:
2394 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2395 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002396 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002397 parts[0] = parts[0] + '-review'
2398 self._gerrit_host = '.'.join(parts)
2399 self._gerrit_server = 'https://%s' % self._gerrit_host
2400 return self._gerrit_server
2401
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002402 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002403 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002404 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002405
tandrii5d48c322016-08-18 16:19:37 -07002406 @classmethod
2407 def PatchsetConfigKey(cls):
2408 return 'gerritpatchset'
2409
2410 @classmethod
2411 def CodereviewServerConfigKey(cls):
2412 return 'gerritserver'
2413
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002414 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002415 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002416 if settings.GetGerritSkipEnsureAuthenticated():
2417 # For projects with unusual authentication schemes.
2418 # See http://crbug.com/603378.
2419 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002420 # Lazy-loader to identify Gerrit and Git hosts.
2421 if gerrit_util.GceAuthenticator.is_gce():
2422 return
2423 self.GetCodereviewServer()
2424 git_host = self._GetGitHost()
2425 assert self._gerrit_server and self._gerrit_host
2426 cookie_auth = gerrit_util.CookiesAuthenticator()
2427
2428 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2429 git_auth = cookie_auth.get_auth_header(git_host)
2430 if gerrit_auth and git_auth:
2431 if gerrit_auth == git_auth:
2432 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002433 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002434 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002435 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002436 ' %s\n'
2437 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002438 ' Consider running the following command:\n'
2439 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002440 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002441 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002442 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002443 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002444 cookie_auth.get_new_password_message(git_host)))
2445 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002446 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002447 return
2448 else:
2449 missing = (
Anna Henningsen4e891442017-07-06 21:40:58 +02002450 ([] if gerrit_auth else [self._gerrit_host]) +
2451 ([] if git_auth else [git_host]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002452 DieWithError('Credentials for the following hosts are required:\n'
2453 ' %s\n'
2454 'These are read from %s (or legacy %s)\n'
2455 '%s' % (
2456 '\n '.join(missing),
2457 cookie_auth.get_gitcookies_path(),
2458 cookie_auth.get_netrc_path(),
2459 cookie_auth.get_new_password_message(git_host)))
2460
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002461 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002462 if not self.GetIssue():
2463 return
2464
2465 # Warm change details cache now to avoid RPCs later, reducing latency for
2466 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002467 self._GetChangeDetail(
2468 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002469
2470 status = self._GetChangeDetail()['status']
2471 if status in ('MERGED', 'ABANDONED'):
2472 DieWithError('Change %s has been %s, new uploads are not allowed' %
2473 (self.GetIssueURL(),
2474 'submitted' if status == 'MERGED' else 'abandoned'))
2475
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002476 if gerrit_util.GceAuthenticator.is_gce():
2477 return
2478 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2479 self._GetGerritHost())
2480 if self.GetIssueOwner() == cookies_user:
2481 return
2482 logging.debug('change %s owner is %s, cookies user is %s',
2483 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002484 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002485 # so ask what Gerrit thinks of this user.
2486 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2487 if details['email'] == self.GetIssueOwner():
2488 return
2489 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002490 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002491 'as %s.\n'
2492 'Uploading may fail due to lack of permissions.' %
2493 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2494 confirm_or_exit(action='upload')
2495
2496
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002497 def _PostUnsetIssueProperties(self):
2498 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002499 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002500
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002501 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002502 class ThisIsNotRietveldIssue(object):
2503 def __nonzero__(self):
2504 # This is a hack to make presubmit_support think that rietveld is not
2505 # defined, yet still ensure that calls directly result in a decent
2506 # exception message below.
2507 return False
2508
2509 def __getattr__(self, attr):
2510 print(
2511 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2512 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002513 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002514 'or use Rietveld for codereview.\n'
2515 'See also http://crbug.com/579160.' % attr)
2516 raise NotImplementedError()
2517 return ThisIsNotRietveldIssue()
2518
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002519 def GetGerritObjForPresubmit(self):
2520 return presubmit_support.GerritAccessor(self._GetGerritHost())
2521
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002522 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002523 """Apply a rough heuristic to give a simple summary of an issue's review
2524 or CQ status, assuming adherence to a common workflow.
2525
2526 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002527 * 'error' - error from review tool (including deleted issues)
2528 * 'unsent' - no reviewers added
2529 * 'waiting' - waiting for review
2530 * 'reply' - waiting for uploader to reply to review
2531 * 'lgtm' - Code-Review label has been set
2532 * 'commit' - in the commit queue
2533 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002534 """
2535 if not self.GetIssue():
2536 return None
2537
2538 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002539 data = self._GetChangeDetail([
2540 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002541 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002542 return 'error'
2543
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002544 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002545 return 'closed'
2546
Aaron Gable9ab38c62017-04-06 14:36:33 -07002547 if data['labels'].get('Commit-Queue', {}).get('approved'):
2548 # The section will have an "approved" subsection if anyone has voted
2549 # the maximum value on the label.
2550 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002551
Aaron Gable9ab38c62017-04-06 14:36:33 -07002552 if data['labels'].get('Code-Review', {}).get('approved'):
2553 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002554
2555 if not data.get('reviewers', {}).get('REVIEWER', []):
2556 return 'unsent'
2557
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002558 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002559 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2560 last_message_author = messages.pop().get('author', {})
2561 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002562 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2563 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002564 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002565 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002566 if last_message_author.get('_account_id') == owner:
2567 # Most recent message was by owner.
2568 return 'waiting'
2569 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002570 # Some reply from non-owner.
2571 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002572
2573 # Somehow there are no messages even though there are reviewers.
2574 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002575
2576 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002577 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002578 return data['revisions'][data['current_revision']]['_number']
2579
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002580 def FetchDescription(self, force=False):
2581 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2582 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002583 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002584 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002585
dsansomee2d6fd92016-09-08 00:10:47 -07002586 def UpdateDescriptionRemote(self, description, force=False):
2587 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2588 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002589 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002590 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002591 'unpublished edit. Either publish the edit in the Gerrit web UI '
2592 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002593
2594 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2595 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002596 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002597 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002598
Aaron Gable636b13f2017-07-14 10:42:48 -07002599 def AddComment(self, message, publish=None):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002600 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
Aaron Gable636b13f2017-07-14 10:42:48 -07002601 msg=message, ready=publish)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002602
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002603 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002604 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002605 messages = self._GetChangeDetail(
2606 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2607 file_comments = gerrit_util.GetChangeComments(
2608 self._GetGerritHost(), self.GetIssue())
2609
2610 # Build dictionary of file comments for easy access and sorting later.
2611 # {author+date: {path: {patchset: {line: url+message}}}}
2612 comments = collections.defaultdict(
2613 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2614 for path, line_comments in file_comments.iteritems():
2615 for comment in line_comments:
2616 if comment.get('tag', '').startswith('autogenerated'):
2617 continue
2618 key = (comment['author']['email'], comment['updated'])
2619 if comment.get('side', 'REVISION') == 'PARENT':
2620 patchset = 'Base'
2621 else:
2622 patchset = 'PS%d' % comment['patch_set']
2623 line = comment.get('line', 0)
2624 url = ('https://%s/c/%s/%s/%s#%s%s' %
2625 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2626 'b' if comment.get('side') == 'PARENT' else '',
2627 str(line) if line else ''))
2628 comments[key][path][patchset][line] = (url, comment['message'])
2629
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002630 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002631 for msg in messages:
2632 # Don't bother showing autogenerated messages.
2633 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2634 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002635 # Gerrit spits out nanoseconds.
2636 assert len(msg['date'].split('.')[-1]) == 9
2637 date = datetime.datetime.strptime(msg['date'][:-3],
2638 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002639 message = msg['message']
2640 key = (msg['author']['email'], msg['date'])
2641 if key in comments:
2642 message += '\n'
2643 for path, patchsets in sorted(comments.get(key, {}).items()):
2644 if readable:
2645 message += '\n%s' % path
2646 for patchset, lines in sorted(patchsets.items()):
2647 for line, (url, content) in sorted(lines.items()):
2648 if line:
2649 line_str = 'Line %d' % line
2650 path_str = '%s:%d:' % (path, line)
2651 else:
2652 line_str = 'File comment'
2653 path_str = '%s:0:' % path
2654 if readable:
2655 message += '\n %s, %s: %s' % (patchset, line_str, url)
2656 message += '\n %s\n' % content
2657 else:
2658 message += '\n%s ' % path_str
2659 message += '\n%s\n' % content
2660
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002661 summary.append(_CommentSummary(
2662 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002663 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002664 sender=msg['author']['email'],
2665 # These could be inferred from the text messages and correlated with
2666 # Code-Review label maximum, however this is not reliable.
2667 # Leaving as is until the need arises.
2668 approval=False,
2669 disapproval=False,
2670 ))
2671 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002672
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002673 def CloseIssue(self):
2674 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2675
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002676 def SubmitIssue(self, wait_for_merge=True):
2677 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2678 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002679
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002680 def _GetChangeDetail(self, options=None, issue=None,
2681 no_cache=False):
2682 """Returns details of the issue by querying Gerrit and caching results.
2683
2684 If fresh data is needed, set no_cache=True which will clear cache and
2685 thus new data will be fetched from Gerrit.
2686 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002687 options = options or []
2688 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002689 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002690
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002691 # Optimization to avoid multiple RPCs:
2692 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2693 'CURRENT_COMMIT' not in options):
2694 options.append('CURRENT_COMMIT')
2695
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002696 # Normalize issue and options for consistent keys in cache.
2697 issue = str(issue)
2698 options = [o.upper() for o in options]
2699
2700 # Check in cache first unless no_cache is True.
2701 if no_cache:
2702 self._detail_cache.pop(issue, None)
2703 else:
2704 options_set = frozenset(options)
2705 for cached_options_set, data in self._detail_cache.get(issue, []):
2706 # Assumption: data fetched before with extra options is suitable
2707 # for return for a smaller set of options.
2708 # For example, if we cached data for
2709 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2710 # and request is for options=[CURRENT_REVISION],
2711 # THEN we can return prior cached data.
2712 if options_set.issubset(cached_options_set):
2713 return data
2714
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002715 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002716 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002717 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002718 except gerrit_util.GerritError as e:
2719 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002720 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002721 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002722
2723 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002724 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002725
agable32978d92016-11-01 12:55:02 -07002726 def _GetChangeCommit(self, issue=None):
2727 issue = issue or self.GetIssue()
2728 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002729 try:
2730 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2731 except gerrit_util.GerritError as e:
2732 if e.http_status == 404:
2733 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2734 raise
agable32978d92016-11-01 12:55:02 -07002735 return data
2736
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002737 def CMDLand(self, force, bypass_hooks, verbose):
2738 if git_common.is_dirty_git_tree('land'):
2739 return 1
tandriid60367b2016-06-22 05:25:12 -07002740 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2741 if u'Commit-Queue' in detail.get('labels', {}):
2742 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002743 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2744 'which can test and land changes for you. '
2745 'Are you sure you wish to bypass it?\n',
2746 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002747
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002748 differs = True
tandriic4344b52016-08-29 06:04:54 -07002749 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002750 # Note: git diff outputs nothing if there is no diff.
2751 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002752 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002753 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002754 if detail['current_revision'] == last_upload:
2755 differs = False
2756 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002757 print('WARNING: Local branch contents differ from latest uploaded '
2758 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002759 if differs:
2760 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002761 confirm_or_exit(
2762 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2763 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002764 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002765 elif not bypass_hooks:
2766 hook_results = self.RunHook(
2767 committing=True,
2768 may_prompt=not force,
2769 verbose=verbose,
2770 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2771 if not hook_results.should_continue():
2772 return 1
2773
2774 self.SubmitIssue(wait_for_merge=True)
2775 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002776 links = self._GetChangeCommit().get('web_links', [])
2777 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002778 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002779 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002780 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002781 return 0
2782
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002783 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002784 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002785 assert not reject
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002786 assert not directory
2787 assert parsed_issue_arg.valid
2788
2789 self._changelist.issue = parsed_issue_arg.issue
2790
2791 if parsed_issue_arg.hostname:
2792 self._gerrit_host = parsed_issue_arg.hostname
2793 self._gerrit_server = 'https://%s' % self._gerrit_host
2794
tandriic2405f52016-10-10 08:13:15 -07002795 try:
2796 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002797 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002798 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002799
2800 if not parsed_issue_arg.patchset:
2801 # Use current revision by default.
2802 revision_info = detail['revisions'][detail['current_revision']]
2803 patchset = int(revision_info['_number'])
2804 else:
2805 patchset = parsed_issue_arg.patchset
2806 for revision_info in detail['revisions'].itervalues():
2807 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2808 break
2809 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002810 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002811 (parsed_issue_arg.patchset, self.GetIssue()))
2812
2813 fetch_info = revision_info['fetch']['http']
2814 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002815
Aaron Gable62619a32017-06-16 08:22:09 -07002816 if force:
2817 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2818 print('Checked out commit for change %i patchset %i locally' %
2819 (parsed_issue_arg.issue, patchset))
Stefan Zager2d5f0392017-10-10 15:17:53 -07002820 elif nocommit:
2821 RunGit(['cherry-pick', '--no-commit', 'FETCH_HEAD'])
2822 print('Patch applied to index.')
Aaron Gable62619a32017-06-16 08:22:09 -07002823 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002824 RunGit(['cherry-pick', 'FETCH_HEAD'])
2825 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002826 (parsed_issue_arg.issue, patchset))
2827 print('Note: this created a local commit which does not have '
2828 'the same hash as the one uploaded for review. This will make '
2829 'uploading changes based on top of this branch difficult.\n'
2830 'If you want to do that, use "git cl patch --force" instead.')
2831
Stefan Zagerd08043c2017-10-12 12:07:02 -07002832 if self.GetBranch():
2833 self.SetIssue(parsed_issue_arg.issue)
2834 self.SetPatchset(patchset)
2835 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2836 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2837 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
2838 else:
2839 print('WARNING: You are in detached HEAD state.\n'
2840 'The patch has been applied to your checkout, but you will not be '
2841 'able to upload a new patch set to the gerrit issue.\n'
2842 'Try using the \'-b\' option if you would like to work on a '
2843 'branch and/or upload a new patch set.')
2844
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002845 return 0
2846
2847 @staticmethod
2848 def ParseIssueURL(parsed_url):
2849 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2850 return None
Aaron Gable01b91062017-08-24 17:48:40 -07002851 # Gerrit's new UI is https://domain/c/project/+/<issue_number>[/[patchset]]
2852 # But old GWT UI is https://domain/#/c/project/+/<issue_number>[/[patchset]]
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002853 # Short urls like https://domain/<issue_number> can be used, but don't allow
2854 # specifying the patchset (you'd 404), but we allow that here.
2855 if parsed_url.path == '/':
2856 part = parsed_url.fragment
2857 else:
2858 part = parsed_url.path
Aaron Gable01b91062017-08-24 17:48:40 -07002859 match = re.match('(/c(/.*/\+)?)?/(\d+)(/(\d+)?/?)?$', part)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002860 if match:
2861 return _ParsedIssueNumberArgument(
Aaron Gable01b91062017-08-24 17:48:40 -07002862 issue=int(match.group(3)),
2863 patchset=int(match.group(5)) if match.group(5) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002864 hostname=parsed_url.netloc,
2865 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002866 return None
2867
tandrii16e0b4e2016-06-07 10:34:28 -07002868 def _GerritCommitMsgHookCheck(self, offer_removal):
2869 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2870 if not os.path.exists(hook):
2871 return
2872 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2873 # custom developer made one.
2874 data = gclient_utils.FileRead(hook)
2875 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2876 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002877 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002878 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002879 'and may interfere with it in subtle ways.\n'
2880 'We recommend you remove the commit-msg hook.')
2881 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002882 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002883 gclient_utils.rm_file_or_tree(hook)
2884 print('Gerrit commit-msg hook removed.')
2885 else:
2886 print('OK, will keep Gerrit commit-msg hook in place.')
2887
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002888 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002889 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002890 if options.squash and options.no_squash:
2891 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002892
2893 if not options.squash and not options.no_squash:
2894 # Load default for user, repo, squash=true, in this order.
2895 options.squash = settings.GetSquashGerritUploads()
2896 elif options.no_squash:
2897 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002898
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002899 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002900 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002901
Aaron Gableb56ad332017-01-06 15:24:31 -08002902 # This may be None; default fallback value is determined in logic below.
2903 title = options.title
2904
Dominic Battre7d1c4842017-10-27 09:17:28 +02002905 # Extract bug number from branch name.
2906 bug = options.bug
2907 match = re.match(r'(?:bug|fix)[_-]?(\d+)', self.GetBranch())
2908 if not bug and match:
2909 bug = match.group(1)
2910
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002911 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002912 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002913 if self.GetIssue():
2914 # Try to get the message from a previous upload.
2915 message = self.GetDescription()
2916 if not message:
2917 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002918 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002919 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002920 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002921 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002922 # When uploading a subsequent patchset, -m|--message is taken
2923 # as the patchset title if --title was not provided.
2924 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002925 else:
2926 default_title = RunGit(
2927 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002928 if options.force:
2929 title = default_title
2930 else:
2931 title = ask_for_data(
2932 'Title for patchset [%s]: ' % default_title) or default_title
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002933 change_id = self._GetChangeDetail()['change_id']
2934 while True:
2935 footer_change_ids = git_footers.get_footer_change_id(message)
2936 if footer_change_ids == [change_id]:
2937 break
2938 if not footer_change_ids:
2939 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002940 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002941 continue
2942 # There is already a valid footer but with different or several ids.
2943 # Doing this automatically is non-trivial as we don't want to lose
2944 # existing other footers, yet we want to append just 1 desired
2945 # Change-Id. Thus, just create a new footer, but let user verify the
2946 # new description.
2947 message = '%s\n\nChange-Id: %s' % (message, change_id)
2948 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002949 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002950 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002951 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002952 'Please, check the proposed correction to the description, '
2953 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2954 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2955 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002956 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002957 if not options.force:
2958 change_desc = ChangeDescription(message)
Dominic Battre7d1c4842017-10-27 09:17:28 +02002959 change_desc.prompt(bug=bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002960 message = change_desc.description
2961 if not message:
2962 DieWithError("Description is empty. Aborting...")
2963 # Continue the while loop.
2964 # Sanity check of this code - we should end up with proper message
2965 # footer.
2966 assert [change_id] == git_footers.get_footer_change_id(message)
2967 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002968 else: # if not self.GetIssue()
2969 if options.message:
2970 message = options.message
2971 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002972 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002973 if options.title:
2974 message = options.title + '\n\n' + message
2975 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002976
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002977 if not options.force:
Dominic Battre7d1c4842017-10-27 09:17:28 +02002978 change_desc.prompt(bug=bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002979 # On first upload, patchset title is always this string, while
2980 # --title flag gets converted to first line of message.
2981 title = 'Initial upload'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002982 if not change_desc.description:
2983 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002984 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002985 if len(change_ids) > 1:
2986 DieWithError('too many Change-Id footers, at most 1 allowed.')
2987 if not change_ids:
2988 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002989 change_desc.set_description(git_footers.add_footer_change_id(
2990 change_desc.description,
2991 GenerateGerritChangeId(change_desc.description)))
2992 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002993 assert len(change_ids) == 1
2994 change_id = change_ids[0]
2995
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002996 if options.reviewers or options.tbrs or options.add_owners_to:
2997 change_desc.update_reviewers(options.reviewers, options.tbrs,
2998 options.add_owners_to, change)
2999
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003000 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003001 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
3002 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003003 tree = RunGit(['rev-parse', 'HEAD:']).strip()
Aaron Gable9a03ae02017-11-03 11:31:07 -07003004 with tempfile.NamedTemporaryFile(delete=False) as desc_tempfile:
3005 desc_tempfile.write(change_desc.description)
3006 desc_tempfile.close()
3007 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
3008 '-F', desc_tempfile.name]).strip()
3009 os.remove(desc_tempfile.name)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003010 else:
3011 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003012 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003013 if not change_desc.description:
3014 DieWithError("Description is empty. Aborting...")
3015
3016 if not git_footers.get_footer_change_id(change_desc.description):
3017 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003018 change_desc.set_description(
3019 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07003020 if options.reviewers or options.tbrs or options.add_owners_to:
3021 change_desc.update_reviewers(options.reviewers, options.tbrs,
3022 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003023 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003024 # For no-squash mode, we assume the remote called "origin" is the one we
3025 # want. It is not worthwhile to support different workflows for
3026 # no-squash mode.
3027 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003028 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
3029
3030 assert change_desc
3031 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3032 ref_to_push)]).splitlines()
3033 if len(commits) > 1:
3034 print('WARNING: This will upload %d commits. Run the following command '
3035 'to see which commits will be uploaded: ' % len(commits))
3036 print('git log %s..%s' % (parent, ref_to_push))
3037 print('You can also use `git squash-branch` to squash these into a '
3038 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003039 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003040
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003041 if options.reviewers or options.tbrs or options.add_owners_to:
3042 change_desc.update_reviewers(options.reviewers, options.tbrs,
3043 options.add_owners_to, change)
3044
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003045 # Extra options that can be specified at push time. Doc:
3046 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003047 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003048
Aaron Gable844cf292017-06-28 11:32:59 -07003049 # By default, new changes are started in WIP mode, and subsequent patchsets
3050 # don't send email. At any time, passing --send-mail will mark the change
3051 # ready and send email for that particular patch.
Aaron Gableafd52772017-06-27 16:40:10 -07003052 if options.send_mail:
3053 refspec_opts.append('ready')
Aaron Gable844cf292017-06-28 11:32:59 -07003054 refspec_opts.append('notify=ALL')
Aaron Gableafd52772017-06-27 16:40:10 -07003055 else:
Aaron Gable844cf292017-06-28 11:32:59 -07003056 if not self.GetIssue():
3057 refspec_opts.append('wip')
3058 else:
3059 refspec_opts.append('notify=NONE')
Aaron Gable70f4e242017-06-26 10:45:59 -07003060
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003061 # TODO(tandrii): options.message should be posted as a comment
Aaron Gablee5adf612017-07-14 10:43:58 -07003062 # if --send-mail is set on non-initial upload as Rietveld used to do it.
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003063
Aaron Gable9b713dd2016-12-14 16:04:21 -08003064 if title:
Nick Carter8692b182017-11-06 16:30:38 -08003065 # Punctuation and whitespace in |title| must be percent-encoded.
3066 refspec_opts.append('m=' + gerrit_util.PercentEncodeForGitRef(title))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003067
agablec6787972016-09-09 16:13:34 -07003068 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003069 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003070
rmistry9eadede2016-09-19 11:22:43 -07003071 if options.topic:
3072 # Documentation on Gerrit topics is here:
3073 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003074 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003075
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003076 refspec_suffix = ''
3077 if refspec_opts:
3078 refspec_suffix = '%' + ','.join(refspec_opts)
3079 assert ' ' not in refspec_suffix, (
3080 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3081 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3082
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003083 try:
3084 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003085 ['git', 'push', self.GetRemoteUrl(), refspec],
3086 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003087 # Flush after every line: useful for seeing progress when running as
3088 # recipe.
3089 filter_fn=lambda _: sys.stdout.flush())
3090 except subprocess2.CalledProcessError:
3091 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003092 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003093 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003094 'credential problems:\n'
3095 ' git cl creds-check\n',
3096 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003097
3098 if options.squash:
Aaron Gable289b4312017-09-13 14:06:16 -07003099 regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003100 change_numbers = [m.group(1)
3101 for m in map(regex.match, push_stdout.splitlines())
3102 if m]
3103 if len(change_numbers) != 1:
3104 DieWithError(
3105 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003106 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003107 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003108 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003109
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003110 reviewers = sorted(change_desc.get_reviewers())
3111
tandrii88189772016-09-29 04:29:57 -07003112 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003113 if not options.private:
3114 cc = self.GetCCList().split(',')
3115 else:
3116 cc = []
tandrii88189772016-09-29 04:29:57 -07003117 if options.cc:
3118 cc.extend(options.cc)
3119 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003120 if change_desc.get_cced():
3121 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003122
3123 gerrit_util.AddReviewers(
3124 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3125 notify=bool(options.send_mail))
3126
Aaron Gablefd238082017-06-07 13:42:34 -07003127 if change_desc.get_reviewers(tbr_only=True):
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003128 labels = self._GetChangeDetail(['LABELS']).get('labels', {})
3129 score = 1
3130 if 'Code-Review' in labels and 'values' in labels['Code-Review']:
3131 score = max([int(x) for x in labels['Code-Review']['values'].keys()])
3132 print('Adding self-LGTM (Code-Review +%d) because of TBRs.' % score)
Aaron Gablefd238082017-06-07 13:42:34 -07003133 gerrit_util.SetReview(
3134 self._GetGerritHost(), self.GetIssue(),
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09003135 msg='Self-approving for TBR',
3136 labels={'Code-Review': score})
Aaron Gablefd238082017-06-07 13:42:34 -07003137
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003138 return 0
3139
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003140 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3141 change_desc):
3142 """Computes parent of the generated commit to be uploaded to Gerrit.
3143
3144 Returns revision or a ref name.
3145 """
3146 if custom_cl_base:
3147 # Try to avoid creating additional unintended CLs when uploading, unless
3148 # user wants to take this risk.
3149 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3150 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3151 local_ref_of_target_remote])
3152 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003153 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003154 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3155 'If you proceed with upload, more than 1 CL may be created by '
3156 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3157 'If you are certain that specified base `%s` has already been '
3158 'uploaded to Gerrit as another CL, you may proceed.\n' %
3159 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3160 if not force:
3161 confirm_or_exit(
3162 'Do you take responsibility for cleaning up potential mess '
3163 'resulting from proceeding with upload?',
3164 action='upload')
3165 return custom_cl_base
3166
Aaron Gablef97e33d2017-03-30 15:44:27 -07003167 if remote != '.':
3168 return self.GetCommonAncestorWithUpstream()
3169
3170 # If our upstream branch is local, we base our squashed commit on its
3171 # squashed version.
3172 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3173
Aaron Gablef97e33d2017-03-30 15:44:27 -07003174 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003175 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003176
3177 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003178 # TODO(tandrii): consider checking parent change in Gerrit and using its
3179 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3180 # the tree hash of the parent branch. The upside is less likely bogus
3181 # requests to reupload parent change just because it's uploadhash is
3182 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003183 parent = RunGit(['config',
3184 'branch.%s.gerritsquashhash' % upstream_branch_name],
3185 error_ok=True).strip()
3186 # Verify that the upstream branch has been uploaded too, otherwise
3187 # Gerrit will create additional CLs when uploading.
3188 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3189 RunGitSilent(['rev-parse', parent + ':'])):
3190 DieWithError(
3191 '\nUpload upstream branch %s first.\n'
3192 'It is likely that this branch has been rebased since its last '
3193 'upload, so you just need to upload it again.\n'
3194 '(If you uploaded it with --no-squash, then branch dependencies '
3195 'are not supported, and you should reupload with --squash.)'
3196 % upstream_branch_name,
3197 change_desc)
3198 return parent
3199
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003200 def _AddChangeIdToCommitMessage(self, options, args):
3201 """Re-commits using the current message, assumes the commit hook is in
3202 place.
3203 """
3204 log_desc = options.message or CreateDescriptionFromLog(args)
3205 git_command = ['commit', '--amend', '-m', log_desc]
3206 RunGit(git_command)
3207 new_log_desc = CreateDescriptionFromLog(args)
3208 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003209 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003210 return new_log_desc
3211 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003212 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003213
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003214 def SetCQState(self, new_state):
3215 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003216 vote_map = {
3217 _CQState.NONE: 0,
3218 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003219 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003220 }
Aaron Gablefc62f762017-07-17 11:12:07 -07003221 labels = {'Commit-Queue': vote_map[new_state]}
3222 notify = False if new_state == _CQState.DRY_RUN else None
3223 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
3224 labels=labels, notify=notify)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003225
tandriie113dfd2016-10-11 10:20:12 -07003226 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003227 try:
3228 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003229 except GerritChangeNotExists:
3230 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003231
3232 if data['status'] in ('ABANDONED', 'MERGED'):
3233 return 'CL %s is closed' % self.GetIssue()
3234
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003235 def GetTryJobProperties(self, patchset=None):
3236 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003237 data = self._GetChangeDetail(['ALL_REVISIONS'])
3238 patchset = int(patchset or self.GetPatchset())
3239 assert patchset
3240 revision_data = None # Pylint wants it to be defined.
3241 for revision_data in data['revisions'].itervalues():
3242 if int(revision_data['_number']) == patchset:
3243 break
3244 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003245 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003246 (patchset, self.GetIssue()))
3247 return {
3248 'patch_issue': self.GetIssue(),
3249 'patch_set': patchset or self.GetPatchset(),
3250 'patch_project': data['project'],
3251 'patch_storage': 'gerrit',
3252 'patch_ref': revision_data['fetch']['http']['ref'],
3253 'patch_repository_url': revision_data['fetch']['http']['url'],
3254 'patch_gerrit_url': self.GetCodereviewServer(),
3255 }
tandriie113dfd2016-10-11 10:20:12 -07003256
tandriide281ae2016-10-12 06:02:30 -07003257 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003258 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003259
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003260
3261_CODEREVIEW_IMPLEMENTATIONS = {
3262 'rietveld': _RietveldChangelistImpl,
3263 'gerrit': _GerritChangelistImpl,
3264}
3265
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003266
iannuccie53c9352016-08-17 14:40:40 -07003267def _add_codereview_issue_select_options(parser, extra=""):
3268 _add_codereview_select_options(parser)
3269
3270 text = ('Operate on this issue number instead of the current branch\'s '
3271 'implicit issue.')
3272 if extra:
3273 text += ' '+extra
3274 parser.add_option('-i', '--issue', type=int, help=text)
3275
3276
3277def _process_codereview_issue_select_options(parser, options):
3278 _process_codereview_select_options(parser, options)
3279 if options.issue is not None and not options.forced_codereview:
3280 parser.error('--issue must be specified with either --rietveld or --gerrit')
3281
3282
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003283def _add_codereview_select_options(parser):
3284 """Appends --gerrit and --rietveld options to force specific codereview."""
3285 parser.codereview_group = optparse.OptionGroup(
3286 parser, 'EXPERIMENTAL! Codereview override options')
3287 parser.add_option_group(parser.codereview_group)
3288 parser.codereview_group.add_option(
3289 '--gerrit', action='store_true',
3290 help='Force the use of Gerrit for codereview')
3291 parser.codereview_group.add_option(
3292 '--rietveld', action='store_true',
3293 help='Force the use of Rietveld for codereview')
3294
3295
3296def _process_codereview_select_options(parser, options):
3297 if options.gerrit and options.rietveld:
3298 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3299 options.forced_codereview = None
3300 if options.gerrit:
3301 options.forced_codereview = 'gerrit'
3302 elif options.rietveld:
3303 options.forced_codereview = 'rietveld'
3304
3305
tandriif9aefb72016-07-01 09:06:51 -07003306def _get_bug_line_values(default_project, bugs):
3307 """Given default_project and comma separated list of bugs, yields bug line
3308 values.
3309
3310 Each bug can be either:
3311 * a number, which is combined with default_project
3312 * string, which is left as is.
3313
3314 This function may produce more than one line, because bugdroid expects one
3315 project per line.
3316
3317 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3318 ['v8:123', 'chromium:789']
3319 """
3320 default_bugs = []
3321 others = []
3322 for bug in bugs.split(','):
3323 bug = bug.strip()
3324 if bug:
3325 try:
3326 default_bugs.append(int(bug))
3327 except ValueError:
3328 others.append(bug)
3329
3330 if default_bugs:
3331 default_bugs = ','.join(map(str, default_bugs))
3332 if default_project:
3333 yield '%s:%s' % (default_project, default_bugs)
3334 else:
3335 yield default_bugs
3336 for other in sorted(others):
3337 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3338 yield other
3339
3340
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003341class ChangeDescription(object):
3342 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003343 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003344 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003345 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003346 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003347
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003348 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003349 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003350
agable@chromium.org42c20792013-09-12 17:34:49 +00003351 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003352 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003353 return '\n'.join(self._description_lines)
3354
3355 def set_description(self, desc):
3356 if isinstance(desc, basestring):
3357 lines = desc.splitlines()
3358 else:
3359 lines = [line.rstrip() for line in desc]
3360 while lines and not lines[0]:
3361 lines.pop(0)
3362 while lines and not lines[-1]:
3363 lines.pop(-1)
3364 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003365
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003366 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3367 """Rewrites the R=/TBR= line(s) as a single line each.
3368
3369 Args:
3370 reviewers (list(str)) - list of additional emails to use for reviewers.
3371 tbrs (list(str)) - list of additional emails to use for TBRs.
3372 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3373 the change that are missing OWNER coverage. If this is not None, you
3374 must also pass a value for `change`.
3375 change (Change) - The Change that should be used for OWNERS lookups.
3376 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003377 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003378 assert isinstance(tbrs, list), tbrs
3379
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003380 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003381 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003382
3383 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003384 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003385
3386 reviewers = set(reviewers)
3387 tbrs = set(tbrs)
3388 LOOKUP = {
3389 'TBR': tbrs,
3390 'R': reviewers,
3391 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003392
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003393 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003394 regexp = re.compile(self.R_LINE)
3395 matches = [regexp.match(line) for line in self._description_lines]
3396 new_desc = [l for i, l in enumerate(self._description_lines)
3397 if not matches[i]]
3398 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003399
agable@chromium.org42c20792013-09-12 17:34:49 +00003400 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003401
3402 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003403 for match in matches:
3404 if not match:
3405 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003406 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3407
3408 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003409 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003410 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003411 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003412 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003413 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003414 LOOKUP[add_owners_to].update(
3415 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003416
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003417 # If any folks ended up in both groups, remove them from tbrs.
3418 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003419
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003420 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3421 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003422
3423 # Put the new lines in the description where the old first R= line was.
3424 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3425 if 0 <= line_loc < len(self._description_lines):
3426 if new_tbr_line:
3427 self._description_lines.insert(line_loc, new_tbr_line)
3428 if new_r_line:
3429 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003430 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003431 if new_r_line:
3432 self.append_footer(new_r_line)
3433 if new_tbr_line:
3434 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003435
Aaron Gable3a16ed12017-03-23 10:51:55 -07003436 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003437 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003438 self.set_description([
3439 '# Enter a description of the change.',
3440 '# This will be displayed on the codereview site.',
3441 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003442 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003443 '--------------------',
3444 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003445
agable@chromium.org42c20792013-09-12 17:34:49 +00003446 regexp = re.compile(self.BUG_LINE)
3447 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003448 prefix = settings.GetBugPrefix()
3449 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003450 if git_footer:
3451 self.append_footer('Bug: %s' % ', '.join(values))
3452 else:
3453 for value in values:
3454 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003455
agable@chromium.org42c20792013-09-12 17:34:49 +00003456 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003457 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003458 if not content:
3459 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003460 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003461
3462 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003463 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3464 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003465 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003466 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003467
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003468 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003469 """Adds a footer line to the description.
3470
3471 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3472 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3473 that Gerrit footers are always at the end.
3474 """
3475 parsed_footer_line = git_footers.parse_footer(line)
3476 if parsed_footer_line:
3477 # Line is a gerrit footer in the form: Footer-Key: any value.
3478 # Thus, must be appended observing Gerrit footer rules.
3479 self.set_description(
3480 git_footers.add_footer(self.description,
3481 key=parsed_footer_line[0],
3482 value=parsed_footer_line[1]))
3483 return
3484
3485 if not self._description_lines:
3486 self._description_lines.append(line)
3487 return
3488
3489 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3490 if gerrit_footers:
3491 # git_footers.split_footers ensures that there is an empty line before
3492 # actual (gerrit) footers, if any. We have to keep it that way.
3493 assert top_lines and top_lines[-1] == ''
3494 top_lines, separator = top_lines[:-1], top_lines[-1:]
3495 else:
3496 separator = [] # No need for separator if there are no gerrit_footers.
3497
3498 prev_line = top_lines[-1] if top_lines else ''
3499 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3500 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3501 top_lines.append('')
3502 top_lines.append(line)
3503 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003504
tandrii99a72f22016-08-17 14:33:24 -07003505 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003506 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003507 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003508 reviewers = [match.group(2).strip()
3509 for match in matches
3510 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003511 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003512
bradnelsond975b302016-10-23 12:20:23 -07003513 def get_cced(self):
3514 """Retrieves the list of reviewers."""
3515 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3516 cced = [match.group(2).strip() for match in matches if match]
3517 return cleanup_list(cced)
3518
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003519 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3520 """Updates this commit description given the parent.
3521
3522 This is essentially what Gnumbd used to do.
3523 Consult https://goo.gl/WMmpDe for more details.
3524 """
3525 assert parent_msg # No, orphan branch creation isn't supported.
3526 assert parent_hash
3527 assert dest_ref
3528 parent_footer_map = git_footers.parse_footers(parent_msg)
3529 # This will also happily parse svn-position, which GnumbD is no longer
3530 # supporting. While we'd generate correct footers, the verifier plugin
3531 # installed in Gerrit will block such commit (ie git push below will fail).
3532 parent_position = git_footers.get_position(parent_footer_map)
3533
3534 # Cherry-picks may have last line obscuring their prior footers,
3535 # from git_footers perspective. This is also what Gnumbd did.
3536 cp_line = None
3537 if (self._description_lines and
3538 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3539 cp_line = self._description_lines.pop()
3540
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003541 top_lines, footer_lines, _ = git_footers.split_footers(self.description)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003542
3543 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3544 # user interference with actual footers we'd insert below.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003545 for i, line in enumerate(footer_lines):
3546 k, v = git_footers.parse_footer(line) or (None, None)
3547 if k and k.startswith('Cr-'):
3548 footer_lines[i] = '%s: %s' % ('Cr-Original-' + k[len('Cr-'):], v)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003549
3550 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003551 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003552 if parent_position[0] == dest_ref:
3553 # Same branch as parent.
3554 number = int(parent_position[1]) + 1
3555 else:
3556 number = 1 # New branch, and extra lineage.
3557 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3558 int(parent_position[1])))
3559
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003560 footer_lines.append('Cr-Commit-Position: %s@{#%d}' % (dest_ref, number))
3561 footer_lines.extend('Cr-Branched-From: %s' % v for v in lineage)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003562
3563 self._description_lines = top_lines
3564 if cp_line:
3565 self._description_lines.append(cp_line)
3566 if self._description_lines[-1] != '':
3567 self._description_lines.append('') # Ensure footer separator.
Andrii Shyshkalovde37c012017-07-06 21:06:50 +02003568 self._description_lines.extend(footer_lines)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003569
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003570
Aaron Gablea1bab272017-04-11 16:38:18 -07003571def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003572 """Retrieves the reviewers that approved a CL from the issue properties with
3573 messages.
3574
3575 Note that the list may contain reviewers that are not committer, thus are not
3576 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003577
3578 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003579 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003580 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003581 return sorted(
3582 set(
3583 message['sender']
3584 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003585 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003586 )
3587 )
3588
3589
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003590def FindCodereviewSettingsFile(filename='codereview.settings'):
3591 """Finds the given file starting in the cwd and going up.
3592
3593 Only looks up to the top of the repository unless an
3594 'inherit-review-settings-ok' file exists in the root of the repository.
3595 """
3596 inherit_ok_file = 'inherit-review-settings-ok'
3597 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003598 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003599 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3600 root = '/'
3601 while True:
3602 if filename in os.listdir(cwd):
3603 if os.path.isfile(os.path.join(cwd, filename)):
3604 return open(os.path.join(cwd, filename))
3605 if cwd == root:
3606 break
3607 cwd = os.path.dirname(cwd)
3608
3609
3610def LoadCodereviewSettingsFromFile(fileobj):
3611 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003612 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003613
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003614 def SetProperty(name, setting, unset_error_ok=False):
3615 fullname = 'rietveld.' + name
3616 if setting in keyvals:
3617 RunGit(['config', fullname, keyvals[setting]])
3618 else:
3619 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3620
tandrii48df5812016-10-17 03:55:37 -07003621 if not keyvals.get('GERRIT_HOST', False):
3622 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003623 # Only server setting is required. Other settings can be absent.
3624 # In that case, we ignore errors raised during option deletion attempt.
3625 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003626 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003627 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3628 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003629 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003630 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3631 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003632 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003633 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3634 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003635
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003636 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003637 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003638
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003639 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003640 RunGit(['config', 'gerrit.squash-uploads',
3641 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003642
tandrii@chromium.org28253532016-04-14 13:46:56 +00003643 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003644 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003645 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3646
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003647 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003648 # should be of the form
3649 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3650 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003651 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3652 keyvals['ORIGIN_URL_CONFIG']])
3653
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003654
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003655def urlretrieve(source, destination):
3656 """urllib is broken for SSL connections via a proxy therefore we
3657 can't use urllib.urlretrieve()."""
3658 with open(destination, 'w') as f:
3659 f.write(urllib2.urlopen(source).read())
3660
3661
ukai@chromium.org712d6102013-11-27 00:52:58 +00003662def hasSheBang(fname):
3663 """Checks fname is a #! script."""
3664 with open(fname) as f:
3665 return f.read(2).startswith('#!')
3666
3667
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003668# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3669def DownloadHooks(*args, **kwargs):
3670 pass
3671
3672
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003673def DownloadGerritHook(force):
3674 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003675
3676 Args:
3677 force: True to update hooks. False to install hooks if not present.
3678 """
3679 if not settings.GetIsGerrit():
3680 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003681 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003682 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3683 if not os.access(dst, os.X_OK):
3684 if os.path.exists(dst):
3685 if not force:
3686 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003687 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003688 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003689 if not hasSheBang(dst):
3690 DieWithError('Not a script: %s\n'
3691 'You need to download from\n%s\n'
3692 'into .git/hooks/commit-msg and '
3693 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003694 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3695 except Exception:
3696 if os.path.exists(dst):
3697 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003698 DieWithError('\nFailed to download hooks.\n'
3699 'You need to download from\n%s\n'
3700 'into .git/hooks/commit-msg and '
3701 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003702
3703
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003704def GetRietveldCodereviewSettingsInteractively():
3705 """Prompt the user for settings."""
3706 server = settings.GetDefaultServerUrl(error_ok=True)
3707 prompt = 'Rietveld server (host[:port])'
3708 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3709 newserver = ask_for_data(prompt + ':')
3710 if not server and not newserver:
3711 newserver = DEFAULT_SERVER
3712 if newserver:
3713 newserver = gclient_utils.UpgradeToHttps(newserver)
3714 if newserver != server:
3715 RunGit(['config', 'rietveld.server', newserver])
3716
3717 def SetProperty(initial, caption, name, is_url):
3718 prompt = caption
3719 if initial:
3720 prompt += ' ("x" to clear) [%s]' % initial
3721 new_val = ask_for_data(prompt + ':')
3722 if new_val == 'x':
3723 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3724 elif new_val:
3725 if is_url:
3726 new_val = gclient_utils.UpgradeToHttps(new_val)
3727 if new_val != initial:
3728 RunGit(['config', 'rietveld.' + name, new_val])
3729
3730 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3731 SetProperty(settings.GetDefaultPrivateFlag(),
3732 'Private flag (rietveld only)', 'private', False)
3733 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3734 'tree-status-url', False)
3735 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3736 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3737 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3738 'run-post-upload-hook', False)
3739
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003740
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003741class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003742 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003743
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003744 _GOOGLESOURCE = 'googlesource.com'
3745
3746 def __init__(self):
3747 # Cached list of [host, identity, source], where source is either
3748 # .gitcookies or .netrc.
3749 self._all_hosts = None
3750
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003751 def ensure_configured_gitcookies(self):
3752 """Runs checks and suggests fixes to make git use .gitcookies from default
3753 path."""
3754 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3755 configured_path = RunGitSilent(
3756 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003757 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003758 if configured_path:
3759 self._ensure_default_gitcookies_path(configured_path, default)
3760 else:
3761 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003762
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003763 @staticmethod
3764 def _ensure_default_gitcookies_path(configured_path, default_path):
3765 assert configured_path
3766 if configured_path == default_path:
3767 print('git is already configured to use your .gitcookies from %s' %
3768 configured_path)
3769 return
3770
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003771 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003772 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3773 (configured_path, default_path))
3774
3775 if not os.path.exists(configured_path):
3776 print('However, your configured .gitcookies file is missing.')
3777 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3778 action='reconfigure')
3779 RunGit(['config', '--global', 'http.cookiefile', default_path])
3780 return
3781
3782 if os.path.exists(default_path):
3783 print('WARNING: default .gitcookies file already exists %s' %
3784 default_path)
3785 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3786 default_path)
3787
3788 confirm_or_exit('Move existing .gitcookies to default location?',
3789 action='move')
3790 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003791 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003792 print('Moved and reconfigured git to use .gitcookies from %s' %
3793 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003794
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003795 @staticmethod
3796 def _configure_gitcookies_path(default_path):
3797 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3798 if os.path.exists(netrc_path):
3799 print('You seem to be using outdated .netrc for git credentials: %s' %
3800 netrc_path)
3801 print('This tool will guide you through setting up recommended '
3802 '.gitcookies store for git credentials.\n'
3803 '\n'
3804 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3805 ' git config --global --unset http.cookiefile\n'
3806 ' mv %s %s.backup\n\n' % (default_path, default_path))
3807 confirm_or_exit(action='setup .gitcookies')
3808 RunGit(['config', '--global', 'http.cookiefile', default_path])
3809 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003810
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003811 def get_hosts_with_creds(self, include_netrc=False):
3812 if self._all_hosts is None:
3813 a = gerrit_util.CookiesAuthenticator()
3814 self._all_hosts = [
3815 (h, u, s)
3816 for h, u, s in itertools.chain(
3817 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3818 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3819 )
3820 if h.endswith(self._GOOGLESOURCE)
3821 ]
3822
3823 if include_netrc:
3824 return self._all_hosts
3825 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3826
3827 def print_current_creds(self, include_netrc=False):
3828 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3829 if not hosts:
3830 print('No Git/Gerrit credentials found')
3831 return
3832 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3833 header = [('Host', 'User', 'Which file'),
3834 ['=' * l for l in lengths]]
3835 for row in (header + hosts):
3836 print('\t'.join((('%%+%ds' % l) % s)
3837 for l, s in zip(lengths, row)))
3838
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003839 @staticmethod
3840 def _parse_identity(identity):
3841 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +02003842 # Special case: users whose ldaps contain ".", which are generally not
3843 # distinguishable from sub-domains. But we do know typical domains:
3844 if identity.endswith('.chromium.org'):
3845 domain = 'chromium.org'
3846 username = identity[:-len('.chromium.org')]
3847 else:
3848 username, domain = identity.split('.', 1)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003849 if username.startswith('git-'):
3850 username = username[len('git-'):]
3851 return username, domain
3852
3853 def _get_usernames_of_domain(self, domain):
3854 """Returns list of usernames referenced by .gitcookies in a given domain."""
3855 identities_by_domain = {}
3856 for _, identity, _ in self.get_hosts_with_creds():
3857 username, domain = self._parse_identity(identity)
3858 identities_by_domain.setdefault(domain, []).append(username)
3859 return identities_by_domain.get(domain)
3860
3861 def _canonical_git_googlesource_host(self, host):
3862 """Normalizes Gerrit hosts (with '-review') to Git host."""
3863 assert host.endswith(self._GOOGLESOURCE)
3864 # Prefix doesn't include '.' at the end.
3865 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3866 if prefix.endswith('-review'):
3867 prefix = prefix[:-len('-review')]
3868 return prefix + '.' + self._GOOGLESOURCE
3869
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003870 def _canonical_gerrit_googlesource_host(self, host):
3871 git_host = self._canonical_git_googlesource_host(host)
3872 prefix = git_host.split('.', 1)[0]
3873 return prefix + '-review.' + self._GOOGLESOURCE
3874
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003875 def _get_counterpart_host(self, host):
3876 assert host.endswith(self._GOOGLESOURCE)
3877 git = self._canonical_git_googlesource_host(host)
3878 gerrit = self._canonical_gerrit_googlesource_host(git)
3879 return git if gerrit == host else gerrit
3880
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003881 def has_generic_host(self):
3882 """Returns whether generic .googlesource.com has been configured.
3883
3884 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3885 """
3886 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3887 if host == '.' + self._GOOGLESOURCE:
3888 return True
3889 return False
3890
3891 def _get_git_gerrit_identity_pairs(self):
3892 """Returns map from canonic host to pair of identities (Git, Gerrit).
3893
3894 One of identities might be None, meaning not configured.
3895 """
3896 host_to_identity_pairs = {}
3897 for host, identity, _ in self.get_hosts_with_creds():
3898 canonical = self._canonical_git_googlesource_host(host)
3899 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3900 idx = 0 if canonical == host else 1
3901 pair[idx] = identity
3902 return host_to_identity_pairs
3903
3904 def get_partially_configured_hosts(self):
3905 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003906 (host if i1 else self._canonical_gerrit_googlesource_host(host))
3907 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
3908 if None in (i1, i2) and host != '.' + self._GOOGLESOURCE)
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003909
3910 def get_conflicting_hosts(self):
3911 return set(
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003912 host
3913 for host, (i1, i2) in self._get_git_gerrit_identity_pairs().iteritems()
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003914 if None not in (i1, i2) and i1 != i2)
3915
3916 def get_duplicated_hosts(self):
3917 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3918 return set(host for host, count in counters.iteritems() if count > 1)
3919
3920 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3921 'chromium.googlesource.com': 'chromium.org',
3922 'chrome-internal.googlesource.com': 'google.com',
3923 }
3924
3925 def get_hosts_with_wrong_identities(self):
3926 """Finds hosts which **likely** reference wrong identities.
3927
3928 Note: skips hosts which have conflicting identities for Git and Gerrit.
3929 """
3930 hosts = set()
3931 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3932 pair = self._get_git_gerrit_identity_pairs().get(host)
3933 if pair and pair[0] == pair[1]:
3934 _, domain = self._parse_identity(pair[0])
3935 if domain != expected:
3936 hosts.add(host)
3937 return hosts
3938
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003939 @staticmethod
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003940 def _format_hosts(hosts, extra_column_func=None):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003941 hosts = sorted(hosts)
3942 assert hosts
3943 if extra_column_func is None:
3944 extras = [''] * len(hosts)
3945 else:
3946 extras = [extra_column_func(host) for host in hosts]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003947 tmpl = '%%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3948 lines = []
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003949 for he in zip(hosts, extras):
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003950 lines.append(tmpl % he)
3951 return lines
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003952
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003953 def _find_problems(self):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003954 if self.has_generic_host():
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003955 yield ('.googlesource.com wildcard record detected',
3956 ['Chrome Infrastructure team recommends to list full host names '
3957 'explicitly.'],
3958 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003959
3960 dups = self.get_duplicated_hosts()
3961 if dups:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003962 yield ('The following hosts were defined twice',
3963 self._format_hosts(dups),
3964 None)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003965
3966 partial = self.get_partially_configured_hosts()
3967 if partial:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003968 yield ('Credentials should come in pairs for Git and Gerrit hosts. '
3969 'These hosts are missing',
3970 self._format_hosts(partial, lambda host: 'but %s defined' %
3971 self._get_counterpart_host(host)),
3972 partial)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003973
3974 conflicting = self.get_conflicting_hosts()
3975 if conflicting:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003976 yield ('The following Git hosts have differing credentials from their '
3977 'Gerrit counterparts',
3978 self._format_hosts(conflicting, lambda host: '%s vs %s' %
3979 tuple(self._get_git_gerrit_identity_pairs()[host])),
3980 conflicting)
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003981
3982 wrong = self.get_hosts_with_wrong_identities()
3983 if wrong:
Andrii Shyshkalovc8173822017-07-10 12:10:53 +02003984 yield ('These hosts likely use wrong identity',
3985 self._format_hosts(wrong, lambda host: '%s but %s recommended' %
3986 (self._get_git_gerrit_identity_pairs()[host][0],
3987 self._EXPECTED_HOST_IDENTITY_DOMAINS[host])),
3988 wrong)
3989
3990 def find_and_report_problems(self):
3991 """Returns True if there was at least one problem, else False."""
3992 found = False
3993 bad_hosts = set()
3994 for title, sublines, hosts in self._find_problems():
3995 if not found:
3996 found = True
3997 print('\n\n.gitcookies problem report:\n')
3998 bad_hosts.update(hosts or [])
3999 print(' %s%s' % (title , (':' if sublines else '')))
4000 if sublines:
4001 print()
4002 print(' %s' % '\n '.join(sublines))
4003 print()
4004
4005 if bad_hosts:
4006 assert found
4007 print(' You can manually remove corresponding lines in your %s file and '
4008 'visit the following URLs with correct account to generate '
4009 'correct credential lines:\n' %
4010 gerrit_util.CookiesAuthenticator.get_gitcookies_path())
4011 print(' %s' % '\n '.join(sorted(set(
4012 gerrit_util.CookiesAuthenticator().get_new_password_url(
4013 self._canonical_git_googlesource_host(host))
4014 for host in bad_hosts
4015 ))))
4016 return found
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004017
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004018
4019def CMDcreds_check(parser, args):
4020 """Checks credentials and suggests changes."""
4021 _, _ = parser.parse_args(args)
4022
4023 if gerrit_util.GceAuthenticator.is_gce():
Aaron Gabled10ca0e2017-09-11 11:24:10 -07004024 DieWithError(
4025 'This command is not designed for GCE, are you on a bot?\n'
4026 'If you need to run this, export SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004027
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01004028 checker = _GitCookiesChecker()
4029 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004030
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004031 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01004032 checker.print_current_creds(include_netrc=True)
4033
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004034 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004035 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01004036 return 0
4037 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01004038
4039
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004040@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004041def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004042 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004043
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004044 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07004045 # TODO(tandrii): remove this once we switch to Gerrit.
4046 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00004047 parser.add_option('--activate-update', action='store_true',
4048 help='activate auto-updating [rietveld] section in '
4049 '.git/config')
4050 parser.add_option('--deactivate-update', action='store_true',
4051 help='deactivate auto-updating [rietveld] section in '
4052 '.git/config')
4053 options, args = parser.parse_args(args)
4054
4055 if options.deactivate_update:
4056 RunGit(['config', 'rietveld.autoupdate', 'false'])
4057 return
4058
4059 if options.activate_update:
4060 RunGit(['config', '--unset', 'rietveld.autoupdate'])
4061 return
4062
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004063 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00004064 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004065 return 0
4066
4067 url = args[0]
4068 if not url.endswith('codereview.settings'):
4069 url = os.path.join(url, 'codereview.settings')
4070
4071 # Load code review settings and download hooks (if available).
4072 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4073 return 0
4074
4075
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004076def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004077 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004078 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4079 branch = ShortBranchName(branchref)
4080 _, args = parser.parse_args(args)
4081 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004082 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004083 return RunGit(['config', 'branch.%s.base-url' % branch],
4084 error_ok=False).strip()
4085 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004086 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004087 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4088 error_ok=False).strip()
4089
4090
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004091def color_for_status(status):
4092 """Maps a Changelist status to color, for CMDstatus and other tools."""
4093 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004094 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004095 'waiting': Fore.BLUE,
4096 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004097 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004098 'lgtm': Fore.GREEN,
4099 'commit': Fore.MAGENTA,
4100 'closed': Fore.CYAN,
4101 'error': Fore.WHITE,
4102 }.get(status, Fore.WHITE)
4103
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004104
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004105def get_cl_statuses(changes, fine_grained, max_processes=None):
4106 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004107
4108 If fine_grained is true, this will fetch CL statuses from the server.
4109 Otherwise, simply indicate if there's a matching url for the given branches.
4110
4111 If max_processes is specified, it is used as the maximum number of processes
4112 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4113 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004114
4115 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004116 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004117 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004118 upload.verbosity = 0
4119
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004120 if not changes:
4121 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004122
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004123 if not fine_grained:
4124 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004125 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004126 for cl in changes:
4127 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004128 return
4129
4130 # First, sort out authentication issues.
4131 logging.debug('ensuring credentials exist')
4132 for cl in changes:
4133 cl.EnsureAuthenticated(force=False, refresh=True)
4134
4135 def fetch(cl):
4136 try:
4137 return (cl, cl.GetStatus())
4138 except:
4139 # See http://crbug.com/629863.
4140 logging.exception('failed to fetch status for %s:', cl)
4141 raise
4142
4143 threads_count = len(changes)
4144 if max_processes:
4145 threads_count = max(1, min(threads_count, max_processes))
4146 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4147
4148 pool = ThreadPool(threads_count)
4149 fetched_cls = set()
4150 try:
4151 it = pool.imap_unordered(fetch, changes).__iter__()
4152 while True:
4153 try:
4154 cl, status = it.next(timeout=5)
4155 except multiprocessing.TimeoutError:
4156 break
4157 fetched_cls.add(cl)
4158 yield cl, status
4159 finally:
4160 pool.close()
4161
4162 # Add any branches that failed to fetch.
4163 for cl in set(changes) - fetched_cls:
4164 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004165
rmistry@google.com2dd99862015-06-22 12:22:18 +00004166
4167def upload_branch_deps(cl, args):
4168 """Uploads CLs of local branches that are dependents of the current branch.
4169
4170 If the local branch dependency tree looks like:
4171 test1 -> test2.1 -> test3.1
4172 -> test3.2
4173 -> test2.2 -> test3.3
4174
4175 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4176 run on the dependent branches in this order:
4177 test2.1, test3.1, test3.2, test2.2, test3.3
4178
4179 Note: This function does not rebase your local dependent branches. Use it when
4180 you make a change to the parent branch that will not conflict with its
4181 dependent branches, and you would like their dependencies updated in
4182 Rietveld.
4183 """
4184 if git_common.is_dirty_git_tree('upload-branch-deps'):
4185 return 1
4186
4187 root_branch = cl.GetBranch()
4188 if root_branch is None:
4189 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4190 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004191 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004192 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4193 'patchset dependencies without an uploaded CL.')
4194
4195 branches = RunGit(['for-each-ref',
4196 '--format=%(refname:short) %(upstream:short)',
4197 'refs/heads'])
4198 if not branches:
4199 print('No local branches found.')
4200 return 0
4201
4202 # Create a dictionary of all local branches to the branches that are dependent
4203 # on it.
4204 tracked_to_dependents = collections.defaultdict(list)
4205 for b in branches.splitlines():
4206 tokens = b.split()
4207 if len(tokens) == 2:
4208 branch_name, tracked = tokens
4209 tracked_to_dependents[tracked].append(branch_name)
4210
vapiera7fbd5a2016-06-16 09:17:49 -07004211 print()
4212 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004213 dependents = []
4214 def traverse_dependents_preorder(branch, padding=''):
4215 dependents_to_process = tracked_to_dependents.get(branch, [])
4216 padding += ' '
4217 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004218 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004219 dependents.append(dependent)
4220 traverse_dependents_preorder(dependent, padding)
4221 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004222 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004223
4224 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004225 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004226 return 0
4227
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004228 confirm_or_exit('This command will checkout all dependent branches and run '
4229 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004230
andybons@chromium.org962f9462016-02-03 20:00:42 +00004231 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004232 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004233 args.extend(['-t', 'Updated patchset dependency'])
4234
rmistry@google.com2dd99862015-06-22 12:22:18 +00004235 # Record all dependents that failed to upload.
4236 failures = {}
4237 # Go through all dependents, checkout the branch and upload.
4238 try:
4239 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004240 print()
4241 print('--------------------------------------')
4242 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004243 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004244 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004245 try:
4246 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004247 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004248 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004249 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004250 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004251 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004252 finally:
4253 # Swap back to the original root branch.
4254 RunGit(['checkout', '-q', root_branch])
4255
vapiera7fbd5a2016-06-16 09:17:49 -07004256 print()
4257 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004258 for dependent_branch in dependents:
4259 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004260 print(' %s : %s' % (dependent_branch, upload_status))
4261 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004262
4263 return 0
4264
4265
kmarshall3bff56b2016-06-06 18:31:47 -07004266def CMDarchive(parser, args):
4267 """Archives and deletes branches associated with closed changelists."""
4268 parser.add_option(
4269 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004270 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004271 parser.add_option(
4272 '-f', '--force', action='store_true',
4273 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004274 parser.add_option(
4275 '-d', '--dry-run', action='store_true',
4276 help='Skip the branch tagging and removal steps.')
4277 parser.add_option(
4278 '-t', '--notags', action='store_true',
4279 help='Do not tag archived branches. '
4280 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004281
4282 auth.add_auth_options(parser)
4283 options, args = parser.parse_args(args)
4284 if args:
4285 parser.error('Unsupported args: %s' % ' '.join(args))
4286 auth_config = auth.extract_auth_config_from_options(options)
4287
4288 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4289 if not branches:
4290 return 0
4291
vapiera7fbd5a2016-06-16 09:17:49 -07004292 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004293 changes = [Changelist(branchref=b, auth_config=auth_config)
4294 for b in branches.splitlines()]
4295 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4296 statuses = get_cl_statuses(changes,
4297 fine_grained=True,
4298 max_processes=options.maxjobs)
4299 proposal = [(cl.GetBranch(),
4300 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4301 for cl, status in statuses
4302 if status == 'closed']
4303 proposal.sort()
4304
4305 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004306 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004307 return 0
4308
4309 current_branch = GetCurrentBranch()
4310
vapiera7fbd5a2016-06-16 09:17:49 -07004311 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004312 if options.notags:
4313 for next_item in proposal:
4314 print(' ' + next_item[0])
4315 else:
4316 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4317 for next_item in proposal:
4318 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004319
kmarshall9249e012016-08-23 12:02:16 -07004320 # Quit now on precondition failure or if instructed by the user, either
4321 # via an interactive prompt or by command line flags.
4322 if options.dry_run:
4323 print('\nNo changes were made (dry run).\n')
4324 return 0
4325 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004326 print('You are currently on a branch \'%s\' which is associated with a '
4327 'closed codereview issue, so archive cannot proceed. Please '
4328 'checkout another branch and run this command again.' %
4329 current_branch)
4330 return 1
kmarshall9249e012016-08-23 12:02:16 -07004331 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004332 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4333 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004334 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004335 return 1
4336
4337 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004338 if not options.notags:
4339 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004340 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004341
vapiera7fbd5a2016-06-16 09:17:49 -07004342 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004343
4344 return 0
4345
4346
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004347def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004348 """Show status of changelists.
4349
4350 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004351 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004352 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004353 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004354 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004355 - Magenta in the commit queue
4356 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004357 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004358
4359 Also see 'git cl comments'.
4360 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004361 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004362 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004363 parser.add_option('-f', '--fast', action='store_true',
4364 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004365 parser.add_option(
4366 '-j', '--maxjobs', action='store', type=int,
4367 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004368
4369 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004370 _add_codereview_issue_select_options(
4371 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004372 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004373 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004374 if args:
4375 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004376 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004377
iannuccie53c9352016-08-17 14:40:40 -07004378 if options.issue is not None and not options.field:
4379 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004380
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004381 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004382 cl = Changelist(auth_config=auth_config, issue=options.issue,
4383 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004384 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004385 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004386 elif options.field == 'id':
4387 issueid = cl.GetIssue()
4388 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004389 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004390 elif options.field == 'patch':
4391 patchset = cl.GetPatchset()
4392 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004393 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004394 elif options.field == 'status':
4395 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004396 elif options.field == 'url':
4397 url = cl.GetIssueURL()
4398 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004399 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004400 return 0
4401
4402 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4403 if not branches:
4404 print('No local branch found.')
4405 return 0
4406
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004407 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004408 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004409 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004410 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004411 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004412 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004413 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004414
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004415 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004416 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4417 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4418 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004419 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004420 c, status = output.next()
4421 branch_statuses[c.GetBranch()] = status
4422 status = branch_statuses.pop(branch)
4423 url = cl.GetIssueURL()
4424 if url and (not status or status == 'error'):
4425 # The issue probably doesn't exist anymore.
4426 url += ' (broken)'
4427
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004428 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004429 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004430 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004431 color = ''
4432 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004433 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004434 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004435 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004436 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004437
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004438
4439 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004440 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004441 print('Current branch: %s' % branch)
4442 for cl in changes:
4443 if cl.GetBranch() == branch:
4444 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004445 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004446 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004447 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004448 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004449 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004450 print('Issue description:')
4451 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004452 return 0
4453
4454
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004455def colorize_CMDstatus_doc():
4456 """To be called once in main() to add colors to git cl status help."""
4457 colors = [i for i in dir(Fore) if i[0].isupper()]
4458
4459 def colorize_line(line):
4460 for color in colors:
4461 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004462 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004463 indent = len(line) - len(line.lstrip(' ')) + 1
4464 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4465 return line
4466
4467 lines = CMDstatus.__doc__.splitlines()
4468 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4469
4470
phajdan.jre328cf92016-08-22 04:12:17 -07004471def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004472 if path == '-':
4473 json.dump(contents, sys.stdout)
4474 else:
4475 with open(path, 'w') as f:
4476 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004477
4478
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004479@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004481 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004482
4483 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004484 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004485 parser.add_option('-r', '--reverse', action='store_true',
4486 help='Lookup the branch(es) for the specified issues. If '
4487 'no issues are specified, all branches with mapped '
4488 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004489 parser.add_option('--json',
4490 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004491 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004492 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004493 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004494
dnj@chromium.org406c4402015-03-03 17:22:28 +00004495 if options.reverse:
4496 branches = RunGit(['for-each-ref', 'refs/heads',
4497 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004498 # Reverse issue lookup.
4499 issue_branch_map = {}
4500 for branch in branches:
4501 cl = Changelist(branchref=branch)
4502 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4503 if not args:
4504 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004505 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004506 for issue in args:
4507 if not issue:
4508 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004509 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004510 print('Branch for issue number %s: %s' % (
4511 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004512 if options.json:
4513 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004514 return 0
4515
4516 if len(args) > 0:
4517 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4518 if not issue.valid:
4519 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4520 'or no argument to list it.\n'
4521 'Maybe you want to run git cl status?')
4522 cl = Changelist(codereview=issue.codereview)
4523 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004524 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004525 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004526 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4527 if options.json:
4528 write_json(options.json, {
4529 'issue': cl.GetIssue(),
4530 'issue_url': cl.GetIssueURL(),
4531 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004532 return 0
4533
4534
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004535def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004536 """Shows or posts review comments for any changelist."""
4537 parser.add_option('-a', '--add-comment', dest='comment',
4538 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004539 parser.add_option('-i', '--issue', dest='issue',
4540 help='review issue id (defaults to current issue). '
4541 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004542 parser.add_option('-m', '--machine-readable', dest='readable',
4543 action='store_false', default=True,
4544 help='output comments in a format compatible with '
4545 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004546 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004547 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004548 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004549 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004550 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004551 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004552 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004553
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004554 issue = None
4555 if options.issue:
4556 try:
4557 issue = int(options.issue)
4558 except ValueError:
4559 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004560 if not options.forced_codereview:
4561 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004562
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004563 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004564 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004565 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004566
4567 if options.comment:
4568 cl.AddComment(options.comment)
4569 return 0
4570
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004571 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4572 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004573 for comment in summary:
4574 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004575 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004576 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004577 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004578 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004579 color = Fore.MAGENTA
4580 else:
4581 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004582 print('\n%s%s %s%s\n%s' % (
4583 color,
4584 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4585 comment.sender,
4586 Fore.RESET,
4587 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4588
smut@google.comc85ac942015-09-15 16:34:43 +00004589 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004590 def pre_serialize(c):
4591 dct = c.__dict__.copy()
4592 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4593 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004594 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004595 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004596 return 0
4597
4598
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004599@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004600def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004601 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004602 parser.add_option('-d', '--display', action='store_true',
4603 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004604 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004605 help='New description to set for this issue (- for stdin, '
4606 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004607 parser.add_option('-f', '--force', action='store_true',
4608 help='Delete any unpublished Gerrit edits for this issue '
4609 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004610
4611 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004612 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004613 options, args = parser.parse_args(args)
4614 _process_codereview_select_options(parser, options)
4615
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004616 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004617 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004618 target_issue_arg = ParseIssueNumberArgument(args[0],
4619 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004620 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004621 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004622
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004623 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004624
martiniss6eda05f2016-06-30 10:18:35 -07004625 kwargs = {
4626 'auth_config': auth_config,
4627 'codereview': options.forced_codereview,
4628 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004629 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004630 if target_issue_arg:
4631 kwargs['issue'] = target_issue_arg.issue
4632 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004633 if target_issue_arg.codereview and not options.forced_codereview:
4634 detected_codereview_from_url = True
4635 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004636
4637 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004638 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004639 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004640 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004641
4642 if detected_codereview_from_url:
4643 logging.info('canonical issue/change URL: %s (type: %s)\n',
4644 cl.GetIssueURL(), target_issue_arg.codereview)
4645
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004646 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004647
smut@google.com34fb6b12015-07-13 20:03:26 +00004648 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004649 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004650 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004651
4652 if options.new_description:
4653 text = options.new_description
4654 if text == '-':
4655 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004656 elif text == '+':
4657 base_branch = cl.GetCommonAncestorWithUpstream()
4658 change = cl.GetChange(base_branch, None, local_description=True)
4659 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004660
4661 description.set_description(text)
4662 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004663 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004664
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004665 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004666 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004667 return 0
4668
4669
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004670def CreateDescriptionFromLog(args):
4671 """Pulls out the commit log to use as a base for the CL description."""
4672 log_args = []
4673 if len(args) == 1 and not args[0].endswith('.'):
4674 log_args = [args[0] + '..']
4675 elif len(args) == 1 and args[0].endswith('...'):
4676 log_args = [args[0][:-1]]
4677 elif len(args) == 2:
4678 log_args = [args[0] + '..' + args[1]]
4679 else:
4680 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004681 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004682
4683
thestig@chromium.org44202a22014-03-11 19:22:18 +00004684def CMDlint(parser, args):
4685 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004686 parser.add_option('--filter', action='append', metavar='-x,+y',
4687 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004688 auth.add_auth_options(parser)
4689 options, args = parser.parse_args(args)
4690 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004691
4692 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004693 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004694 try:
4695 import cpplint
4696 import cpplint_chromium
4697 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004698 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004699 return 1
4700
4701 # Change the current working directory before calling lint so that it
4702 # shows the correct base.
4703 previous_cwd = os.getcwd()
4704 os.chdir(settings.GetRoot())
4705 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004706 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004707 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4708 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004709 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004710 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004711 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004712
4713 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004714 command = args + files
4715 if options.filter:
4716 command = ['--filter=' + ','.join(options.filter)] + command
4717 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004718
4719 white_regex = re.compile(settings.GetLintRegex())
4720 black_regex = re.compile(settings.GetLintIgnoreRegex())
4721 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4722 for filename in filenames:
4723 if white_regex.match(filename):
4724 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004725 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004726 else:
4727 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4728 extra_check_functions)
4729 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004730 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004731 finally:
4732 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004733 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004734 if cpplint._cpplint_state.error_count != 0:
4735 return 1
4736 return 0
4737
4738
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004739def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004740 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004741 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004742 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004743 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004744 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004745 auth.add_auth_options(parser)
4746 options, args = parser.parse_args(args)
4747 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004748
sbc@chromium.org71437c02015-04-09 19:29:40 +00004749 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004750 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004751 return 1
4752
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004753 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004754 if args:
4755 base_branch = args[0]
4756 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004757 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004758 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004759
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004760 cl.RunHook(
4761 committing=not options.upload,
4762 may_prompt=False,
4763 verbose=options.verbose,
4764 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004765 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004766
4767
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004768def GenerateGerritChangeId(message):
4769 """Returns Ixxxxxx...xxx change id.
4770
4771 Works the same way as
4772 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4773 but can be called on demand on all platforms.
4774
4775 The basic idea is to generate git hash of a state of the tree, original commit
4776 message, author/committer info and timestamps.
4777 """
4778 lines = []
4779 tree_hash = RunGitSilent(['write-tree'])
4780 lines.append('tree %s' % tree_hash.strip())
4781 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4782 if code == 0:
4783 lines.append('parent %s' % parent.strip())
4784 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4785 lines.append('author %s' % author.strip())
4786 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4787 lines.append('committer %s' % committer.strip())
4788 lines.append('')
4789 # Note: Gerrit's commit-hook actually cleans message of some lines and
4790 # whitespace. This code is not doing this, but it clearly won't decrease
4791 # entropy.
4792 lines.append(message)
4793 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4794 stdin='\n'.join(lines))
4795 return 'I%s' % change_hash.strip()
4796
4797
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004798def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004799 """Computes the remote branch ref to use for the CL.
4800
4801 Args:
4802 remote (str): The git remote for the CL.
4803 remote_branch (str): The git remote branch for the CL.
4804 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004805 """
4806 if not (remote and remote_branch):
4807 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004808
wittman@chromium.org455dc922015-01-26 20:15:50 +00004809 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004810 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004811 # refs, which are then translated into the remote full symbolic refs
4812 # below.
4813 if '/' not in target_branch:
4814 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4815 else:
4816 prefix_replacements = (
4817 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4818 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4819 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4820 )
4821 match = None
4822 for regex, replacement in prefix_replacements:
4823 match = re.search(regex, target_branch)
4824 if match:
4825 remote_branch = target_branch.replace(match.group(0), replacement)
4826 break
4827 if not match:
4828 # This is a branch path but not one we recognize; use as-is.
4829 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004830 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4831 # Handle the refs that need to land in different refs.
4832 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004833
wittman@chromium.org455dc922015-01-26 20:15:50 +00004834 # Create the true path to the remote branch.
4835 # Does the following translation:
4836 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4837 # * refs/remotes/origin/master -> refs/heads/master
4838 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4839 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4840 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4841 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4842 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4843 'refs/heads/')
4844 elif remote_branch.startswith('refs/remotes/branch-heads'):
4845 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004846
wittman@chromium.org455dc922015-01-26 20:15:50 +00004847 return remote_branch
4848
4849
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004850def cleanup_list(l):
4851 """Fixes a list so that comma separated items are put as individual items.
4852
4853 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4854 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4855 """
4856 items = sum((i.split(',') for i in l), [])
4857 stripped_items = (i.strip() for i in items)
4858 return sorted(filter(None, stripped_items))
4859
4860
Aaron Gable4db38df2017-11-03 14:59:07 -07004861@subcommand.usage('[flags]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004862def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004863 """Uploads the current changelist to codereview.
4864
4865 Can skip dependency patchset uploads for a branch by running:
4866 git config branch.branch_name.skip-deps-uploads True
4867 To unset run:
4868 git config --unset branch.branch_name.skip-deps-uploads
4869 Can also set the above globally by using the --global flag.
Dominic Battre7d1c4842017-10-27 09:17:28 +02004870
4871 If the name of the checked out branch starts with "bug-" or "fix-" followed by
4872 a bug number, this bug number is automatically populated in the CL
4873 description.
rmistry@google.com78948ed2015-07-08 23:09:57 +00004874 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004875 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4876 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004877 parser.add_option('--bypass-watchlists', action='store_true',
4878 dest='bypass_watchlists',
4879 help='bypass watchlists auto CC-ing reviewers')
Aaron Gablef7543cd2017-07-20 14:26:31 -07004880 parser.add_option('-f', '--force', action='store_true', dest='force',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004881 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004882 parser.add_option('--message', '-m', dest='message',
4883 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004884 parser.add_option('-b', '--bug',
4885 help='pre-populate the bug number(s) for this issue. '
4886 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004887 parser.add_option('--message-file', dest='message_file',
4888 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004889 parser.add_option('--title', '-t', dest='title',
4890 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004891 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004892 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004893 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004894 parser.add_option('--tbrs',
4895 action='append', default=[],
4896 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004897 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004898 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004899 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004900 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004901 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004902 parser.add_option('--emulate_svn_auto_props',
4903 '--emulate-svn-auto-props',
4904 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004905 dest="emulate_svn_auto_props",
4906 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004907 parser.add_option('-c', '--use-commit-queue', action='store_true',
Aaron Gableedbc4132017-09-11 13:22:28 -07004908 help='tell the commit queue to commit this patchset; '
4909 'implies --send-mail')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004910 parser.add_option('--private', action='store_true',
4911 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004912 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004913 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004914 metavar='TARGET',
4915 help='Apply CL to remote ref TARGET. ' +
4916 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004917 parser.add_option('--squash', action='store_true',
4918 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004919 parser.add_option('--no-squash', action='store_true',
4920 help='Don\'t squash multiple commits into one ' +
4921 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004922 parser.add_option('--topic', default=None,
4923 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004924 parser.add_option('--email', default=None,
4925 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004926 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4927 const='TBR', help='add a set of OWNERS to TBR')
4928 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4929 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004930 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4931 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004932 help='Send the patchset to do a CQ dry run right after '
4933 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004934 parser.add_option('--dependencies', action='store_true',
4935 help='Uploads CLs of all the local branches that depend on '
4936 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004937
rmistry@google.com2dd99862015-06-22 12:22:18 +00004938 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004939 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004940 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004941 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004942 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004943 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004944 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004945
sbc@chromium.org71437c02015-04-09 19:29:40 +00004946 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004947 return 1
4948
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004949 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004950 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004951 options.cc = cleanup_list(options.cc)
4952
tandriib80458a2016-06-23 12:20:07 -07004953 if options.message_file:
4954 if options.message:
4955 parser.error('only one of --message and --message-file allowed.')
4956 options.message = gclient_utils.FileRead(options.message_file)
4957 options.message_file = None
4958
tandrii4d0545a2016-07-06 03:56:49 -07004959 if options.cq_dry_run and options.use_commit_queue:
4960 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4961
Aaron Gableedbc4132017-09-11 13:22:28 -07004962 if options.use_commit_queue:
4963 options.send_mail = True
4964
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004965 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4966 settings.GetIsGerrit()
4967
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004968 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004969 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004970
4971
Francois Dorayd42c6812017-05-30 15:10:20 -04004972@subcommand.usage('--description=<description file>')
4973def CMDsplit(parser, args):
4974 """Splits a branch into smaller branches and uploads CLs.
4975
4976 Creates a branch and uploads a CL for each group of files modified in the
4977 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004978 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004979 the shared OWNERS file.
4980 """
4981 parser.add_option("-d", "--description", dest="description_file",
4982 help="A text file containing a CL description. ")
4983 parser.add_option("-c", "--comment", dest="comment_file",
4984 help="A text file containing a CL comment.")
4985 options, _ = parser.parse_args(args)
4986
4987 if not options.description_file:
4988 parser.error('No --description flag specified.')
4989
4990 def WrappedCMDupload(args):
4991 return CMDupload(OptionParser(), args)
4992
4993 return split_cl.SplitCl(options.description_file, options.comment_file,
4994 Changelist, WrappedCMDupload)
4995
4996
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004997@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004998def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004999 """DEPRECATED: Used to commit the current changelist via git-svn."""
5000 message = ('git-cl no longer supports committing to SVN repositories via '
5001 'git-svn. You probably want to use `git cl land` instead.')
5002 print(message)
5003 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005004
5005
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005006# Two special branches used by git cl land.
5007MERGE_BRANCH = 'git-cl-commit'
5008CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
5009
5010
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005011@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00005012def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005013 """Commits the current changelist via git.
5014
5015 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
5016 upstream and closes the issue automatically and atomically.
5017
5018 Otherwise (in case of Rietveld):
5019 Squashes branch into a single commit.
5020 Updates commit message with metadata (e.g. pointer to review).
5021 Pushes the code upstream.
5022 Updates review and closes.
5023 """
5024 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
5025 help='bypass upload presubmit hook')
5026 parser.add_option('-m', dest='message',
5027 help="override review description")
Aaron Gablef7543cd2017-07-20 14:26:31 -07005028 parser.add_option('-f', '--force', action='store_true', dest='force',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005029 help="force yes to questions (don't prompt)")
5030 parser.add_option('-c', dest='contributor',
5031 help="external contributor for patch (appended to " +
5032 "description and used as author for git). Should be " +
5033 "formatted as 'First Last <email@example.com>'")
5034 add_git_similarity(parser)
5035 auth.add_auth_options(parser)
5036 (options, args) = parser.parse_args(args)
5037 auth_config = auth.extract_auth_config_from_options(options)
5038
5039 cl = Changelist(auth_config=auth_config)
5040
5041 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
5042 if cl.IsGerrit():
5043 if options.message:
5044 # This could be implemented, but it requires sending a new patch to
5045 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
5046 # Besides, Gerrit has the ability to change the commit message on submit
5047 # automatically, thus there is no need to support this option (so far?).
5048 parser.error('-m MESSAGE option is not supported for Gerrit.')
5049 if options.contributor:
5050 parser.error(
5051 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
5052 'Before uploading a commit to Gerrit, ensure it\'s author field is '
5053 'the contributor\'s "name <email>". If you can\'t upload such a '
5054 'commit for review, contact your repository admin and request'
5055 '"Forge-Author" permission.')
5056 if not cl.GetIssue():
5057 DieWithError('You must upload the change first to Gerrit.\n'
5058 ' If you would rather have `git cl land` upload '
5059 'automatically for you, see http://crbug.com/642759')
5060 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
5061 options.verbose)
5062
5063 current = cl.GetBranch()
5064 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
5065 if remote == '.':
5066 print()
5067 print('Attempting to push branch %r into another local branch!' % current)
5068 print()
5069 print('Either reparent this branch on top of origin/master:')
5070 print(' git reparent-branch --root')
5071 print()
5072 print('OR run `git rebase-update` if you think the parent branch is ')
5073 print('already committed.')
5074 print()
5075 print(' Current parent: %r' % upstream_branch)
5076 return 1
5077
5078 if not args:
5079 # Default to merging against our best guess of the upstream branch.
5080 args = [cl.GetUpstreamBranch()]
5081
5082 if options.contributor:
5083 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005084 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005085 return 1
5086
5087 base_branch = args[0]
5088
5089 if git_common.is_dirty_git_tree('land'):
5090 return 1
5091
5092 # This rev-list syntax means "show all commits not in my branch that
5093 # are in base_branch".
5094 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5095 base_branch]).splitlines()
5096 if upstream_commits:
5097 print('Base branch "%s" has %d commits '
5098 'not in this branch.' % (base_branch, len(upstream_commits)))
5099 print('Run "git merge %s" before attempting to land.' % base_branch)
5100 return 1
5101
5102 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5103 if not options.bypass_hooks:
5104 author = None
5105 if options.contributor:
5106 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5107 hook_results = cl.RunHook(
5108 committing=True,
5109 may_prompt=not options.force,
5110 verbose=options.verbose,
5111 change=cl.GetChange(merge_base, author))
5112 if not hook_results.should_continue():
5113 return 1
5114
5115 # Check the tree status if the tree status URL is set.
5116 status = GetTreeStatus()
5117 if 'closed' == status:
5118 print('The tree is closed. Please wait for it to reopen. Use '
5119 '"git cl land --bypass-hooks" to commit on a closed tree.')
5120 return 1
5121 elif 'unknown' == status:
5122 print('Unable to determine tree status. Please verify manually and '
5123 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5124 return 1
5125
5126 change_desc = ChangeDescription(options.message)
5127 if not change_desc.description and cl.GetIssue():
5128 change_desc = ChangeDescription(cl.GetDescription())
5129
5130 if not change_desc.description:
5131 if not cl.GetIssue() and options.bypass_hooks:
5132 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5133 else:
5134 print('No description set.')
5135 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5136 return 1
5137
5138 # Keep a separate copy for the commit message, because the commit message
5139 # contains the link to the Rietveld issue, while the Rietveld message contains
5140 # the commit viewvc url.
5141 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005142 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005143 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005144
5145 commit_desc = ChangeDescription(change_desc.description)
5146 if cl.GetIssue():
5147 # Xcode won't linkify this URL unless there is a non-whitespace character
5148 # after it. Add a period on a new line to circumvent this. Also add a space
5149 # before the period to make sure that Gitiles continues to correctly resolve
5150 # the URL.
5151 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5152 if options.contributor:
5153 commit_desc.append_footer('Patch from %s.' % options.contributor)
5154
5155 print('Description:')
5156 print(commit_desc.description)
5157
5158 branches = [merge_base, cl.GetBranchRef()]
5159 if not options.force:
5160 print_stats(options.similarity, options.find_copies, branches)
5161
5162 # We want to squash all this branch's commits into one commit with the proper
5163 # description. We do this by doing a "reset --soft" to the base branch (which
5164 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005165 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005166 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5167 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5168 result = RunGitWithCode(showref_cmd)
5169 if result[0] == 0:
5170 RunGit(['branch', '-D', branch])
5171
5172 # We might be in a directory that's present in this branch but not in the
5173 # trunk. Move up to the top of the tree so that git commands that expect a
5174 # valid CWD won't fail after we check out the merge branch.
5175 rel_base_path = settings.GetRelativeRoot()
5176 if rel_base_path:
5177 os.chdir(rel_base_path)
5178
5179 # Stuff our change into the merge branch.
5180 # We wrap in a try...finally block so if anything goes wrong,
5181 # we clean up the branches.
5182 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005183 revision = None
5184 try:
5185 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5186 RunGit(['reset', '--soft', merge_base])
5187 if options.contributor:
5188 RunGit(
5189 [
5190 'commit', '--author', options.contributor,
5191 '-m', commit_desc.description,
5192 ])
5193 else:
5194 RunGit(['commit', '-m', commit_desc.description])
5195
5196 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5197 mirror = settings.GetGitMirror(remote)
5198 if mirror:
5199 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005200 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005201 else:
5202 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005203 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005204 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5205
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005206 retcode = PushToGitWithAutoRebase(
5207 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005208 if retcode == 0:
5209 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005210 if git_numberer_enabled:
5211 change_desc = ChangeDescription(
5212 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005213 except: # pylint: disable=bare-except
5214 if _IS_BEING_TESTED:
5215 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5216 + '-' * 30 + '8<' + '-' * 30)
5217 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5218 raise
5219 finally:
5220 # And then swap back to the original branch and clean up.
5221 RunGit(['checkout', '-q', cl.GetBranch()])
5222 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005223 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005224
5225 if not revision:
5226 print('Failed to push. If this persists, please file a bug.')
5227 return 1
5228
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005229 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005230 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005231 if viewvc_url and revision:
5232 change_desc.append_footer(
5233 'Committed: %s%s' % (viewvc_url, revision))
5234 elif revision:
5235 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005236 print('Closing issue '
5237 '(you may be prompted for your codereview password)...')
5238 cl.UpdateDescription(change_desc.description)
5239 cl.CloseIssue()
5240 props = cl.GetIssueProperties()
5241 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005242 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5243 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005244 if options.bypass_hooks:
5245 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5246 else:
5247 comment += ' (presubmit successful).'
5248 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5249
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005250 if os.path.isfile(POSTUPSTREAM_HOOK):
5251 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5252
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005253 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005254
5255
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005256def PushToGitWithAutoRebase(remote, branch, original_description,
5257 git_numberer_enabled, max_attempts=3):
5258 """Pushes current HEAD commit on top of remote's branch.
5259
5260 Attempts to fetch and autorebase on push failures.
5261 Adds git number footers on the fly.
5262
5263 Returns integer code from last command.
5264 """
5265 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5266 code = 0
5267 attempts_left = max_attempts
5268 while attempts_left:
5269 attempts_left -= 1
5270 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5271
5272 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5273 # If fetch fails, retry.
5274 print('Fetching %s/%s...' % (remote, branch))
5275 code, out = RunGitWithCode(
5276 ['retry', 'fetch', remote,
5277 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5278 if code:
5279 print('Fetch failed with exit code %d.' % code)
5280 print(out.strip())
5281 continue
5282
5283 print('Cherry-picking commit on top of latest %s' % branch)
5284 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5285 suppress_stderr=True)
5286 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5287 code, out = RunGitWithCode(['cherry-pick', cherry])
5288 if code:
5289 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5290 'the following files have merge conflicts:' %
5291 (branch, parent_hash))
5292 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5293 print('Please rebase your patch and try again.')
5294 RunGitWithCode(['cherry-pick', '--abort'])
5295 break
5296
5297 commit_desc = ChangeDescription(original_description)
5298 if git_numberer_enabled:
5299 logging.debug('Adding git number footers')
5300 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5301 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5302 branch)
5303 # Ensure timestamps are monotonically increasing.
5304 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5305 _get_committer_timestamp('HEAD'))
5306 _git_amend_head(commit_desc.description, timestamp)
5307
5308 code, out = RunGitWithCode(
5309 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5310 print(out)
5311 if code == 0:
5312 break
5313 if IsFatalPushFailure(out):
5314 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005315 'user.email are correct and you have push access to the repo.\n'
5316 'Hint: run command below to diangose common Git/Gerrit credential '
5317 'problems:\n'
5318 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005319 break
5320 return code
5321
5322
5323def IsFatalPushFailure(push_stdout):
5324 """True if retrying push won't help."""
5325 return '(prohibited by Gerrit)' in push_stdout
5326
5327
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005328@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005329def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005330 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005331 parser.add_option('-b', dest='newbranch',
5332 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005333 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005334 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005335 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005336 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005337 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005338 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005339 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005340 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005341 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005342 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005343
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005344
5345 group = optparse.OptionGroup(
5346 parser,
5347 'Options for continuing work on the current issue uploaded from a '
5348 'different clone (e.g. different machine). Must be used independently '
5349 'from the other options. No issue number should be specified, and the '
5350 'branch must have an issue number associated with it')
5351 group.add_option('--reapply', action='store_true', dest='reapply',
5352 help='Reset the branch and reapply the issue.\n'
5353 'CAUTION: This will undo any local changes in this '
5354 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005355
5356 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005357 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005358 parser.add_option_group(group)
5359
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005360 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005361 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005362 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005363 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005364 auth_config = auth.extract_auth_config_from_options(options)
5365
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005366 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005367 if options.newbranch:
5368 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005369 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005370 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005371
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005372 cl = Changelist(auth_config=auth_config,
5373 codereview=options.forced_codereview)
5374 if not cl.GetIssue():
5375 parser.error('current branch must have an associated issue')
5376
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005377 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005378 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005379 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005380
5381 RunGit(['reset', '--hard', upstream])
5382 if options.pull:
5383 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005384
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005385 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5386 options.directory)
5387
5388 if len(args) != 1 or not args[0]:
5389 parser.error('Must specify issue number or url')
5390
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005391 target_issue_arg = ParseIssueNumberArgument(args[0],
5392 options.forced_codereview)
5393 if not target_issue_arg.valid:
5394 parser.error('invalid codereview url or CL id')
5395
5396 cl_kwargs = {
5397 'auth_config': auth_config,
5398 'codereview_host': target_issue_arg.hostname,
5399 'codereview': options.forced_codereview,
5400 }
5401 detected_codereview_from_url = False
5402 if target_issue_arg.codereview and not options.forced_codereview:
5403 detected_codereview_from_url = True
5404 cl_kwargs['codereview'] = target_issue_arg.codereview
5405 cl_kwargs['issue'] = target_issue_arg.issue
5406
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005407 # We don't want uncommitted changes mixed up with the patch.
5408 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005409 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005410
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005411 if options.newbranch:
5412 if options.force:
5413 RunGit(['branch', '-D', options.newbranch],
5414 stderr=subprocess2.PIPE, error_ok=True)
5415 RunGit(['new-branch', options.newbranch])
5416
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005417 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005418
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005419 if cl.IsGerrit():
5420 if options.reject:
5421 parser.error('--reject is not supported with Gerrit codereview.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005422 if options.directory:
5423 parser.error('--directory is not supported with Gerrit codereview.')
5424
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005425 if detected_codereview_from_url:
5426 print('canonical issue/change URL: %s (type: %s)\n' %
5427 (cl.GetIssueURL(), target_issue_arg.codereview))
5428
5429 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005430 options.nocommit, options.directory,
5431 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005432
5433
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005434def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005435 """Fetches the tree status and returns either 'open', 'closed',
5436 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005437 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005438 if url:
5439 status = urllib2.urlopen(url).read().lower()
5440 if status.find('closed') != -1 or status == '0':
5441 return 'closed'
5442 elif status.find('open') != -1 or status == '1':
5443 return 'open'
5444 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005445 return 'unset'
5446
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005447
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005448def GetTreeStatusReason():
5449 """Fetches the tree status from a json url and returns the message
5450 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005451 url = settings.GetTreeStatusUrl()
5452 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005453 connection = urllib2.urlopen(json_url)
5454 status = json.loads(connection.read())
5455 connection.close()
5456 return status['message']
5457
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005458
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005459def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005460 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005461 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005462 status = GetTreeStatus()
5463 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005464 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005465 return 2
5466
vapiera7fbd5a2016-06-16 09:17:49 -07005467 print('The tree is %s' % status)
5468 print()
5469 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005470 if status != 'open':
5471 return 1
5472 return 0
5473
5474
maruel@chromium.org15192402012-09-06 12:38:29 +00005475def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005476 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005477 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005478 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005479 '-b', '--bot', action='append',
5480 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5481 'times to specify multiple builders. ex: '
5482 '"-b win_rel -b win_layout". See '
5483 'the try server waterfall for the builders name and the tests '
5484 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005485 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005486 '-B', '--bucket', default='',
5487 help=('Buildbucket bucket to send the try requests.'))
5488 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005489 '-m', '--master', default='',
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005490 help=('DEPRECATED, use -B. The try master where to run the builds.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005491 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005492 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005493 help='Revision to use for the try job; default: the revision will '
5494 'be determined by the try recipe that builder runs, which usually '
5495 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005496 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005497 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005498 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005499 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005500 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005501 '--project',
5502 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005503 'in recipe to determine to which repository or directory to '
5504 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005505 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005506 '-p', '--property', dest='properties', action='append', default=[],
5507 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005508 'key2=value2 etc. The value will be treated as '
5509 'json if decodable, or as string otherwise. '
5510 'NOTE: using this may make your try job not usable for CQ, '
5511 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005512 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005513 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5514 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005515 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005516 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005517 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005518 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005519
Nodir Turakulovf6929a12017-10-09 12:34:44 -07005520 if options.master and options.master.startswith('luci.'):
5521 parser.error(
5522 '-m option does not support LUCI. Please pass -B %s' % options.master)
machenbach@chromium.org45453142015-09-15 08:45:22 +00005523 # Make sure that all properties are prop=value pairs.
5524 bad_params = [x for x in options.properties if '=' not in x]
5525 if bad_params:
5526 parser.error('Got properties with missing "=": %s' % bad_params)
5527
maruel@chromium.org15192402012-09-06 12:38:29 +00005528 if args:
5529 parser.error('Unknown arguments: %s' % args)
5530
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005531 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005532 if not cl.GetIssue():
5533 parser.error('Need to upload first')
5534
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005535 if cl.IsGerrit():
5536 # HACK: warm up Gerrit change detail cache to save on RPCs.
5537 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5538
tandriie113dfd2016-10-11 10:20:12 -07005539 error_message = cl.CannotTriggerTryJobReason()
5540 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005541 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005542
borenet6c0efe62016-10-19 08:13:29 -07005543 if options.bucket and options.master:
5544 parser.error('Only one of --bucket and --master may be used.')
5545
qyearsley1fdfcb62016-10-24 13:22:03 -07005546 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005547
qyearsleydd49f942016-10-28 11:57:22 -07005548 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5549 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005550 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005551 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005552 print('git cl try with no bots now defaults to CQ dry run.')
5553 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5554 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005555
borenet6c0efe62016-10-19 08:13:29 -07005556 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005557 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005558 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005559 'of bot requires an initial job from a parent (usually a builder). '
5560 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005561 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005562 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005563
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005564 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005565 # TODO(tandrii): Checking local patchset against remote patchset is only
5566 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5567 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005568 print('Warning: Codereview server has newer patchsets (%s) than most '
5569 'recent upload from local checkout (%s). Did a previous upload '
5570 'fail?\n'
5571 'By default, git cl try uses the latest patchset from '
5572 'codereview, continuing to use patchset %s.\n' %
5573 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005574
tandrii568043b2016-10-11 07:49:18 -07005575 try:
borenet6c0efe62016-10-19 08:13:29 -07005576 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5577 patchset)
tandrii568043b2016-10-11 07:49:18 -07005578 except BuildbucketResponseException as ex:
5579 print('ERROR: %s' % ex)
5580 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005581 return 0
5582
5583
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005584def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005585 """Prints info about try jobs associated with current CL."""
5586 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005587 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005588 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005589 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005590 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005591 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005592 '--color', action='store_true', default=setup_color.IS_TTY,
5593 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005594 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005595 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5596 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005597 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005598 '--json', help=('Path of JSON output file to write try job results to,'
5599 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005600 parser.add_option_group(group)
5601 auth.add_auth_options(parser)
Stefan Zager27db3f22017-10-10 15:15:01 -07005602 _add_codereview_issue_select_options(parser)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005603 options, args = parser.parse_args(args)
Stefan Zager27db3f22017-10-10 15:15:01 -07005604 _process_codereview_issue_select_options(parser, options)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005605 if args:
5606 parser.error('Unrecognized args: %s' % ' '.join(args))
5607
5608 auth_config = auth.extract_auth_config_from_options(options)
Stefan Zager27db3f22017-10-10 15:15:01 -07005609 cl = Changelist(
5610 issue=options.issue, codereview=options.forced_codereview,
5611 auth_config=auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005612 if not cl.GetIssue():
5613 parser.error('Need to upload first')
5614
tandrii221ab252016-10-06 08:12:04 -07005615 patchset = options.patchset
5616 if not patchset:
5617 patchset = cl.GetMostRecentPatchset()
5618 if not patchset:
5619 parser.error('Codereview doesn\'t know about issue %s. '
5620 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005621 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005622 cl.GetIssue())
5623
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005624 # TODO(tandrii): Checking local patchset against remote patchset is only
5625 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5626 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005627 print('Warning: Codereview server has newer patchsets (%s) than most '
5628 'recent upload from local checkout (%s). Did a previous upload '
5629 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005630 'By default, git cl try-results uses the latest patchset from '
5631 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005632 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005633 try:
tandrii221ab252016-10-06 08:12:04 -07005634 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005635 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005636 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005637 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005638 if options.json:
5639 write_try_results_json(options.json, jobs)
5640 else:
5641 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005642 return 0
5643
5644
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005645@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005646def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005647 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005648 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005649 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005650 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005651
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005652 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005653 if args:
5654 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005655 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005656 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005657 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005658 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005659
5660 # Clear configured merge-base, if there is one.
5661 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005662 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005663 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005664 return 0
5665
5666
thestig@chromium.org00858c82013-12-02 23:08:03 +00005667def CMDweb(parser, args):
5668 """Opens the current CL in the web browser."""
5669 _, args = parser.parse_args(args)
5670 if args:
5671 parser.error('Unrecognized args: %s' % ' '.join(args))
5672
5673 issue_url = Changelist().GetIssueURL()
5674 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005675 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005676 return 1
5677
5678 webbrowser.open(issue_url)
5679 return 0
5680
5681
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005682def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005683 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005684 parser.add_option('-d', '--dry-run', action='store_true',
5685 help='trigger in dry run mode')
5686 parser.add_option('-c', '--clear', action='store_true',
5687 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005688 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005689 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005690 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005691 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005692 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005693 if args:
5694 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005695 if options.dry_run and options.clear:
5696 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5697
iannuccie53c9352016-08-17 14:40:40 -07005698 cl = Changelist(auth_config=auth_config, issue=options.issue,
5699 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005700 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005701 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005702 elif options.dry_run:
5703 state = _CQState.DRY_RUN
5704 else:
5705 state = _CQState.COMMIT
5706 if not cl.GetIssue():
5707 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005708 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005709 return 0
5710
5711
groby@chromium.org411034a2013-02-26 15:12:01 +00005712def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005713 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005714 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005715 auth.add_auth_options(parser)
5716 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005717 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005718 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005719 if args:
5720 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005721 cl = Changelist(auth_config=auth_config, issue=options.issue,
5722 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005723 # Ensure there actually is an issue to close.
Aaron Gable7139a4e2017-09-05 17:53:09 -07005724 if not cl.GetIssue():
5725 DieWithError('ERROR No issue to close')
groby@chromium.org411034a2013-02-26 15:12:01 +00005726 cl.CloseIssue()
5727 return 0
5728
5729
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005730def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005731 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005732 parser.add_option(
5733 '--stat',
5734 action='store_true',
5735 dest='stat',
5736 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005737 auth.add_auth_options(parser)
5738 options, args = parser.parse_args(args)
5739 auth_config = auth.extract_auth_config_from_options(options)
5740 if args:
5741 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005742
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005743 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005744 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005745 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005746 if not issue:
5747 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005748
Aaron Gablea718c3e2017-08-28 17:47:28 -07005749 base = cl._GitGetBranchConfigValue('last-upload-hash')
5750 if not base:
5751 base = cl._GitGetBranchConfigValue('gerritsquashhash')
5752 if not base:
5753 detail = cl._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'])
5754 revision_info = detail['revisions'][detail['current_revision']]
5755 fetch_info = revision_info['fetch']['http']
5756 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
5757 base = 'FETCH_HEAD'
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005758
Aaron Gablea718c3e2017-08-28 17:47:28 -07005759 cmd = ['git', 'diff']
5760 if options.stat:
5761 cmd.append('--stat')
5762 cmd.append(base)
5763 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005764
5765 return 0
5766
5767
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005768def CMDowners(parser, args):
Dirk Prankebf980882017-09-02 15:08:00 -07005769 """Finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005770 parser.add_option(
5771 '--no-color',
5772 action='store_true',
5773 help='Use this option to disable color output')
Dirk Prankebf980882017-09-02 15:08:00 -07005774 parser.add_option(
5775 '--batch',
5776 action='store_true',
5777 help='Do not run interactively, just suggest some')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005778 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005779 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005780 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005781
5782 author = RunGit(['config', 'user.email']).strip() or None
5783
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005784 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005785
5786 if args:
5787 if len(args) > 1:
5788 parser.error('Unknown args')
5789 base_branch = args[0]
5790 else:
5791 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005792 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005793
5794 change = cl.GetChange(base_branch, None)
Dirk Prankebf980882017-09-02 15:08:00 -07005795 affected_files = [f.LocalPath() for f in change.AffectedFiles()]
5796
5797 if options.batch:
5798 db = owners.Database(change.RepositoryRoot(), file, os.path)
5799 print('\n'.join(db.reviewers_for(affected_files, author)))
5800 return 0
5801
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005802 return owners_finder.OwnersFinder(
Dirk Prankebf980882017-09-02 15:08:00 -07005803 affected_files,
Jochen Eisinger72606f82017-04-04 10:44:18 +02005804 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005805 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005806 disable_color=options.no_color,
5807 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005808
5809
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005810def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005811 """Generates a diff command."""
5812 # Generate diff for the current branch's changes.
5813 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005814 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005815
5816 if args:
5817 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005818 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005819 diff_cmd.append(arg)
5820 else:
5821 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005822
5823 return diff_cmd
5824
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005825
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005826def MatchingFileType(file_name, extensions):
5827 """Returns true if the file name ends with one of the given extensions."""
5828 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005829
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005830
enne@chromium.org555cfe42014-01-29 18:21:39 +00005831@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005832def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005833 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005834 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005835 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005836 parser.add_option('--full', action='store_true',
5837 help='Reformat the full content of all touched files')
5838 parser.add_option('--dry-run', action='store_true',
5839 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005840 parser.add_option('--python', action='store_true',
5841 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005842 parser.add_option('--js', action='store_true',
5843 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005844 parser.add_option('--diff', action='store_true',
5845 help='Print diff to stdout rather than modifying files.')
Ilya Shermane081cbe2017-08-15 17:51:04 -07005846 parser.add_option('--presubmit', action='store_true',
5847 help='Used when running the script from a presubmit.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005848 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005849
Daniel Chengc55eecf2016-12-30 03:11:02 -08005850 # Normalize any remaining args against the current path, so paths relative to
5851 # the current directory are still resolved as expected.
5852 args = [os.path.join(os.getcwd(), arg) for arg in args]
5853
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005854 # git diff generates paths against the root of the repository. Change
5855 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005856 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005857 if rel_base_path:
5858 os.chdir(rel_base_path)
5859
digit@chromium.org29e47272013-05-17 17:01:46 +00005860 # Grab the merge-base commit, i.e. the upstream commit of the current
5861 # branch when it was created or the last time it was rebased. This is
5862 # to cover the case where the user may have called "git fetch origin",
5863 # moving the origin branch to a newer commit, but hasn't rebased yet.
5864 upstream_commit = None
5865 cl = Changelist()
5866 upstream_branch = cl.GetUpstreamBranch()
5867 if upstream_branch:
5868 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5869 upstream_commit = upstream_commit.strip()
5870
5871 if not upstream_commit:
5872 DieWithError('Could not find base commit for this branch. '
5873 'Are you in detached state?')
5874
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005875 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5876 diff_output = RunGit(changed_files_cmd)
5877 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005878 # Filter out files deleted by this CL
5879 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005880
Christopher Lamc5ba6922017-01-24 11:19:14 +11005881 if opts.js:
5882 CLANG_EXTS.append('.js')
5883
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005884 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5885 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5886 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005887 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005888
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005889 top_dir = os.path.normpath(
5890 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5891
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005892 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5893 # formatted. This is used to block during the presubmit.
5894 return_value = 0
5895
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005896 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005897 # Locate the clang-format binary in the checkout
5898 try:
5899 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005900 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005901 DieWithError(e)
5902
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005903 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005904 cmd = [clang_format_tool]
5905 if not opts.dry_run and not opts.diff:
5906 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005907 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005908 if opts.diff:
5909 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005910 else:
5911 env = os.environ.copy()
5912 env['PATH'] = str(os.path.dirname(clang_format_tool))
5913 try:
5914 script = clang_format.FindClangFormatScriptInChromiumTree(
5915 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005916 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005917 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005918
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005919 cmd = [sys.executable, script, '-p0']
5920 if not opts.dry_run and not opts.diff:
5921 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005922
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005923 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5924 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005925
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005926 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5927 if opts.diff:
5928 sys.stdout.write(stdout)
5929 if opts.dry_run and len(stdout) > 0:
5930 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005931
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005932 # Similar code to above, but using yapf on .py files rather than clang-format
5933 # on C/C++ files
5934 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005935 yapf_tool = gclient_utils.FindExecutable('yapf')
5936 if yapf_tool is None:
5937 DieWithError('yapf not found in PATH')
5938
5939 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005940 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005941 cmd = [yapf_tool]
5942 if not opts.dry_run and not opts.diff:
5943 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005944 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005945 if opts.diff:
5946 sys.stdout.write(stdout)
5947 else:
5948 # TODO(sbc): yapf --lines mode still has some issues.
5949 # https://github.com/google/yapf/issues/154
5950 DieWithError('--python currently only works with --full')
5951
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005952 # Dart's formatter does not have the nice property of only operating on
5953 # modified chunks, so hard code full.
5954 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005955 try:
5956 command = [dart_format.FindDartFmtToolInChromiumTree()]
5957 if not opts.dry_run and not opts.diff:
5958 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005959 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005960
ppi@chromium.org6593d932016-03-03 15:41:15 +00005961 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005962 if opts.dry_run and stdout:
5963 return_value = 2
5964 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005965 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5966 'found in this checkout. Files in other languages are still '
5967 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005968
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005969 # Format GN build files. Always run on full build files for canonical form.
5970 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005971 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005972 if opts.dry_run or opts.diff:
5973 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005974 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005975 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5976 shell=sys.platform == 'win32',
5977 cwd=top_dir)
5978 if opts.dry_run and gn_ret == 2:
5979 return_value = 2 # Not formatted.
5980 elif opts.diff and gn_ret == 2:
5981 # TODO this should compute and print the actual diff.
5982 print("This change has GN build file diff for " + gn_diff_file)
5983 elif gn_ret != 0:
5984 # For non-dry run cases (and non-2 return values for dry-run), a
5985 # nonzero error code indicates a failure, probably because the file
5986 # doesn't parse.
5987 DieWithError("gn format failed on " + gn_diff_file +
5988 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005989
Ilya Shermane081cbe2017-08-15 17:51:04 -07005990 # Skip the metrics formatting from the global presubmit hook. These files have
5991 # a separate presubmit hook that issues an error if the files need formatting,
5992 # whereas the top-level presubmit script merely issues a warning. Formatting
5993 # these files is somewhat slow, so it's important not to duplicate the work.
5994 if not opts.presubmit:
5995 for xml_dir in GetDirtyMetricsDirs(diff_files):
5996 tool_dir = os.path.join(top_dir, xml_dir)
5997 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5998 if opts.dry_run or opts.diff:
5999 cmd.append('--diff')
Ilya Sherman235b70d2017-08-22 17:46:38 -07006000 stdout = RunCommand(cmd, cwd=top_dir)
Ilya Shermane081cbe2017-08-15 17:51:04 -07006001 if opts.diff:
6002 sys.stdout.write(stdout)
6003 if opts.dry_run and stdout:
6004 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05006005
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00006006 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006007
Steven Holte2e664bf2017-04-21 13:10:47 -07006008def GetDirtyMetricsDirs(diff_files):
6009 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
6010 metrics_xml_dirs = [
6011 os.path.join('tools', 'metrics', 'actions'),
6012 os.path.join('tools', 'metrics', 'histograms'),
6013 os.path.join('tools', 'metrics', 'rappor'),
6014 os.path.join('tools', 'metrics', 'ukm')]
6015 for xml_dir in metrics_xml_dirs:
6016 if any(file.startswith(xml_dir) for file in xml_diff_files):
6017 yield xml_dir
6018
agable@chromium.orgfab8f822013-05-06 17:43:09 +00006019
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006020@subcommand.usage('<codereview url or issue id>')
6021def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006022 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006023 _, args = parser.parse_args(args)
6024
6025 if len(args) != 1:
6026 parser.print_help()
6027 return 1
6028
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00006029 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00006030 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02006031 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02006032
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00006033 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006034
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006035 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00006036 output = RunGit(['config', '--local', '--get-regexp',
6037 r'branch\..*\.%s' % issueprefix],
6038 error_ok=True)
6039 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006040 if issue == target_issue:
6041 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006042
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00006043 branches = []
6044 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07006045 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006046 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07006047 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006048 return 1
6049 if len(branches) == 1:
6050 RunGit(['checkout', branches[0]])
6051 else:
vapiera7fbd5a2016-06-16 09:17:49 -07006052 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006053 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07006054 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006055 which = raw_input('Choose by index: ')
6056 try:
6057 RunGit(['checkout', branches[int(which)]])
6058 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07006059 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00006060 return 1
6061
6062 return 0
6063
6064
maruel@chromium.org29404b52014-09-08 22:58:00 +00006065def CMDlol(parser, args):
6066 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07006067 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00006068 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
6069 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
6070 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07006071 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00006072 return 0
6073
6074
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006075class OptionParser(optparse.OptionParser):
6076 """Creates the option parse and add --verbose support."""
6077 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006078 optparse.OptionParser.__init__(
6079 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006080 self.add_option(
6081 '-v', '--verbose', action='count', default=0,
6082 help='Use 2 times for more debugging info')
6083
6084 def parse_args(self, args=None, values=None):
6085 options, args = optparse.OptionParser.parse_args(self, args, values)
6086 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006087 logging.basicConfig(
6088 level=levels[min(options.verbose, len(levels) - 1)],
6089 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6090 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006091 return options, args
6092
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006093
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006094def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006095 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006096 print('\nYour python version %s is unsupported, please upgrade.\n' %
6097 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006098 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006099
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006100 # Reload settings.
6101 global settings
6102 settings = Settings()
6103
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006104 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006105 dispatcher = subcommand.CommandDispatcher(__name__)
6106 try:
6107 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006108 except auth.AuthenticationError as e:
6109 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006110 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006111 if e.code != 500:
6112 raise
6113 DieWithError(
6114 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6115 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006116 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006117
6118
6119if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006120 # These affect sys.stdout so do it outside of main() to simplify mocks in
6121 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006122 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006123 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006124 try:
6125 sys.exit(main(sys.argv[1:]))
6126 except KeyboardInterrupt:
6127 sys.stderr.write('interrupted\n')
6128 sys.exit(1)