blob: 213ff9180e410e8be93c9d2091949cbdf6b7cbb2 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +010016import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010017import datetime
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +010018import fnmatch
sheyang@google.com6ebaf782015-05-12 19:17:54 +000019import httplib
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +010020import itertools
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000021import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000022import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000023import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import optparse
25import os
26import re
Andrii Shyshkalov353637c2017-03-14 16:52:18 +010027import shutil
ukai@chromium.org78c4b982012-02-14 02:20:26 +000028import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000030import textwrap
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000033import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000034import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000035import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000036import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037
38try:
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -080039 import readline # pylint: disable=import-error,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000040except ImportError:
41 pass
42
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000043from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000044from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000045from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000046import auth
skobes6468b902016-10-24 08:45:10 -070047import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000048import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000049import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000050import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000051import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000052import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000053import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000054import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000056import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000057import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000058import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000060import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import scm
Francois Dorayd42c6812017-05-30 15:10:20 -040062import split_cl
maruel@chromium.org0633fb42013-08-16 20:06:14 +000063import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000064import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000065import watchlists
66
tandrii7400cf02016-06-21 08:48:07 -070067__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000068
tandrii9d2c7a32016-06-22 03:42:45 -070069COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070070DEFAULT_SERVER = 'https://codereview.chromium.org'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -080071POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000072DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
rmistry@google.comc68112d2015-03-03 12:48:06 +000073REFS_THAT_ALIAS_TO_OTHER_REFS = {
74 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
75 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
76}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000077
thestig@chromium.org44202a22014-03-11 19:22:18 +000078# Valid extensions for files we want to lint.
79DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
80DEFAULT_LINT_IGNORE_REGEX = r"$^"
81
borenet6c0efe62016-10-19 08:13:29 -070082# Buildbucket master name prefix.
83MASTER_PREFIX = 'master.'
84
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000085# Shortcut since it quickly becomes redundant.
86Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000087
maruel@chromium.orgddd59412011-11-30 14:20:38 +000088# Initialized in main()
89settings = None
90
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010091# Used by tests/git_cl_test.py to add extra logging.
92# Inside the weirdly failing test, add this:
93# >>> self.mock(git_cl, '_IS_BEING_TESTED', True)
Quinten Yearsley0c62da92017-05-31 13:39:42 -070094# And scroll up to see the stack trace printed.
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +010095_IS_BEING_TESTED = False
96
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097
Christopher Lamf732cd52017-01-24 12:40:11 +110098def DieWithError(message, change_desc=None):
99 if change_desc:
100 SaveDescriptionBackup(change_desc)
101
vapiera7fbd5a2016-06-16 09:17:49 -0700102 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000103 sys.exit(1)
104
105
Christopher Lamf732cd52017-01-24 12:40:11 +1100106def SaveDescriptionBackup(change_desc):
107 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
108 print('\nError after CL description prompt -- saving description to %s\n' %
109 backup_path)
110 backup_file = open(backup_path, 'w')
111 backup_file.write(change_desc.description)
112 backup_file.close()
113
114
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000115def GetNoGitPagerEnv():
116 env = os.environ.copy()
117 # 'cat' is a magical git string that disables pagers on all platforms.
118 env['GIT_PAGER'] = 'cat'
119 return env
120
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000121
bsep@chromium.org627d9002016-04-29 00:00:52 +0000122def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000123 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000124 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000125 except subprocess2.CalledProcessError as e:
126 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000127 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000128 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000129 'Command "%s" failed.\n%s' % (
130 ' '.join(args), error_message or e.stdout or ''))
131 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000132
133
134def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000135 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000136 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000137
138
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000139def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000140 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700141 if suppress_stderr:
142 stderr = subprocess2.VOID
143 else:
144 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000145 try:
tandrii5d48c322016-08-18 16:19:37 -0700146 (out, _), code = subprocess2.communicate(['git'] + args,
147 env=GetNoGitPagerEnv(),
148 stdout=subprocess2.PIPE,
149 stderr=stderr)
150 return code, out
151 except subprocess2.CalledProcessError as e:
152 logging.debug('Failed running %s', args)
153 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000154
155
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000156def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000157 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000158 return RunGitWithCode(args, suppress_stderr=True)[1]
159
160
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000161def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000162 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000163 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000164 return (version.startswith(prefix) and
165 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000166
167
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000168def BranchExists(branch):
169 """Return True if specified branch exists."""
170 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
171 suppress_stderr=True)
172 return not code
173
174
tandrii2a16b952016-10-19 07:09:44 -0700175def time_sleep(seconds):
176 # Use this so that it can be mocked in tests without interfering with python
177 # system machinery.
178 import time # Local import to discourage others from importing time globally.
179 return time.sleep(seconds)
180
181
maruel@chromium.org90541732011-04-01 17:54:18 +0000182def ask_for_data(prompt):
183 try:
184 return raw_input(prompt)
185 except KeyboardInterrupt:
186 # Hide the exception.
187 sys.exit(1)
188
189
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100190def confirm_or_exit(prefix='', action='confirm'):
191 """Asks user to press enter to continue or press Ctrl+C to abort."""
192 if not prefix or prefix.endswith('\n'):
193 mid = 'Press'
Andrii Shyshkalov353637c2017-03-14 16:52:18 +0100194 elif prefix.endswith('.') or prefix.endswith('?'):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100195 mid = ' Press'
196 elif prefix.endswith(' '):
197 mid = 'press'
198 else:
199 mid = ' press'
200 ask_for_data('%s%s Enter to %s, or Ctrl+C to abort' % (prefix, mid, action))
201
202
203def ask_for_explicit_yes(prompt):
204 """Returns whether user typed 'y' or 'yes' to confirm the given prompt"""
205 result = ask_for_data(prompt + ' [Yes/No]: ').lower()
206 while True:
207 if 'yes'.startswith(result):
208 return True
209 if 'no'.startswith(result):
210 return False
211 result = ask_for_data('Please, type yes or no: ').lower()
212
213
tandrii5d48c322016-08-18 16:19:37 -0700214def _git_branch_config_key(branch, key):
215 """Helper method to return Git config key for a branch."""
216 assert branch, 'branch name is required to set git config for it'
217 return 'branch.%s.%s' % (branch, key)
218
219
220def _git_get_branch_config_value(key, default=None, value_type=str,
221 branch=False):
222 """Returns git config value of given or current branch if any.
223
224 Returns default in all other cases.
225 """
226 assert value_type in (int, str, bool)
227 if branch is False: # Distinguishing default arg value from None.
228 branch = GetCurrentBranch()
229
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000230 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700231 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000232
tandrii5d48c322016-08-18 16:19:37 -0700233 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700234 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700235 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700236 # git config also has --int, but apparently git config suffers from integer
237 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700238 args.append(_git_branch_config_key(branch, key))
239 code, out = RunGitWithCode(args)
240 if code == 0:
241 value = out.strip()
242 if value_type == int:
243 return int(value)
244 if value_type == bool:
245 return bool(value.lower() == 'true')
246 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000247 return default
248
249
tandrii5d48c322016-08-18 16:19:37 -0700250def _git_set_branch_config_value(key, value, branch=None, **kwargs):
251 """Sets the value or unsets if it's None of a git branch config.
252
253 Valid, though not necessarily existing, branch must be provided,
254 otherwise currently checked out branch is used.
255 """
256 if not branch:
257 branch = GetCurrentBranch()
258 assert branch, 'a branch name OR currently checked out branch is required'
259 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700260 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700261 if value is None:
262 args.append('--unset')
263 elif isinstance(value, bool):
264 args.append('--bool')
265 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700266 else:
tandrii33a46ff2016-08-23 05:53:40 -0700267 # git config also has --int, but apparently git config suffers from integer
268 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700269 value = str(value)
270 args.append(_git_branch_config_key(branch, key))
271 if value is not None:
272 args.append(value)
273 RunGit(args, **kwargs)
274
275
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100276def _get_committer_timestamp(commit):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700277 """Returns Unix timestamp as integer of a committer in a commit.
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100278
279 Commit can be whatever git show would recognize, such as HEAD, sha1 or ref.
280 """
281 # Git also stores timezone offset, but it only affects visual display,
282 # actual point in time is defined by this timestamp only.
283 return int(RunGit(['show', '-s', '--format=%ct', commit]).strip())
284
285
286def _git_amend_head(message, committer_timestamp):
287 """Amends commit with new message and desired committer_timestamp.
288
289 Sets committer timezone to UTC.
290 """
291 env = os.environ.copy()
292 env['GIT_COMMITTER_DATE'] = '%d+0000' % committer_timestamp
293 return RunGit(['commit', '--amend', '-m', message], env=env)
294
295
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000296def add_git_similarity(parser):
297 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700298 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000299 help='Sets the percentage that a pair of files need to match in order to'
300 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000301 parser.add_option(
302 '--find-copies', action='store_true',
303 help='Allows git to look for copies.')
304 parser.add_option(
305 '--no-find-copies', action='store_false', dest='find_copies',
306 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000307
308 old_parser_args = parser.parse_args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700309
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000310 def Parse(args):
311 options, args = old_parser_args(args)
312
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000313 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700314 options.similarity = _git_get_branch_config_value(
315 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000316 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000317 print('Note: Saving similarity of %d%% in git config.'
318 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700319 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000320
iannucci@chromium.org79540052012-10-19 23:15:26 +0000321 options.similarity = max(0, min(options.similarity, 100))
322
323 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700324 options.find_copies = _git_get_branch_config_value(
325 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000326 else:
tandrii5d48c322016-08-18 16:19:37 -0700327 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000328
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000329 return options, args
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700330
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000331 parser.parse_args = Parse
332
333
machenbach@chromium.org45453142015-09-15 08:45:22 +0000334def _get_properties_from_options(options):
335 properties = dict(x.split('=', 1) for x in options.properties)
336 for key, val in properties.iteritems():
337 try:
338 properties[key] = json.loads(val)
339 except ValueError:
340 pass # If a value couldn't be evaluated, treat it as a string.
341 return properties
342
343
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000344def _prefix_master(master):
345 """Convert user-specified master name to full master name.
346
347 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
348 name, while the developers always use shortened master name
349 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
350 function does the conversion for buildbucket migration.
351 """
borenet6c0efe62016-10-19 08:13:29 -0700352 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000353 return master
borenet6c0efe62016-10-19 08:13:29 -0700354 return '%s%s' % (MASTER_PREFIX, master)
355
356
357def _unprefix_master(bucket):
358 """Convert bucket name to shortened master name.
359
360 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
361 name, while the developers always use shortened master name
362 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
363 function does the conversion for buildbucket migration.
364 """
365 if bucket.startswith(MASTER_PREFIX):
366 return bucket[len(MASTER_PREFIX):]
367 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000368
369
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000370def _buildbucket_retry(operation_name, http, *args, **kwargs):
371 """Retries requests to buildbucket service and returns parsed json content."""
372 try_count = 0
373 while True:
374 response, content = http.request(*args, **kwargs)
375 try:
376 content_json = json.loads(content)
377 except ValueError:
378 content_json = None
379
380 # Buildbucket could return an error even if status==200.
381 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000382 error = content_json.get('error')
383 if error.get('code') == 403:
384 raise BuildbucketResponseException(
385 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000386 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000387 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000388 raise BuildbucketResponseException(msg)
389
390 if response.status == 200:
391 if not content_json:
392 raise BuildbucketResponseException(
393 'Buildbucket returns invalid json content: %s.\n'
394 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
395 content)
396 return content_json
397 if response.status < 500 or try_count >= 2:
398 raise httplib2.HttpLib2Error(content)
399
400 # status >= 500 means transient failures.
401 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700402 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 try_count += 1
404 assert False, 'unreachable'
405
406
qyearsley1fdfcb62016-10-24 13:22:03 -0700407def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700408 """Returns a dict mapping bucket names to builders and tests,
409 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 """
qyearsleydd49f942016-10-28 11:57:22 -0700411 # If no bots are listed, we try to get a set of builders and tests based
412 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700413 if not options.bot:
414 change = changelist.GetChange(
415 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700416 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700417 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700418 change=change,
419 changed_files=change.LocalPaths(),
420 repository_root=settings.GetRoot(),
421 default_presubmit=None,
422 project=None,
423 verbose=options.verbose,
424 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700425 if masters is None:
426 return None
Sergiy Byelozyorov935b93f2016-11-28 20:41:56 +0100427 return {_prefix_master(m): b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700428
qyearsley1fdfcb62016-10-24 13:22:03 -0700429 if options.bucket:
430 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700431 if options.master:
432 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700433
qyearsleydd49f942016-10-28 11:57:22 -0700434 # If bots are listed but no master or bucket, then we need to find out
435 # the corresponding master for each bot.
436 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
437 if error_message:
438 option_parser.error(
439 'Tryserver master cannot be found because: %s\n'
440 'Please manually specify the tryserver master, e.g. '
441 '"-m tryserver.chromium.linux".' % error_message)
442 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700443
444
qyearsley123a4682016-10-26 09:12:17 -0700445def _get_bucket_map_for_builders(builders):
446 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700447 map_url = 'https://builders-map.appspot.com/'
448 try:
qyearsley123a4682016-10-26 09:12:17 -0700449 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700450 except urllib2.URLError as e:
451 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
452 (map_url, e))
453 except ValueError as e:
454 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700455 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700456 return None, 'Failed to build master map.'
457
qyearsley123a4682016-10-26 09:12:17 -0700458 bucket_map = {}
459 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700460 masters = builders_map.get(builder, [])
461 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700462 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700463 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700464 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700465 (builder, masters))
466 bucket = _prefix_master(masters[0])
467 bucket_map.setdefault(bucket, {})[builder] = []
468
469 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700470
471
borenet6c0efe62016-10-19 08:13:29 -0700472def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700473 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700474 """Sends a request to Buildbucket to trigger try jobs for a changelist.
475
476 Args:
477 auth_config: AuthConfig for Rietveld.
478 changelist: Changelist that the try jobs are associated with.
479 buckets: A nested dict mapping bucket names to builders to tests.
480 options: Command-line options.
481 """
tandriide281ae2016-10-12 06:02:30 -0700482 assert changelist.GetIssue(), 'CL must be uploaded first'
483 codereview_url = changelist.GetCodereviewServer()
484 assert codereview_url, 'CL must be uploaded first'
485 patchset = patchset or changelist.GetMostRecentPatchset()
486 assert patchset, 'CL must be uploaded first'
487
488 codereview_host = urlparse.urlparse(codereview_url).hostname
489 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000490 http = authenticator.authorize(httplib2.Http())
491 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700492
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000493 buildbucket_put_url = (
494 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000495 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700496 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
497 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
498 hostname=codereview_host,
499 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000500 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700501
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700502 shared_parameters_properties = changelist.GetTryJobProperties(patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700503 shared_parameters_properties['category'] = category
504 if options.clobber:
505 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700506 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700507 if extra_properties:
508 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000509
510 batch_req_body = {'builds': []}
511 print_text = []
512 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700513 for bucket, builders_and_tests in sorted(buckets.iteritems()):
514 print_text.append('Bucket: %s' % bucket)
515 master = None
516 if bucket.startswith(MASTER_PREFIX):
517 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000518 for builder, tests in sorted(builders_and_tests.iteritems()):
519 print_text.append(' %s: %s' % (builder, tests))
520 parameters = {
521 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000522 'changes': [{
Andrii Shyshkaloveadad922017-01-26 09:38:30 +0100523 'author': {'email': changelist.GetIssueOwner()},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000524 'revision': options.revision,
525 }],
tandrii8c5a3532016-11-04 07:52:02 -0700526 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000527 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000528 if 'presubmit' in builder.lower():
529 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000530 if tests:
531 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700532
533 tags = [
534 'builder:%s' % builder,
535 'buildset:%s' % buildset,
536 'user_agent:git_cl_try',
537 ]
538 if master:
539 parameters['properties']['master'] = master
540 tags.append('master:%s' % master)
541
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000542 batch_req_body['builds'].append(
543 {
544 'bucket': bucket,
545 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000546 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700547 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000548 }
549 )
550
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000551 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700552 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 http,
554 buildbucket_put_url,
555 'PUT',
556 body=json.dumps(batch_req_body),
557 headers={'Content-Type': 'application/json'}
558 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000559 print_text.append('To see results here, run: git cl try-results')
560 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700561 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000562
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000563
tandrii221ab252016-10-06 08:12:04 -0700564def fetch_try_jobs(auth_config, changelist, buildbucket_host,
565 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700566 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000567
qyearsley53f48a12016-09-01 10:45:13 -0700568 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000569 """
tandrii221ab252016-10-06 08:12:04 -0700570 assert buildbucket_host
571 assert changelist.GetIssue(), 'CL must be uploaded first'
572 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
573 patchset = patchset or changelist.GetMostRecentPatchset()
574 assert patchset, 'CL must be uploaded first'
575
576 codereview_url = changelist.GetCodereviewServer()
577 codereview_host = urlparse.urlparse(codereview_url).hostname
578 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000579 if authenticator.has_cached_credentials():
580 http = authenticator.authorize(httplib2.Http())
581 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700582 print('Warning: Some results might be missing because %s' %
583 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700584 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000585 http = httplib2.Http()
586
587 http.force_exception_to_status_code = True
588
tandrii221ab252016-10-06 08:12:04 -0700589 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
590 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
591 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000592 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700593 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000594 params = {'tag': 'buildset:%s' % buildset}
595
596 builds = {}
597 while True:
598 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700599 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000600 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700601 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000602 for build in content.get('builds', []):
603 builds[build['id']] = build
604 if 'next_cursor' in content:
605 params['start_cursor'] = content['next_cursor']
606 else:
607 break
608 return builds
609
610
qyearsleyeab3c042016-08-24 09:18:28 -0700611def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 """Prints nicely result of fetch_try_jobs."""
613 if not builds:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700614 print('No try jobs scheduled.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000615 return
616
617 # Make a copy, because we'll be modifying builds dictionary.
618 builds = builds.copy()
619 builder_names_cache = {}
620
621 def get_builder(b):
622 try:
623 return builder_names_cache[b['id']]
624 except KeyError:
625 try:
626 parameters = json.loads(b['parameters_json'])
627 name = parameters['builder_name']
628 except (ValueError, KeyError) as error:
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700629 print('WARNING: Failed to get builder name for build %s: %s' % (
vapiera7fbd5a2016-06-16 09:17:49 -0700630 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000631 name = None
632 builder_names_cache[b['id']] = name
633 return name
634
635 def get_bucket(b):
636 bucket = b['bucket']
637 if bucket.startswith('master.'):
638 return bucket[len('master.'):]
639 return bucket
640
641 if options.print_master:
642 name_fmt = '%%-%ds %%-%ds' % (
643 max(len(str(get_bucket(b))) for b in builds.itervalues()),
644 max(len(str(get_builder(b))) for b in builds.itervalues()))
645 def get_name(b):
646 return name_fmt % (get_bucket(b), get_builder(b))
647 else:
648 name_fmt = '%%-%ds' % (
649 max(len(str(get_builder(b))) for b in builds.itervalues()))
650 def get_name(b):
651 return name_fmt % get_builder(b)
652
653 def sort_key(b):
654 return b['status'], b.get('result'), get_name(b), b.get('url')
655
656 def pop(title, f, color=None, **kwargs):
657 """Pop matching builds from `builds` dict and print them."""
658
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000659 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000660 colorize = str
661 else:
662 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
663
664 result = []
665 for b in builds.values():
666 if all(b.get(k) == v for k, v in kwargs.iteritems()):
667 builds.pop(b['id'])
668 result.append(b)
669 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700670 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000671 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700672 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000673
674 total = len(builds)
675 pop(status='COMPLETED', result='SUCCESS',
676 title='Successes:', color=Fore.GREEN,
677 f=lambda b: (get_name(b), b.get('url')))
678 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
679 title='Infra Failures:', color=Fore.MAGENTA,
680 f=lambda b: (get_name(b), b.get('url')))
681 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
682 title='Failures:', color=Fore.RED,
683 f=lambda b: (get_name(b), b.get('url')))
684 pop(status='COMPLETED', result='CANCELED',
685 title='Canceled:', color=Fore.MAGENTA,
686 f=lambda b: (get_name(b),))
687 pop(status='COMPLETED', result='FAILURE',
688 failure_reason='INVALID_BUILD_DEFINITION',
689 title='Wrong master/builder name:', color=Fore.MAGENTA,
690 f=lambda b: (get_name(b),))
691 pop(status='COMPLETED', result='FAILURE',
692 title='Other failures:',
693 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
694 pop(status='COMPLETED',
695 title='Other finished:',
696 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
697 pop(status='STARTED',
698 title='Started:', color=Fore.YELLOW,
699 f=lambda b: (get_name(b), b.get('url')))
700 pop(status='SCHEDULED',
701 title='Scheduled:',
702 f=lambda b: (get_name(b), 'id=%s' % b['id']))
703 # The last section is just in case buildbucket API changes OR there is a bug.
704 pop(title='Other:',
705 f=lambda b: (get_name(b), 'id=%s' % b['id']))
706 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700707 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000708
709
qyearsley53f48a12016-09-01 10:45:13 -0700710def write_try_results_json(output_file, builds):
711 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
712
713 The input |builds| dict is assumed to be generated by Buildbucket.
714 Buildbucket documentation: http://goo.gl/G0s101
715 """
716
717 def convert_build_dict(build):
718 return {
719 'buildbucket_id': build.get('id'),
720 'status': build.get('status'),
721 'result': build.get('result'),
722 'bucket': build.get('bucket'),
723 'builder_name': json.loads(
724 build.get('parameters_json', '{}')).get('builder_name'),
725 'failure_reason': build.get('failure_reason'),
726 'url': build.get('url'),
727 }
728
729 converted = []
730 for _, build in sorted(builds.items()):
731 converted.append(convert_build_dict(build))
732 write_json(output_file, converted)
733
734
iannucci@chromium.org79540052012-10-19 23:15:26 +0000735def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000736 """Prints statistics about the change to the user."""
737 # --no-ext-diff is broken in some versions of Git, so try to work around
738 # this by overriding the environment (but there is still a problem if the
739 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741 if 'GIT_EXTERNAL_DIFF' in env:
742 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
744 if find_copies:
scottmgb84b5e32016-11-10 09:25:33 -0800745 similarity_options = ['-l100000', '-C%s' % similarity]
iannucci@chromium.org79540052012-10-19 23:15:26 +0000746 else:
747 similarity_options = ['-M%s' % similarity]
748
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000749 try:
750 stdout = sys.stdout.fileno()
751 except AttributeError:
752 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000753 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000754 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000755 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000756 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000757
758
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000759class BuildbucketResponseException(Exception):
760 pass
761
762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000763class Settings(object):
764 def __init__(self):
765 self.default_server = None
766 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000767 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000768 self.tree_status_url = None
769 self.viewvc_url = None
770 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000771 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000772 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000773 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000775 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000776 self.force_https_commit_url = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777
778 def LazyUpdateIfNeeded(self):
779 """Updates the settings from a codereview.settings file, if available."""
780 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000781 # The only value that actually changes the behavior is
782 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000783 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000784 error_ok=True
785 ).strip().lower()
786
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000787 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000788 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000789 LoadCodereviewSettingsFromFile(cr_settings_file)
790 self.updated = True
791
792 def GetDefaultServerUrl(self, error_ok=False):
793 if not self.default_server:
794 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000795 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000797 if error_ok:
798 return self.default_server
799 if not self.default_server:
800 error_message = ('Could not find settings file. You must configure '
801 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000802 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000803 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000804 return self.default_server
805
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000806 @staticmethod
807 def GetRelativeRoot():
808 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000810 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000811 if self.root is None:
812 self.root = os.path.abspath(self.GetRelativeRoot())
813 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000814
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000815 def GetGitMirror(self, remote='origin'):
816 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000817 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000818 if not os.path.isdir(local_url):
819 return None
820 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
821 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100822 # Use the /dev/null print_func to avoid terminal spew.
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100823 mirror = git_cache.Mirror(remote_url, print_func=lambda *args: None)
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000824 if mirror.exists():
825 return mirror
826 return None
827
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000828 def GetTreeStatusUrl(self, error_ok=False):
829 if not self.tree_status_url:
830 error_message = ('You must configure your tree status URL by running '
831 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000832 self.tree_status_url = self._GetRietveldConfig(
833 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000834 return self.tree_status_url
835
836 def GetViewVCUrl(self):
837 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000838 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000839 return self.viewvc_url
840
rmistry@google.com90752582014-01-14 21:04:50 +0000841 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000842 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000843
rmistry@google.com78948ed2015-07-08 23:09:57 +0000844 def GetIsSkipDependencyUpload(self, branch_name):
845 """Returns true if specified branch should skip dep uploads."""
846 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
847 error_ok=True)
848
rmistry@google.com5626a922015-02-26 14:03:30 +0000849 def GetRunPostUploadHook(self):
850 run_post_upload_hook = self._GetRietveldConfig(
851 'run-post-upload-hook', error_ok=True)
852 return run_post_upload_hook == "True"
853
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000854 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000855 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000856
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000857 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000858 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000859
ukai@chromium.orge8077812012-02-03 03:41:46 +0000860 def GetIsGerrit(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700861 """Return true if this repo is associated with gerrit code review system."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000862 if self.is_gerrit is None:
Aaron Gable9b465272017-05-12 10:53:51 -0700863 self.is_gerrit = (
864 self._GetConfig('gerrit.host', error_ok=True).lower() == 'true')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000865 return self.is_gerrit
866
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000867 def GetSquashGerritUploads(self):
868 """Return true if uploads to Gerrit should be squashed by default."""
869 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700870 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
871 if self.squash_gerrit_uploads is None:
872 # Default is squash now (http://crbug.com/611892#c23).
873 self.squash_gerrit_uploads = not (
874 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
875 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000876 return self.squash_gerrit_uploads
877
tandriia60502f2016-06-20 02:01:53 -0700878 def GetSquashGerritUploadsOverride(self):
879 """Return True or False if codereview.settings should be overridden.
880
881 Returns None if no override has been defined.
882 """
883 # See also http://crbug.com/611892#c23
884 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
885 error_ok=True).strip()
886 if result == 'true':
887 return True
888 if result == 'false':
889 return False
890 return None
891
tandrii@chromium.org28253532016-04-14 13:46:56 +0000892 def GetGerritSkipEnsureAuthenticated(self):
893 """Return True if EnsureAuthenticated should not be done for Gerrit
894 uploads."""
895 if self.gerrit_skip_ensure_authenticated is None:
896 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000897 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000898 error_ok=True).strip() == 'true')
899 return self.gerrit_skip_ensure_authenticated
900
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000901 def GetGitEditor(self):
902 """Return the editor specified in the git config, or None if none is."""
903 if self.git_editor is None:
904 self.git_editor = self._GetConfig('core.editor', error_ok=True)
905 return self.git_editor or None
906
thestig@chromium.org44202a22014-03-11 19:22:18 +0000907 def GetLintRegex(self):
908 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
909 DEFAULT_LINT_REGEX)
910
911 def GetLintIgnoreRegex(self):
912 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
913 DEFAULT_LINT_IGNORE_REGEX)
914
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000915 def GetProject(self):
916 if not self.project:
917 self.project = self._GetRietveldConfig('project', error_ok=True)
918 return self.project
919
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000920 def _GetRietveldConfig(self, param, **kwargs):
921 return self._GetConfig('rietveld.' + param, **kwargs)
922
rmistry@google.com78948ed2015-07-08 23:09:57 +0000923 def _GetBranchConfig(self, branch_name, param, **kwargs):
924 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
925
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000926 def _GetConfig(self, param, **kwargs):
927 self.LazyUpdateIfNeeded()
928 return RunGit(['config', param], **kwargs).strip()
929
930
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100931@contextlib.contextmanager
932def _get_gerrit_project_config_file(remote_url):
933 """Context manager to fetch and store Gerrit's project.config from
934 refs/meta/config branch and store it in temp file.
935
936 Provides a temporary filename or None if there was error.
937 """
938 error, _ = RunGitWithCode([
939 'fetch', remote_url,
940 '+refs/meta/config:refs/git_cl/meta/config'])
941 if error:
942 # Ref doesn't exist or isn't accessible to current user.
Quinten Yearsley0c62da92017-05-31 13:39:42 -0700943 print('WARNING: Failed to fetch project config for %s: %s' %
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100944 (remote_url, error))
945 yield None
946 return
947
948 error, project_config_data = RunGitWithCode(
949 ['show', 'refs/git_cl/meta/config:project.config'])
950 if error:
951 print('WARNING: project.config file not found')
952 yield None
953 return
954
955 with gclient_utils.temporary_directory() as tempdir:
956 project_config_file = os.path.join(tempdir, 'project.config')
957 gclient_utils.FileWrite(project_config_file, project_config_data)
958 yield project_config_file
959
960
961def _is_git_numberer_enabled(remote_url, remote_ref):
962 """Returns True if Git Numberer is enabled on this ref."""
963 # TODO(tandrii): this should be deleted once repos below are 100% on Gerrit.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100964 KNOWN_PROJECTS_WHITELIST = [
965 'chromium/src',
966 'external/webrtc',
967 'v8/v8',
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +0100968 'infra/experimental',
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100969 ]
970
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100971 assert remote_ref and remote_ref.startswith('refs/'), remote_ref
972 url_parts = urlparse.urlparse(remote_url)
973 project_name = url_parts.path.lstrip('/').rstrip('git./')
974 for known in KNOWN_PROJECTS_WHITELIST:
975 if project_name.endswith(known):
976 break
977 else:
978 # Early exit to avoid extra fetches for repos that aren't using Git
979 # Numberer.
980 return False
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100981
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100982 with _get_gerrit_project_config_file(remote_url) as project_config_file:
983 if project_config_file is None:
984 # Failed to fetch project.config, which shouldn't happen on open source
985 # repos KNOWN_PROJECTS_WHITELIST.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100986 return False
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100987 def get_opts(x):
988 code, out = RunGitWithCode(
989 ['config', '-f', project_config_file, '--get-all',
990 'plugin.git-numberer.validate-%s-refglob' % x])
991 if code == 0:
992 return out.strip().splitlines()
993 return []
994 enabled, disabled = map(get_opts, ['enabled', 'disabled'])
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +0100995
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100996 logging.info('validator config enabled %s disabled %s refglobs for '
997 '(this ref: %s)', enabled, disabled, remote_ref)
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +0000998
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100999 def match_refglobs(refglobs):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001000 for refglob in refglobs:
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001001 if remote_ref == refglob or fnmatch.fnmatch(remote_ref, refglob):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001002 return True
1003 return False
1004
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001005 if match_refglobs(disabled):
1006 return False
1007 return match_refglobs(enabled)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001008
1009
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001010def ShortBranchName(branch):
1011 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 return branch.replace('refs/heads/', '', 1)
1013
1014
1015def GetCurrentBranchRef():
1016 """Returns branch ref (e.g., refs/heads/master) or None."""
1017 return RunGit(['symbolic-ref', 'HEAD'],
1018 stderr=subprocess2.VOID, error_ok=True).strip() or None
1019
1020
1021def GetCurrentBranch():
1022 """Returns current branch or None.
1023
1024 For refs/heads/* branches, returns just last part. For others, full ref.
1025 """
1026 branchref = GetCurrentBranchRef()
1027 if branchref:
1028 return ShortBranchName(branchref)
1029 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001030
1031
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001032class _CQState(object):
1033 """Enum for states of CL with respect to Commit Queue."""
1034 NONE = 'none'
1035 DRY_RUN = 'dry_run'
1036 COMMIT = 'commit'
1037
1038 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1039
1040
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001041class _ParsedIssueNumberArgument(object):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001042 def __init__(self, issue=None, patchset=None, hostname=None, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001043 self.issue = issue
1044 self.patchset = patchset
1045 self.hostname = hostname
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02001046 assert codereview in (None, 'rietveld', 'gerrit')
1047 self.codereview = codereview
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001048
1049 @property
1050 def valid(self):
1051 return self.issue is not None
1052
1053
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001054def ParseIssueNumberArgument(arg, codereview=None):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001055 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1056 fail_result = _ParsedIssueNumberArgument()
1057
1058 if arg.isdigit():
Aaron Gableaee6c852017-06-26 12:49:01 -07001059 return _ParsedIssueNumberArgument(issue=int(arg), codereview=codereview)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001060 if not arg.startswith('http'):
1061 return fail_result
Aaron Gableaee6c852017-06-26 12:49:01 -07001062
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001063 url = gclient_utils.UpgradeToHttps(arg)
1064 try:
1065 parsed_url = urlparse.urlparse(url)
1066 except ValueError:
1067 return fail_result
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001068
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001069 if codereview is not None:
1070 parsed = _CODEREVIEW_IMPLEMENTATIONS[codereview].ParseIssueURL(parsed_url)
1071 return parsed or fail_result
1072
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001073 results = {}
1074 for name, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1075 parsed = cls.ParseIssueURL(parsed_url)
1076 if parsed is not None:
1077 results[name] = parsed
1078
1079 if not results:
1080 return fail_result
1081 if len(results) == 1:
1082 return results.values()[0]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001083
1084 if parsed_url.netloc and parsed_url.netloc.split('.')[0].endswith('-review'):
1085 # This is likely Gerrit.
1086 return results['gerrit']
1087 # Choose Rietveld as before if URL can parsed by either.
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02001088 return results['rietveld']
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001089
1090
Aaron Gablea45ee112016-11-22 15:14:38 -08001091class GerritChangeNotExists(Exception):
tandriic2405f52016-10-10 08:13:15 -07001092 def __init__(self, issue, url):
1093 self.issue = issue
1094 self.url = url
Aaron Gablea45ee112016-11-22 15:14:38 -08001095 super(GerritChangeNotExists, self).__init__()
tandriic2405f52016-10-10 08:13:15 -07001096
1097 def __str__(self):
Aaron Gablea45ee112016-11-22 15:14:38 -08001098 return 'change %s at %s does not exist or you have no access to it' % (
tandriic2405f52016-10-10 08:13:15 -07001099 self.issue, self.url)
1100
1101
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001102_CommentSummary = collections.namedtuple(
1103 '_CommentSummary', ['date', 'message', 'sender',
1104 # TODO(tandrii): these two aren't known in Gerrit.
1105 'approval', 'disapproval'])
1106
1107
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001108class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001109 """Changelist works with one changelist in local branch.
1110
1111 Supports two codereview backends: Rietveld or Gerrit, selected at object
1112 creation.
1113
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001114 Notes:
1115 * Not safe for concurrent multi-{thread,process} use.
1116 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001117 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001118 """
1119
1120 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1121 """Create a new ChangeList instance.
1122
1123 If issue is given, the codereview must be given too.
1124
1125 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1126 Otherwise, it's decided based on current configuration of the local branch,
1127 with default being 'rietveld' for backwards compatibility.
1128 See _load_codereview_impl for more details.
1129
1130 **kwargs will be passed directly to codereview implementation.
1131 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001132 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001133 global settings
1134 if not settings:
1135 # Happens when git_cl.py is used as a utility library.
1136 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001137
1138 if issue:
1139 assert codereview, 'codereview must be known, if issue is known'
1140
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141 self.branchref = branchref
1142 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001143 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001144 self.branch = ShortBranchName(self.branchref)
1145 else:
1146 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001147 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001148 self.lookedup_issue = False
1149 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 self.has_description = False
1151 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001152 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001153 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001154 self.cc = None
1155 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001156 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001157
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001158 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001159 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001160 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001161 assert self._codereview_impl
1162 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001163
1164 def _load_codereview_impl(self, codereview=None, **kwargs):
1165 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001166 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1167 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1168 self._codereview = codereview
1169 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001170 return
1171
1172 # Automatic selection based on issue number set for a current branch.
1173 # Rietveld takes precedence over Gerrit.
1174 assert not self.issue
1175 # Whether we find issue or not, we are doing the lookup.
1176 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001177 if self.GetBranch():
1178 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1179 issue = _git_get_branch_config_value(
1180 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1181 if issue:
1182 self._codereview = codereview
1183 self._codereview_impl = cls(self, **kwargs)
1184 self.issue = int(issue)
1185 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001186
1187 # No issue is set for this branch, so decide based on repo-wide settings.
1188 return self._load_codereview_impl(
1189 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1190 **kwargs)
1191
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001192 def IsGerrit(self):
1193 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001194
1195 def GetCCList(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001196 """Returns the users cc'd on this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001197
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001198 The return value is a string suitable for passing to git cl with the --cc
1199 flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001200 """
1201 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001202 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001203 more_cc = ','.join(self.watchers)
1204 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1205 return self.cc
1206
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001207 def GetCCListWithoutDefault(self):
1208 """Return the users cc'd on this CL excluding default ones."""
1209 if self.cc is None:
1210 self.cc = ','.join(self.watchers)
1211 return self.cc
1212
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001213 def SetWatchers(self, watchers):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001214 """Sets the list of email addresses that should be cc'd based on the changed
1215 files in this CL.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001216 """
1217 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218
1219 def GetBranch(self):
1220 """Returns the short branch name, e.g. 'master'."""
1221 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001222 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001223 if not branchref:
1224 return None
1225 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001226 self.branch = ShortBranchName(self.branchref)
1227 return self.branch
1228
1229 def GetBranchRef(self):
1230 """Returns the full branch name, e.g. 'refs/heads/master'."""
1231 self.GetBranch() # Poke the lazy loader.
1232 return self.branchref
1233
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001234 def ClearBranch(self):
1235 """Clears cached branch data of this object."""
1236 self.branch = self.branchref = None
1237
tandrii5d48c322016-08-18 16:19:37 -07001238 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1239 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1240 kwargs['branch'] = self.GetBranch()
1241 return _git_get_branch_config_value(key, default, **kwargs)
1242
1243 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1244 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1245 assert self.GetBranch(), (
1246 'this CL must have an associated branch to %sset %s%s' %
1247 ('un' if value is None else '',
1248 key,
1249 '' if value is None else ' to %r' % value))
1250 kwargs['branch'] = self.GetBranch()
1251 return _git_set_branch_config_value(key, value, **kwargs)
1252
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001253 @staticmethod
1254 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001255 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001256 e.g. 'origin', 'refs/heads/master'
1257 """
1258 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001259 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1260
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001261 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001262 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001263 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001264 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1265 error_ok=True).strip()
1266 if upstream_branch:
1267 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001268 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001269 # Else, try to guess the origin remote.
1270 remote_branches = RunGit(['branch', '-r']).split()
1271 if 'origin/master' in remote_branches:
1272 # Fall back on origin/master if it exits.
1273 remote = 'origin'
1274 upstream_branch = 'refs/heads/master'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001275 else:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001276 DieWithError(
1277 'Unable to determine default branch to diff against.\n'
1278 'Either pass complete "git diff"-style arguments, like\n'
1279 ' git cl upload origin/master\n'
1280 'or verify this branch is set up to track another \n'
1281 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001282
1283 return remote, upstream_branch
1284
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001285 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001286 upstream_branch = self.GetUpstreamBranch()
1287 if not BranchExists(upstream_branch):
1288 DieWithError('The upstream for the current branch (%s) does not exist '
1289 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001290 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001291 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001292
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 def GetUpstreamBranch(self):
1294 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001295 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001296 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001297 upstream_branch = upstream_branch.replace('refs/heads/',
1298 'refs/remotes/%s/' % remote)
1299 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1300 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001301 self.upstream_branch = upstream_branch
1302 return self.upstream_branch
1303
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001304 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001305 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001306 remote, branch = None, self.GetBranch()
1307 seen_branches = set()
1308 while branch not in seen_branches:
1309 seen_branches.add(branch)
1310 remote, branch = self.FetchUpstreamTuple(branch)
1311 branch = ShortBranchName(branch)
1312 if remote != '.' or branch.startswith('refs/remotes'):
1313 break
1314 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001315 remotes = RunGit(['remote'], error_ok=True).split()
1316 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001317 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001318 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001319 remote = 'origin'
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001320 logging.warn('Could not determine which remote this change is '
1321 'associated with, so defaulting to "%s".' % self._remote)
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001322 else:
1323 logging.warn('Could not determine which remote this change is '
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001324 'associated with.')
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001325 branch = 'HEAD'
1326 if branch.startswith('refs/remotes'):
1327 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001328 elif branch.startswith('refs/branch-heads/'):
1329 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001330 else:
1331 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001332 return self._remote
1333
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001334 def GitSanityChecks(self, upstream_git_obj):
1335 """Checks git repo status and ensures diff is from local commits."""
1336
sbc@chromium.org79706062015-01-14 21:18:12 +00001337 if upstream_git_obj is None:
1338 if self.GetBranch() is None:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001339 print('ERROR: Unable to determine current branch (detached HEAD?)',
vapiera7fbd5a2016-06-16 09:17:49 -07001340 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001341 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001342 print('ERROR: No upstream branch.', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001343 return False
1344
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001345 # Verify the commit we're diffing against is in our current branch.
1346 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1347 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1348 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001349 print('ERROR: %s is not in the current branch. You may need to rebase '
1350 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001351 return False
1352
1353 # List the commits inside the diff, and verify they are all local.
1354 commits_in_diff = RunGit(
1355 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1356 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1357 remote_branch = remote_branch.strip()
1358 if code != 0:
1359 _, remote_branch = self.GetRemoteBranch()
1360
1361 commits_in_remote = RunGit(
1362 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1363
1364 common_commits = set(commits_in_diff) & set(commits_in_remote)
1365 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001366 print('ERROR: Your diff contains %d commits already in %s.\n'
1367 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1368 'the diff. If you are using a custom git flow, you can override'
1369 ' the reference used for this check with "git config '
1370 'gitcl.remotebranch <git-ref>".' % (
1371 len(common_commits), remote_branch, upstream_git_obj),
1372 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001373 return False
1374 return True
1375
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001376 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001377 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001378
1379 Returns None if it is not set.
1380 """
tandrii5d48c322016-08-18 16:19:37 -07001381 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001382
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001383 def GetRemoteUrl(self):
1384 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1385
1386 Returns None if there is no remote.
1387 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001388 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001389 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1390
1391 # If URL is pointing to a local directory, it is probably a git cache.
1392 if os.path.isdir(url):
1393 url = RunGit(['config', 'remote.%s.url' % remote],
1394 error_ok=True,
1395 cwd=url).strip()
1396 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001397
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001398 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001399 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001400 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001401 self.issue = self._GitGetBranchConfigValue(
1402 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001403 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001404 return self.issue
1405
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001406 def GetIssueURL(self):
1407 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001408 issue = self.GetIssue()
1409 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001410 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001411 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001412
Andrii Shyshkalov31863012017-02-08 11:35:12 +01001413 def GetDescription(self, pretty=False, force=False):
1414 if not self.has_description or force:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 if self.GetIssue():
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001416 self.description = self._codereview_impl.FetchDescription(force=force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417 self.has_description = True
1418 if pretty:
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001419 # Set width to 72 columns + 2 space indent.
1420 wrapper = textwrap.TextWrapper(width=74, replace_whitespace=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001421 wrapper.initial_indent = wrapper.subsequent_indent = ' '
Asanka Herath7c61dcb2016-12-14 13:01:58 -05001422 lines = self.description.splitlines()
1423 return '\n'.join([wrapper.fill(line) for line in lines])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001424 return self.description
1425
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001426 def GetDescriptionFooters(self):
1427 """Returns (non_footer_lines, footers) for the commit message.
1428
1429 Returns:
1430 non_footer_lines (list(str)) - Simple list of description lines without
1431 any footer. The lines do not contain newlines, nor does the list contain
1432 the empty line between the message and the footers.
1433 footers (list(tuple(KEY, VALUE))) - List of parsed footers, e.g.
1434 [("Change-Id", "Ideadbeef...."), ...]
1435 """
1436 raw_description = self.GetDescription()
1437 msg_lines, _, footers = git_footers.split_footers(raw_description)
1438 if footers:
1439 msg_lines = msg_lines[:len(msg_lines)-1]
1440 return msg_lines, footers
1441
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001442 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001443 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001444 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001445 self.patchset = self._GitGetBranchConfigValue(
1446 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001447 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001448 return self.patchset
1449
1450 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001451 """Set this branch's patchset. If patchset=0, clears the patchset."""
1452 assert self.GetBranch()
1453 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001454 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001455 else:
1456 self.patchset = int(patchset)
1457 self._GitSetBranchConfigValue(
1458 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001459
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001460 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001461 """Set this branch's issue. If issue isn't given, clears the issue."""
1462 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001463 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001464 issue = int(issue)
1465 self._GitSetBranchConfigValue(
1466 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001467 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001468 codereview_server = self._codereview_impl.GetCodereviewServer()
1469 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001470 self._GitSetBranchConfigValue(
1471 self._codereview_impl.CodereviewServerConfigKey(),
1472 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001473 else:
tandrii5d48c322016-08-18 16:19:37 -07001474 # Reset all of these just to be clean.
1475 reset_suffixes = [
1476 'last-upload-hash',
1477 self._codereview_impl.IssueConfigKey(),
1478 self._codereview_impl.PatchsetConfigKey(),
1479 self._codereview_impl.CodereviewServerConfigKey(),
1480 ] + self._PostUnsetIssueProperties()
1481 for prop in reset_suffixes:
1482 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001483 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001484 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001485
dnjba1b0f32016-09-02 12:37:42 -07001486 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001487 if not self.GitSanityChecks(upstream_branch):
1488 DieWithError('\nGit sanity check failure')
1489
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001490 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001491 if not root:
1492 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001493 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001494
1495 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001496 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001497 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001498 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001499 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001500 except subprocess2.CalledProcessError:
1501 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001502 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001503 'This branch probably doesn\'t exist anymore. To reset the\n'
1504 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001505 ' git branch --set-upstream-to origin/master %s\n'
1506 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001507 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001508
maruel@chromium.org52424302012-08-29 15:14:30 +00001509 issue = self.GetIssue()
1510 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001511 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001512 description = self.GetDescription()
1513 else:
1514 # If the change was never uploaded, use the log messages of all commits
1515 # up to the branch point, as git cl upload will prefill the description
1516 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001517 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1518 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001519
1520 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001521 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001522 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001523 name,
1524 description,
1525 absroot,
1526 files,
1527 issue,
1528 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001529 author,
1530 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001531
dsansomee2d6fd92016-09-08 00:10:47 -07001532 def UpdateDescription(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001533 self._codereview_impl.UpdateDescriptionRemote(description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001534 self.description = description
Andrii Shyshkalov83051152017-02-07 23:47:29 +01001535 self.has_description = True
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001536
Robert Iannucci09f1f3d2017-03-28 16:54:32 -07001537 def UpdateDescriptionFooters(self, description_lines, footers, force=False):
1538 """Sets the description for this CL remotely.
1539
1540 You can get description_lines and footers with GetDescriptionFooters.
1541
1542 Args:
1543 description_lines (list(str)) - List of CL description lines without
1544 newline characters.
1545 footers (list(tuple(KEY, VALUE))) - List of footers, as returned by
1546 GetDescriptionFooters. Key must conform to the git footers format (i.e.
1547 `List-Of-Tokens`). It will be case-normalized so that each token is
1548 title-cased.
1549 """
1550 new_description = '\n'.join(description_lines)
1551 if footers:
1552 new_description += '\n'
1553 for k, v in footers:
1554 foot = '%s: %s' % (git_footers.normalize_name(k), v)
1555 if not git_footers.FOOTER_PATTERN.match(foot):
1556 raise ValueError('Invalid footer %r' % foot)
1557 new_description += foot + '\n'
1558 self.UpdateDescription(new_description, force)
1559
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001560 def RunHook(self, committing, may_prompt, verbose, change):
1561 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1562 try:
1563 return presubmit_support.DoPresubmitChecks(change, committing,
1564 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1565 default_presubmit=None, may_prompt=may_prompt,
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001566 rietveld_obj=self._codereview_impl.GetRietveldObjForPresubmit(),
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001567 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001568 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001569 DieWithError(
1570 ('%s\nMaybe your depot_tools is out of date?\n'
1571 'If all fails, contact maruel@') % e)
1572
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001573 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1574 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001575 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1576 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001577 else:
1578 # Assume url.
1579 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1580 urlparse.urlparse(issue_arg))
1581 if not parsed_issue_arg or not parsed_issue_arg.valid:
1582 DieWithError('Failed to parse issue argument "%s". '
1583 'Must be an issue number or a valid URL.' % issue_arg)
1584 return self._codereview_impl.CMDPatchWithParsedIssue(
Aaron Gable62619a32017-06-16 08:22:09 -07001585 parsed_issue_arg, reject, nocommit, directory, False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001586
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001587 def CMDUpload(self, options, git_diff_args, orig_args):
1588 """Uploads a change to codereview."""
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001589 custom_cl_base = None
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001590 if git_diff_args:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001591 custom_cl_base = base_branch = git_diff_args[0]
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001592 else:
1593 if self.GetBranch() is None:
1594 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1595
1596 # Default to diffing against common ancestor of upstream branch
1597 base_branch = self.GetCommonAncestorWithUpstream()
1598 git_diff_args = [base_branch, 'HEAD']
1599
Aaron Gablec4c40d12017-05-22 11:49:53 -07001600 # Warn about Rietveld deprecation for initial uploads to Rietveld.
1601 if not self.IsGerrit() and not self.GetIssue():
1602 print('=====================================')
1603 print('NOTICE: Rietveld is being deprecated. '
1604 'You can upload changes to Gerrit with')
1605 print(' git cl upload --gerrit')
1606 print('or set Gerrit to be your default code review tool with')
1607 print(' git config gerrit.host true')
1608 print('=====================================')
1609
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001610 # Fast best-effort checks to abort before running potentially
1611 # expensive hooks if uploading is likely to fail anyway. Passing these
1612 # checks does not guarantee that uploading will not fail.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001613 self._codereview_impl.EnsureAuthenticated(force=options.force)
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001614 self._codereview_impl.EnsureCanUploadPatchset(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001615
1616 # Apply watchlists on upload.
1617 change = self.GetChange(base_branch, None)
1618 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1619 files = [f.LocalPath() for f in change.AffectedFiles()]
1620 if not options.bypass_watchlists:
1621 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1622
1623 if not options.bypass_hooks:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001624 if options.reviewers or options.tbrs or options.add_owners_to:
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001625 # Set the reviewer list now so that presubmit checks can access it.
1626 change_description = ChangeDescription(change.FullDescriptionText())
1627 change_description.update_reviewers(options.reviewers,
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001628 options.tbrs,
Robert Iannuccif2708bd2017-04-17 15:49:02 -07001629 options.add_owners_to,
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001630 change)
1631 change.SetDescriptionText(change_description.description)
1632 hook_results = self.RunHook(committing=False,
1633 may_prompt=not options.force,
1634 verbose=options.verbose,
1635 change=change)
1636 if not hook_results.should_continue():
1637 return 1
1638 if not options.reviewers and hook_results.reviewers:
1639 options.reviewers = hook_results.reviewers.split(',')
1640
Ravi Mistryfda50ca2016-11-14 10:19:18 -05001641 # TODO(tandrii): Checking local patchset against remote patchset is only
1642 # supported for Rietveld. Extend it to Gerrit or remove it completely.
1643 if self.GetIssue() and not self.IsGerrit():
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001644 latest_patchset = self.GetMostRecentPatchset()
1645 local_patchset = self.GetPatchset()
1646 if (latest_patchset and local_patchset and
1647 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001648 print('The last upload made from this repository was patchset #%d but '
1649 'the most recent patchset on the server is #%d.'
1650 % (local_patchset, latest_patchset))
1651 print('Uploading will still work, but if you\'ve uploaded to this '
1652 'issue from another machine or branch the patch you\'re '
1653 'uploading now might not include those changes.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001654 confirm_or_exit(action='upload')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001655
1656 print_stats(options.similarity, options.find_copies, git_diff_args)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001657 ret = self.CMDUploadChange(options, git_diff_args, custom_cl_base, change)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001658 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001659 if options.use_commit_queue:
1660 self.SetCQState(_CQState.COMMIT)
1661 elif options.cq_dry_run:
1662 self.SetCQState(_CQState.DRY_RUN)
1663
tandrii5d48c322016-08-18 16:19:37 -07001664 _git_set_branch_config_value('last-upload-hash',
1665 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001666 # Run post upload hooks, if specified.
1667 if settings.GetRunPostUploadHook():
1668 presubmit_support.DoPostUploadExecuter(
1669 change,
1670 self,
1671 settings.GetRoot(),
1672 options.verbose,
1673 sys.stdout)
1674
1675 # Upload all dependencies if specified.
1676 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001677 print()
1678 print('--dependencies has been specified.')
1679 print('All dependent local branches will be re-uploaded.')
1680 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001681 # Remove the dependencies flag from args so that we do not end up in a
1682 # loop.
1683 orig_args.remove('--dependencies')
1684 ret = upload_branch_deps(self, orig_args)
1685 return ret
1686
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001687 def SetCQState(self, new_state):
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001688 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001689
1690 Issue must have been already uploaded and known.
1691 """
1692 assert new_state in _CQState.ALL_STATES
1693 assert self.GetIssue()
qyearsley1fdfcb62016-10-24 13:22:03 -07001694 try:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001695 self._codereview_impl.SetCQState(new_state)
qyearsley1fdfcb62016-10-24 13:22:03 -07001696 return 0
1697 except KeyboardInterrupt:
1698 raise
1699 except:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001700 print('WARNING: Failed to %s.\n'
qyearsley1fdfcb62016-10-24 13:22:03 -07001701 'Either:\n'
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07001702 ' * Your project has no CQ,\n'
1703 ' * You don\'t have permission to change the CQ state,\n'
1704 ' * There\'s a bug in this code (see stack trace below).\n'
1705 'Consider specifying which bots to trigger manually or asking your '
1706 'project owners for permissions or contacting Chrome Infra at:\n'
1707 'https://www.chromium.org/infra\n\n' %
1708 ('cancel CQ' if new_state == _CQState.NONE else 'trigger CQ'))
qyearsley1fdfcb62016-10-24 13:22:03 -07001709 # Still raise exception so that stack trace is printed.
1710 raise
1711
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001712 # Forward methods to codereview specific implementation.
1713
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001714 def AddComment(self, message):
1715 return self._codereview_impl.AddComment(message)
1716
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001717 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001718 """Returns list of _CommentSummary for each comment.
1719
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001720 args:
1721 readable: determines whether the output is designed for a human or a machine
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001722 """
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001723 return self._codereview_impl.GetCommentsSummary(readable)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001724
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001725 def CloseIssue(self):
1726 return self._codereview_impl.CloseIssue()
1727
1728 def GetStatus(self):
1729 return self._codereview_impl.GetStatus()
1730
1731 def GetCodereviewServer(self):
1732 return self._codereview_impl.GetCodereviewServer()
1733
tandriide281ae2016-10-12 06:02:30 -07001734 def GetIssueOwner(self):
1735 """Get owner from codereview, which may differ from this checkout."""
1736 return self._codereview_impl.GetIssueOwner()
1737
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001738 def GetMostRecentPatchset(self):
1739 return self._codereview_impl.GetMostRecentPatchset()
1740
tandriide281ae2016-10-12 06:02:30 -07001741 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001742 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriide281ae2016-10-12 06:02:30 -07001743 return self._codereview_impl.CannotTriggerTryJobReason()
1744
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001745 def GetTryJobProperties(self, patchset=None):
1746 """Returns dictionary of properties to launch try job."""
1747 return self._codereview_impl.GetTryJobProperties(patchset=patchset)
tandrii8c5a3532016-11-04 07:52:02 -07001748
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001749 def __getattr__(self, attr):
1750 # This is because lots of untested code accesses Rietveld-specific stuff
1751 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001752 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001753 # Note that child method defines __getattr__ as well, and forwards it here,
1754 # because _RietveldChangelistImpl is not cleaned up yet, and given
1755 # deprecation of Rietveld, it should probably be just removed.
1756 # Until that time, avoid infinite recursion by bypassing __getattr__
1757 # of implementation class.
1758 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001759
1760
1761class _ChangelistCodereviewBase(object):
1762 """Abstract base class encapsulating codereview specifics of a changelist."""
1763 def __init__(self, changelist):
1764 self._changelist = changelist # instance of Changelist
1765
1766 def __getattr__(self, attr):
1767 # Forward methods to changelist.
1768 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1769 # _RietveldChangelistImpl to avoid this hack?
1770 return getattr(self._changelist, attr)
1771
1772 def GetStatus(self):
1773 """Apply a rough heuristic to give a simple summary of an issue's review
1774 or CQ status, assuming adherence to a common workflow.
1775
1776 Returns None if no issue for this branch, or specific string keywords.
1777 """
1778 raise NotImplementedError()
1779
1780 def GetCodereviewServer(self):
1781 """Returns server URL without end slash, like "https://codereview.com"."""
1782 raise NotImplementedError()
1783
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001784 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001785 """Fetches and returns description from the codereview server."""
1786 raise NotImplementedError()
1787
tandrii5d48c322016-08-18 16:19:37 -07001788 @classmethod
1789 def IssueConfigKey(cls):
1790 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001791 raise NotImplementedError()
1792
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001793 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001794 def PatchsetConfigKey(cls):
1795 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001796 raise NotImplementedError()
1797
tandrii5d48c322016-08-18 16:19:37 -07001798 @classmethod
1799 def CodereviewServerConfigKey(cls):
1800 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001801 raise NotImplementedError()
1802
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001803 def _PostUnsetIssueProperties(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001804 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07001805 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001806
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001807 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001808 # This is an unfortunate Rietveld-embeddedness in presubmit.
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001809 # For non-Rietveld code reviews, this probably should return a dummy object.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001810 raise NotImplementedError()
1811
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001812 def GetGerritObjForPresubmit(self):
1813 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1814 return None
1815
dsansomee2d6fd92016-09-08 00:10:47 -07001816 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001817 """Update the description on codereview site."""
1818 raise NotImplementedError()
1819
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01001820 def AddComment(self, message):
1821 """Posts a comment to the codereview site."""
1822 raise NotImplementedError()
1823
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07001824 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01001825 raise NotImplementedError()
1826
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001827 def CloseIssue(self):
1828 """Closes the issue."""
1829 raise NotImplementedError()
1830
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001831 def GetMostRecentPatchset(self):
1832 """Returns the most recent patchset number from the codereview site."""
1833 raise NotImplementedError()
1834
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001835 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07001836 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001837 """Fetches and applies the issue.
1838
1839 Arguments:
1840 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1841 reject: if True, reject the failed patch instead of switching to 3-way
1842 merge. Rietveld only.
1843 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1844 only.
1845 directory: switch to directory before applying the patch. Rietveld only.
Aaron Gable62619a32017-06-16 08:22:09 -07001846 force: if true, overwrites existing local state.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001847 """
1848 raise NotImplementedError()
1849
1850 @staticmethod
1851 def ParseIssueURL(parsed_url):
1852 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1853 failed."""
1854 raise NotImplementedError()
1855
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001856 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001857 """Best effort check that user is authenticated with codereview server.
1858
1859 Arguments:
1860 force: whether to skip confirmation questions.
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001861 refresh: whether to attempt to refresh credentials. Ignored if not
1862 applicable.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001863 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001864 raise NotImplementedError()
1865
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001866 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001867 """Best effort check that uploading isn't supposed to fail for predictable
1868 reasons.
1869
1870 This method should raise informative exception if uploading shouldn't
1871 proceed.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001872
1873 Arguments:
1874 force: whether to skip confirmation questions.
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001875 """
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001876 raise NotImplementedError()
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001877
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001878 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001879 """Uploads a change to codereview."""
1880 raise NotImplementedError()
1881
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001882 def SetCQState(self, new_state):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001883 """Updates the CQ state for the latest patchset.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001884
1885 Issue must have been already uploaded and known.
1886 """
1887 raise NotImplementedError()
1888
tandriie113dfd2016-10-11 10:20:12 -07001889 def CannotTriggerTryJobReason(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001890 """Returns reason (str) if unable trigger try jobs on this CL or None."""
tandriie113dfd2016-10-11 10:20:12 -07001891 raise NotImplementedError()
1892
tandriide281ae2016-10-12 06:02:30 -07001893 def GetIssueOwner(self):
1894 raise NotImplementedError()
1895
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001896 def GetTryJobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001897 raise NotImplementedError()
1898
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001899
1900class _RietveldChangelistImpl(_ChangelistCodereviewBase):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001901
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001902 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001903 super(_RietveldChangelistImpl, self).__init__(changelist)
1904 assert settings, 'must be initialized in _ChangelistCodereviewBase'
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001905 if not codereview_host:
martiniss6eda05f2016-06-30 10:18:35 -07001906 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001907
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001908 self._rietveld_server = codereview_host
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01001909 self._auth_config = auth_config or auth.make_auth_config()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001910 self._props = None
1911 self._rpc_server = None
1912
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001913 def GetCodereviewServer(self):
1914 if not self._rietveld_server:
1915 # If we're on a branch then get the server potentially associated
1916 # with that branch.
1917 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001918 self._rietveld_server = gclient_utils.UpgradeToHttps(
1919 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001920 if not self._rietveld_server:
1921 self._rietveld_server = settings.GetDefaultServerUrl()
1922 return self._rietveld_server
1923
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001924 def EnsureAuthenticated(self, force, refresh=False):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001925 """Best effort check that user is authenticated with Rietveld server."""
1926 if self._auth_config.use_oauth2:
1927 authenticator = auth.get_authenticator_for_host(
1928 self.GetCodereviewServer(), self._auth_config)
1929 if not authenticator.has_cached_credentials():
1930 raise auth.LoginRequiredError(self.GetCodereviewServer())
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01001931 if refresh:
1932 authenticator.get_access_token()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001933
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001934 def EnsureCanUploadPatchset(self, force):
1935 # No checks for Rietveld because we are deprecating Rietveld.
1936 pass
1937
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001938 def FetchDescription(self, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001939 issue = self.GetIssue()
1940 assert issue
1941 try:
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001942 return self.RpcServer().get_description(issue, force=force).strip()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001943 except urllib2.HTTPError as e:
1944 if e.code == 404:
1945 DieWithError(
1946 ('\nWhile fetching the description for issue %d, received a '
1947 '404 (not found)\n'
1948 'error. It is likely that you deleted this '
1949 'issue on the server. If this is the\n'
1950 'case, please run\n\n'
1951 ' git cl issue 0\n\n'
1952 'to clear the association with the deleted issue. Then run '
1953 'this command again.') % issue)
1954 else:
1955 DieWithError(
1956 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1957 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001958 print('Warning: Failed to retrieve CL description due to network '
1959 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001960 return ''
1961
1962 def GetMostRecentPatchset(self):
1963 return self.GetIssueProperties()['patchsets'][-1]
1964
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001965 def GetIssueProperties(self):
1966 if self._props is None:
1967 issue = self.GetIssue()
1968 if not issue:
1969 self._props = {}
1970 else:
1971 self._props = self.RpcServer().get_issue_properties(issue, True)
1972 return self._props
1973
tandriie113dfd2016-10-11 10:20:12 -07001974 def CannotTriggerTryJobReason(self):
1975 props = self.GetIssueProperties()
1976 if not props:
1977 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1978 if props.get('closed'):
1979 return 'CL %s is closed' % self.GetIssue()
1980 if props.get('private'):
1981 return 'CL %s is private' % self.GetIssue()
1982 return None
1983
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001984 def GetTryJobProperties(self, patchset=None):
1985 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07001986 project = (self.GetIssueProperties() or {}).get('project')
1987 return {
1988 'issue': self.GetIssue(),
1989 'patch_project': project,
1990 'patch_storage': 'rietveld',
1991 'patchset': patchset or self.GetPatchset(),
1992 'rietveld': self.GetCodereviewServer(),
1993 }
1994
tandriide281ae2016-10-12 06:02:30 -07001995 def GetIssueOwner(self):
1996 return (self.GetIssueProperties() or {}).get('owner_email')
1997
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001998 def AddComment(self, message):
1999 return self.RpcServer().add_comment(self.GetIssue(), message)
2000
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002001 def GetCommentsSummary(self, _readable=True):
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002002 summary = []
2003 for message in self.GetIssueProperties().get('messages', []):
2004 date = datetime.datetime.strptime(message['date'], '%Y-%m-%d %H:%M:%S.%f')
2005 summary.append(_CommentSummary(
2006 date=date,
2007 disapproval=bool(message['disapproval']),
2008 approval=bool(message['approval']),
2009 sender=message['sender'],
2010 message=message['text'],
2011 ))
2012 return summary
2013
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002014 def GetStatus(self):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002015 """Applies a rough heuristic to give a simple summary of an issue's review
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002016 or CQ status, assuming adherence to a common workflow.
2017
2018 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gablea1bab272017-04-11 16:38:18 -07002019 * 'error' - error from review tool (including deleted issues)
2020 * 'unsent' - not sent for review
2021 * 'waiting' - waiting for review
2022 * 'reply' - waiting for owner to reply to review
2023 * 'not lgtm' - Code-Review label has been set negatively
2024 * 'lgtm' - LGTM from at least one approved reviewer
2025 * 'commit' - in the commit queue
2026 * 'closed' - closed
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002027 """
2028 if not self.GetIssue():
2029 return None
2030
2031 try:
2032 props = self.GetIssueProperties()
2033 except urllib2.HTTPError:
2034 return 'error'
2035
2036 if props.get('closed'):
2037 # Issue is closed.
2038 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00002039 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002040 # Issue is in the commit queue.
2041 return 'commit'
2042
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002043 messages = props.get('messages') or []
Aaron Gablea1bab272017-04-11 16:38:18 -07002044 if not messages:
2045 # No message was sent.
2046 return 'unsent'
2047
2048 if get_approving_reviewers(props):
2049 return 'lgtm'
2050 elif get_approving_reviewers(props, disapproval=True):
2051 return 'not lgtm'
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002052
tandrii9d2c7a32016-06-22 03:42:45 -07002053 # Skip CQ messages that don't require owner's action.
2054 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
2055 if 'Dry run:' in messages[-1]['text']:
2056 messages.pop()
2057 elif 'The CQ bit was unchecked' in messages[-1]['text']:
2058 # This message always follows prior messages from CQ,
2059 # so skip this too.
2060 messages.pop()
2061 else:
2062 # This is probably a CQ messages warranting user attention.
2063 break
2064
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002065 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07002066 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002067 return 'reply'
2068 return 'waiting'
2069
dsansomee2d6fd92016-09-08 00:10:47 -07002070 def UpdateDescriptionRemote(self, description, force=False):
Andrii Shyshkalov83051152017-02-07 23:47:29 +01002071 self.RpcServer().update_description(self.GetIssue(), description)
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002072
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002073 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002074 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002075
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002076 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002077 return self.SetFlags({flag: value})
2078
2079 def SetFlags(self, flags):
2080 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002081 """
phajdan.jr68598232016-08-10 03:28:28 -07002082 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002083 try:
tandrii4b233bd2016-07-06 03:50:29 -07002084 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002085 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002086 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002087 if e.code == 404:
2088 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2089 if e.code == 403:
2090 DieWithError(
2091 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002092 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002093 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002094
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002095 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002096 """Returns an upload.RpcServer() to access this review's rietveld instance.
2097 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002098 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002099 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002100 self.GetCodereviewServer(),
Andrii Shyshkalov98cef572017-01-25 13:57:52 +01002101 self._auth_config)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002102 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002103
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002104 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002105 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002106 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002107
tandrii5d48c322016-08-18 16:19:37 -07002108 @classmethod
2109 def PatchsetConfigKey(cls):
2110 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002111
tandrii5d48c322016-08-18 16:19:37 -07002112 @classmethod
2113 def CodereviewServerConfigKey(cls):
2114 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002115
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002116 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002117 return self.RpcServer()
2118
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002119 def SetCQState(self, new_state):
2120 props = self.GetIssueProperties()
2121 if props.get('private'):
2122 DieWithError('Cannot set-commit on private issue')
2123
2124 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002125 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002126 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002127 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002128 else:
tandrii4b233bd2016-07-06 03:50:29 -07002129 assert new_state == _CQState.DRY_RUN
2130 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002131
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002132 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002133 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002134 # PatchIssue should never be called with a dirty tree. It is up to the
2135 # caller to check this, but just in case we assert here since the
2136 # consequences of the caller not checking this could be dire.
2137 assert(not git_common.is_dirty_git_tree('apply'))
2138 assert(parsed_issue_arg.valid)
2139 self._changelist.issue = parsed_issue_arg.issue
2140 if parsed_issue_arg.hostname:
2141 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2142
skobes6468b902016-10-24 08:45:10 -07002143 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2144 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2145 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002146 try:
skobes6468b902016-10-24 08:45:10 -07002147 scm_obj.apply_patch(patchset_object)
2148 except Exception as e:
2149 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002150 return 1
2151
2152 # If we had an issue, commit the current state and register the issue.
2153 if not nocommit:
Aaron Gabled343c632017-03-15 11:02:26 -07002154 self.SetIssue(self.GetIssue())
2155 self.SetPatchset(patchset)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002156 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2157 'patch from issue %(i)s at patchset '
2158 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2159 % {'i': self.GetIssue(), 'p': patchset})])
vapiera7fbd5a2016-06-16 09:17:49 -07002160 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002161 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002162 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002163 return 0
2164
2165 @staticmethod
2166 def ParseIssueURL(parsed_url):
2167 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2168 return None
wychen3c1c1722016-08-04 11:46:36 -07002169 # Rietveld patch: https://domain/<number>/#ps<patchset>
2170 match = re.match(r'/(\d+)/$', parsed_url.path)
2171 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2172 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002173 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002174 issue=int(match.group(1)),
2175 patchset=int(match2.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002176 hostname=parsed_url.netloc,
2177 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002178 # Typical url: https://domain/<issue_number>[/[other]]
2179 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2180 if match:
skobes6468b902016-10-24 08:45:10 -07002181 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002182 issue=int(match.group(1)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002183 hostname=parsed_url.netloc,
2184 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002185 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2186 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2187 if match:
skobes6468b902016-10-24 08:45:10 -07002188 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002189 issue=int(match.group(1)),
2190 patchset=int(match.group(2)),
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002191 hostname=parsed_url.netloc,
2192 codereview='rietveld')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002193 return None
2194
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002195 def CMDUploadChange(self, options, args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002196 """Upload the patch to Rietveld."""
2197 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2198 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002199 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2200 if options.emulate_svn_auto_props:
2201 upload_args.append('--emulate_svn_auto_props')
2202
2203 change_desc = None
2204
2205 if options.email is not None:
2206 upload_args.extend(['--email', options.email])
2207
2208 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002209 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002210 upload_args.extend(['--title', options.title])
2211 if options.message:
2212 upload_args.extend(['--message', options.message])
2213 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002214 print('This branch is associated with issue %s. '
2215 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002216 else:
nodirca166002016-06-27 10:59:51 -07002217 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 upload_args.extend(['--title', options.title])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002219 if options.message:
2220 message = options.message
2221 else:
2222 message = CreateDescriptionFromLog(args)
2223 if options.title:
2224 message = options.title + '\n\n' + message
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002225 change_desc = ChangeDescription(message)
Robert Iannuccif2708bd2017-04-17 15:49:02 -07002226 if options.reviewers or options.add_owners_to:
Robert Iannucci6c98dc62017-04-18 11:38:00 -07002227 change_desc.update_reviewers(options.reviewers, options.tbrs,
2228 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002229 if not options.force:
Aaron Gable3a16ed12017-03-23 10:51:55 -07002230 change_desc.prompt(bug=options.bug, git_footer=False)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002231
2232 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002233 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002234 return 1
2235
2236 upload_args.extend(['--message', change_desc.description])
2237 if change_desc.get_reviewers():
2238 upload_args.append('--reviewers=%s' % ','.join(
2239 change_desc.get_reviewers()))
2240 if options.send_mail:
2241 if not change_desc.get_reviewers():
Christopher Lamf732cd52017-01-24 12:40:11 +11002242 DieWithError("Must specify reviewers to send email.", change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002243 upload_args.append('--send_mail')
2244
2245 # We check this before applying rietveld.private assuming that in
2246 # rietveld.cc only addresses which we can send private CLs to are listed
2247 # if rietveld.private is set, and so we should ignore rietveld.cc only
2248 # when --private is specified explicitly on the command line.
2249 if options.private:
2250 logging.warn('rietveld.cc is ignored since private flag is specified. '
2251 'You need to review and add them manually if necessary.')
2252 cc = self.GetCCListWithoutDefault()
2253 else:
2254 cc = self.GetCCList()
2255 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002256 if change_desc.get_cced():
2257 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002258 if cc:
2259 upload_args.extend(['--cc', cc])
2260
2261 if options.private or settings.GetDefaultPrivateFlag() == "True":
2262 upload_args.append('--private')
2263
2264 upload_args.extend(['--git_similarity', str(options.similarity)])
2265 if not options.find_copies:
2266 upload_args.extend(['--git_no_find_copies'])
2267
2268 # Include the upstream repo's URL in the change -- this is useful for
2269 # projects that have their source spread across multiple repos.
2270 remote_url = self.GetGitBaseUrlFromConfig()
2271 if not remote_url:
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08002272 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2273 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2274 self.GetUpstreamBranch().split('/')[-1])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002275 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002276 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002277 target_ref = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002278 if target_ref:
2279 upload_args.extend(['--target_ref', target_ref])
2280
2281 # Look for dependent patchsets. See crbug.com/480453 for more details.
2282 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2283 upstream_branch = ShortBranchName(upstream_branch)
2284 if remote is '.':
2285 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002286 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002287 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002288 print()
2289 print('Skipping dependency patchset upload because git config '
2290 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2291 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002292 else:
2293 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002294 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002295 auth_config=auth_config)
2296 branch_cl_issue_url = branch_cl.GetIssueURL()
2297 branch_cl_issue = branch_cl.GetIssue()
2298 branch_cl_patchset = branch_cl.GetPatchset()
2299 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2300 upload_args.extend(
2301 ['--depends_on_patchset', '%s:%s' % (
2302 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002303 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002304 '\n'
2305 'The current branch (%s) is tracking a local branch (%s) with '
2306 'an associated CL.\n'
2307 'Adding %s/#ps%s as a dependency patchset.\n'
2308 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2309 branch_cl_patchset))
2310
2311 project = settings.GetProject()
2312 if project:
2313 upload_args.extend(['--project', project])
2314
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002315 try:
2316 upload_args = ['upload'] + upload_args + args
2317 logging.info('upload.RealMain(%s)', upload_args)
2318 issue, patchset = upload.RealMain(upload_args)
2319 issue = int(issue)
2320 patchset = int(patchset)
2321 except KeyboardInterrupt:
2322 sys.exit(1)
2323 except:
2324 # If we got an exception after the user typed a description for their
2325 # change, back up the description before re-raising.
2326 if change_desc:
Christopher Lamf732cd52017-01-24 12:40:11 +11002327 SaveDescriptionBackup(change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002328 raise
2329
2330 if not self.GetIssue():
2331 self.SetIssue(issue)
2332 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002333 return 0
2334
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002335
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002336class _GerritChangelistImpl(_ChangelistCodereviewBase):
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002337 def __init__(self, changelist, auth_config=None, codereview_host=None):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002338 # auth_config is Rietveld thing, kept here to preserve interface only.
2339 super(_GerritChangelistImpl, self).__init__(changelist)
2340 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002341 # Lazily cached values.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002342 self._gerrit_host = None # e.g. chromium-review.googlesource.com
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002343 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002344 # Map from change number (issue) to its detail cache.
2345 self._detail_cache = {}
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002346
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002347 if codereview_host is not None:
2348 assert not codereview_host.startswith('https://'), codereview_host
2349 self._gerrit_host = codereview_host
2350 self._gerrit_server = 'https://%s' % codereview_host
2351
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002352 def _GetGerritHost(self):
2353 # Lazy load of configs.
2354 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002355 if self._gerrit_host and '.' not in self._gerrit_host:
2356 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2357 # This happens for internal stuff http://crbug.com/614312.
2358 parsed = urlparse.urlparse(self.GetRemoteUrl())
2359 if parsed.scheme == 'sso':
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002360 print('WARNING: using non-https URLs for remote is likely broken\n'
tandriie32e3ea2016-06-22 02:52:48 -07002361 ' Your current remote is: %s' % self.GetRemoteUrl())
2362 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2363 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002364 return self._gerrit_host
2365
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002366 def _GetGitHost(self):
2367 """Returns git host to be used when uploading change to Gerrit."""
2368 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2369
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002370 def GetCodereviewServer(self):
2371 if not self._gerrit_server:
2372 # If we're on a branch then get the server potentially associated
2373 # with that branch.
2374 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002375 self._gerrit_server = self._GitGetBranchConfigValue(
2376 self.CodereviewServerConfigKey())
2377 if self._gerrit_server:
2378 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002379 if not self._gerrit_server:
2380 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2381 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002382 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002383 parts[0] = parts[0] + '-review'
2384 self._gerrit_host = '.'.join(parts)
2385 self._gerrit_server = 'https://%s' % self._gerrit_host
2386 return self._gerrit_server
2387
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002388 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002389 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002390 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002391
tandrii5d48c322016-08-18 16:19:37 -07002392 @classmethod
2393 def PatchsetConfigKey(cls):
2394 return 'gerritpatchset'
2395
2396 @classmethod
2397 def CodereviewServerConfigKey(cls):
2398 return 'gerritserver'
2399
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01002400 def EnsureAuthenticated(self, force, refresh=None):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002401 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002402 if settings.GetGerritSkipEnsureAuthenticated():
2403 # For projects with unusual authentication schemes.
2404 # See http://crbug.com/603378.
2405 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002406 # Lazy-loader to identify Gerrit and Git hosts.
2407 if gerrit_util.GceAuthenticator.is_gce():
2408 return
2409 self.GetCodereviewServer()
2410 git_host = self._GetGitHost()
2411 assert self._gerrit_server and self._gerrit_host
2412 cookie_auth = gerrit_util.CookiesAuthenticator()
2413
2414 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2415 git_auth = cookie_auth.get_auth_header(git_host)
2416 if gerrit_auth and git_auth:
2417 if gerrit_auth == git_auth:
2418 return
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002419 all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002420 print((
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002421 'WARNING: You have different credentials for Gerrit and git hosts:\n'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002422 ' %s\n'
2423 ' %s\n'
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002424 ' Consider running the following command:\n'
2425 ' git cl creds-check\n'
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002426 ' %s\n'
Andrii Shyshkalov8e4576f2017-05-10 15:46:53 +02002427 ' %s') %
Andrii Shyshkalov51acef92017-04-11 17:19:59 +02002428 (git_host, self._gerrit_host,
Andrii Shyshkalov354e1d22017-06-09 19:31:33 +02002429 ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002430 cookie_auth.get_new_password_message(git_host)))
2431 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002432 confirm_or_exit('If you know what you are doing', action='continue')
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002433 return
2434 else:
2435 missing = (
2436 [] if gerrit_auth else [self._gerrit_host] +
2437 [] if git_auth else [git_host])
2438 DieWithError('Credentials for the following hosts are required:\n'
2439 ' %s\n'
2440 'These are read from %s (or legacy %s)\n'
2441 '%s' % (
2442 '\n '.join(missing),
2443 cookie_auth.get_gitcookies_path(),
2444 cookie_auth.get_netrc_path(),
2445 cookie_auth.get_new_password_message(git_host)))
2446
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002447 def EnsureCanUploadPatchset(self, force):
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002448 if not self.GetIssue():
2449 return
2450
2451 # Warm change details cache now to avoid RPCs later, reducing latency for
2452 # developers.
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002453 self._GetChangeDetail(
2454 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT'])
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01002455
2456 status = self._GetChangeDetail()['status']
2457 if status in ('MERGED', 'ABANDONED'):
2458 DieWithError('Change %s has been %s, new uploads are not allowed' %
2459 (self.GetIssueURL(),
2460 'submitted' if status == 'MERGED' else 'abandoned'))
2461
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002462 if gerrit_util.GceAuthenticator.is_gce():
2463 return
2464 cookies_user = gerrit_util.CookiesAuthenticator().get_auth_email(
2465 self._GetGerritHost())
2466 if self.GetIssueOwner() == cookies_user:
2467 return
2468 logging.debug('change %s owner is %s, cookies user is %s',
2469 self.GetIssue(), self.GetIssueOwner(), cookies_user)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002470 # Maybe user has linked accounts or something like that,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002471 # so ask what Gerrit thinks of this user.
2472 details = gerrit_util.GetAccountDetails(self._GetGerritHost(), 'self')
2473 if details['email'] == self.GetIssueOwner():
2474 return
2475 if not force:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002476 print('WARNING: Change %s is owned by %s, but you authenticate to Gerrit '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002477 'as %s.\n'
2478 'Uploading may fail due to lack of permissions.' %
2479 (self.GetIssue(), self.GetIssueOwner(), details['email']))
2480 confirm_or_exit(action='upload')
2481
2482
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002483 def _PostUnsetIssueProperties(self):
2484 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002485 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002486
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002487 def GetRietveldObjForPresubmit(self):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002488 class ThisIsNotRietveldIssue(object):
2489 def __nonzero__(self):
2490 # This is a hack to make presubmit_support think that rietveld is not
2491 # defined, yet still ensure that calls directly result in a decent
2492 # exception message below.
2493 return False
2494
2495 def __getattr__(self, attr):
2496 print(
2497 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2498 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002499 'Please, either change your PRESUBMIT to not use rietveld_obj.%s,\n'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002500 'or use Rietveld for codereview.\n'
2501 'See also http://crbug.com/579160.' % attr)
2502 raise NotImplementedError()
2503 return ThisIsNotRietveldIssue()
2504
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002505 def GetGerritObjForPresubmit(self):
2506 return presubmit_support.GerritAccessor(self._GetGerritHost())
2507
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002508 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002509 """Apply a rough heuristic to give a simple summary of an issue's review
2510 or CQ status, assuming adherence to a common workflow.
2511
2512 Returns None if no issue for this branch, or one of the following keywords:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002513 * 'error' - error from review tool (including deleted issues)
2514 * 'unsent' - no reviewers added
2515 * 'waiting' - waiting for review
2516 * 'reply' - waiting for uploader to reply to review
2517 * 'lgtm' - Code-Review label has been set
2518 * 'commit' - in the commit queue
2519 * 'closed' - successfully submitted or abandoned
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002520 """
2521 if not self.GetIssue():
2522 return None
2523
2524 try:
Aaron Gable9ab38c62017-04-06 14:36:33 -07002525 data = self._GetChangeDetail([
2526 'DETAILED_LABELS', 'CURRENT_REVISION', 'SUBMITTABLE'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002527 except (httplib.HTTPException, GerritChangeNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002528 return 'error'
2529
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002530 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002531 return 'closed'
2532
Aaron Gable9ab38c62017-04-06 14:36:33 -07002533 if data['labels'].get('Commit-Queue', {}).get('approved'):
2534 # The section will have an "approved" subsection if anyone has voted
2535 # the maximum value on the label.
2536 return 'commit'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002537
Aaron Gable9ab38c62017-04-06 14:36:33 -07002538 if data['labels'].get('Code-Review', {}).get('approved'):
2539 return 'lgtm'
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002540
2541 if not data.get('reviewers', {}).get('REVIEWER', []):
2542 return 'unsent'
2543
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002544 owner = data['owner'].get('_account_id')
Aaron Gable9ab38c62017-04-06 14:36:33 -07002545 messages = sorted(data.get('messages', []), key=lambda m: m.get('updated'))
2546 last_message_author = messages.pop().get('author', {})
2547 while last_message_author:
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002548 if last_message_author.get('email') == COMMIT_BOT_EMAIL:
2549 # Ignore replies from CQ.
Aaron Gable9ab38c62017-04-06 14:36:33 -07002550 last_message_author = messages.pop().get('author', {})
Andrii Shyshkalov33e88a42017-01-27 14:45:30 +01002551 continue
Aaron Gable9ab38c62017-04-06 14:36:33 -07002552 if last_message_author.get('_account_id') == owner:
2553 # Most recent message was by owner.
2554 return 'waiting'
2555 else:
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002556 # Some reply from non-owner.
2557 return 'reply'
Aaron Gable9ab38c62017-04-06 14:36:33 -07002558
2559 # Somehow there are no messages even though there are reviewers.
2560 return 'unsent'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002561
2562 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002563 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002564 return data['revisions'][data['current_revision']]['_number']
2565
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002566 def FetchDescription(self, force=False):
2567 data = self._GetChangeDetail(['CURRENT_REVISION', 'CURRENT_COMMIT'],
2568 no_cache=force)
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002569 current_rev = data['current_revision']
Andrii Shyshkalov9c3a4642017-01-24 17:41:22 +01002570 return data['revisions'][current_rev]['commit']['message']
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002571
dsansomee2d6fd92016-09-08 00:10:47 -07002572 def UpdateDescriptionRemote(self, description, force=False):
2573 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2574 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002575 confirm_or_exit(
dsansomee2d6fd92016-09-08 00:10:47 -07002576 'The description cannot be modified while the issue has a pending '
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002577 'unpublished edit. Either publish the edit in the Gerrit web UI '
2578 'or delete it.\n\n', action='delete the unpublished edit')
dsansomee2d6fd92016-09-08 00:10:47 -07002579
2580 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2581 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002582 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
Andrii Shyshkalovea4fc832016-12-01 14:53:23 +01002583 description, notify='NONE')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002584
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002585 def AddComment(self, message):
2586 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2587 msg=message)
2588
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002589 def GetCommentsSummary(self, readable=True):
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002590 # DETAILED_ACCOUNTS is to get emails in accounts.
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002591 messages = self._GetChangeDetail(
2592 options=['MESSAGES', 'DETAILED_ACCOUNTS']).get('messages', [])
2593 file_comments = gerrit_util.GetChangeComments(
2594 self._GetGerritHost(), self.GetIssue())
2595
2596 # Build dictionary of file comments for easy access and sorting later.
2597 # {author+date: {path: {patchset: {line: url+message}}}}
2598 comments = collections.defaultdict(
2599 lambda: collections.defaultdict(lambda: collections.defaultdict(dict)))
2600 for path, line_comments in file_comments.iteritems():
2601 for comment in line_comments:
2602 if comment.get('tag', '').startswith('autogenerated'):
2603 continue
2604 key = (comment['author']['email'], comment['updated'])
2605 if comment.get('side', 'REVISION') == 'PARENT':
2606 patchset = 'Base'
2607 else:
2608 patchset = 'PS%d' % comment['patch_set']
2609 line = comment.get('line', 0)
2610 url = ('https://%s/c/%s/%s/%s#%s%s' %
2611 (self._GetGerritHost(), self.GetIssue(), comment['patch_set'], path,
2612 'b' if comment.get('side') == 'PARENT' else '',
2613 str(line) if line else ''))
2614 comments[key][path][patchset][line] = (url, comment['message'])
2615
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002616 summary = []
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002617 for msg in messages:
2618 # Don't bother showing autogenerated messages.
2619 if msg.get('tag') and msg.get('tag').startswith('autogenerated'):
2620 continue
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002621 # Gerrit spits out nanoseconds.
2622 assert len(msg['date'].split('.')[-1]) == 9
2623 date = datetime.datetime.strptime(msg['date'][:-3],
2624 '%Y-%m-%d %H:%M:%S.%f')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002625 message = msg['message']
2626 key = (msg['author']['email'], msg['date'])
2627 if key in comments:
2628 message += '\n'
2629 for path, patchsets in sorted(comments.get(key, {}).items()):
2630 if readable:
2631 message += '\n%s' % path
2632 for patchset, lines in sorted(patchsets.items()):
2633 for line, (url, content) in sorted(lines.items()):
2634 if line:
2635 line_str = 'Line %d' % line
2636 path_str = '%s:%d:' % (path, line)
2637 else:
2638 line_str = 'File comment'
2639 path_str = '%s:0:' % path
2640 if readable:
2641 message += '\n %s, %s: %s' % (patchset, line_str, url)
2642 message += '\n %s\n' % content
2643 else:
2644 message += '\n%s ' % path_str
2645 message += '\n%s\n' % content
2646
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002647 summary.append(_CommentSummary(
2648 date=date,
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002649 message=message,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002650 sender=msg['author']['email'],
2651 # These could be inferred from the text messages and correlated with
2652 # Code-Review label maximum, however this is not reliable.
2653 # Leaving as is until the need arises.
2654 approval=False,
2655 disapproval=False,
2656 ))
2657 return summary
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01002658
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002659 def CloseIssue(self):
2660 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2661
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002662 def SubmitIssue(self, wait_for_merge=True):
2663 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2664 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002665
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002666 def _GetChangeDetail(self, options=None, issue=None,
2667 no_cache=False):
2668 """Returns details of the issue by querying Gerrit and caching results.
2669
2670 If fresh data is needed, set no_cache=True which will clear cache and
2671 thus new data will be fetched from Gerrit.
2672 """
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002673 options = options or []
2674 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002675 assert issue, 'issue is required to query Gerrit'
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002676
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002677 # Optimization to avoid multiple RPCs:
2678 if (('CURRENT_REVISION' in options or 'ALL_REVISIONS' in options) and
2679 'CURRENT_COMMIT' not in options):
2680 options.append('CURRENT_COMMIT')
2681
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002682 # Normalize issue and options for consistent keys in cache.
2683 issue = str(issue)
2684 options = [o.upper() for o in options]
2685
2686 # Check in cache first unless no_cache is True.
2687 if no_cache:
2688 self._detail_cache.pop(issue, None)
2689 else:
2690 options_set = frozenset(options)
2691 for cached_options_set, data in self._detail_cache.get(issue, []):
2692 # Assumption: data fetched before with extra options is suitable
2693 # for return for a smaller set of options.
2694 # For example, if we cached data for
2695 # options=[CURRENT_REVISION, DETAILED_FOOTERS]
2696 # and request is for options=[CURRENT_REVISION],
2697 # THEN we can return prior cached data.
2698 if options_set.issubset(cached_options_set):
2699 return data
2700
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002701 try:
Aaron Gable19ee16c2017-04-18 11:56:35 -07002702 data = gerrit_util.GetChangeDetail(
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002703 self._GetGerritHost(), str(issue), options)
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002704 except gerrit_util.GerritError as e:
2705 if e.http_status == 404:
Aaron Gablea45ee112016-11-22 15:14:38 -08002706 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002707 raise
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002708
2709 self._detail_cache.setdefault(issue, []).append((frozenset(options), data))
tandriic2405f52016-10-10 08:13:15 -07002710 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002711
agable32978d92016-11-01 12:55:02 -07002712 def _GetChangeCommit(self, issue=None):
2713 issue = issue or self.GetIssue()
2714 assert issue, 'issue is required to query Gerrit'
Aaron Gable6f5a8d92017-04-18 14:49:05 -07002715 try:
2716 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2717 except gerrit_util.GerritError as e:
2718 if e.http_status == 404:
2719 raise GerritChangeNotExists(issue, self.GetCodereviewServer())
2720 raise
agable32978d92016-11-01 12:55:02 -07002721 return data
2722
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002723 def CMDLand(self, force, bypass_hooks, verbose):
2724 if git_common.is_dirty_git_tree('land'):
2725 return 1
tandriid60367b2016-06-22 05:25:12 -07002726 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2727 if u'Commit-Queue' in detail.get('labels', {}):
2728 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002729 confirm_or_exit('\nIt seems this repository has a Commit Queue, '
2730 'which can test and land changes for you. '
2731 'Are you sure you wish to bypass it?\n',
2732 action='bypass CQ')
tandriid60367b2016-06-22 05:25:12 -07002733
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002734 differs = True
tandriic4344b52016-08-29 06:04:54 -07002735 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002736 # Note: git diff outputs nothing if there is no diff.
2737 if not last_upload or RunGit(['diff', last_upload]).strip():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002738 print('WARNING: Some changes from local branch haven\'t been uploaded.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002739 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002740 if detail['current_revision'] == last_upload:
2741 differs = False
2742 else:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002743 print('WARNING: Local branch contents differ from latest uploaded '
2744 'patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002745 if differs:
2746 if not force:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002747 confirm_or_exit(
2748 'Do you want to submit latest Gerrit patchset and bypass hooks?\n',
2749 action='submit')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002750 print('WARNING: Bypassing hooks and submitting latest uploaded patchset.')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002751 elif not bypass_hooks:
2752 hook_results = self.RunHook(
2753 committing=True,
2754 may_prompt=not force,
2755 verbose=verbose,
2756 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2757 if not hook_results.should_continue():
2758 return 1
2759
2760 self.SubmitIssue(wait_for_merge=True)
2761 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002762 links = self._GetChangeCommit().get('web_links', [])
2763 for link in links:
Aaron Gable02cdbb42016-12-13 16:24:25 -08002764 if link.get('name') == 'gitiles' and link.get('url'):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002765 print('Landed as: %s' % link.get('url'))
agable32978d92016-11-01 12:55:02 -07002766 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002767 return 0
2768
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002769 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
Aaron Gable62619a32017-06-16 08:22:09 -07002770 directory, force):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002771 assert not reject
2772 assert not nocommit
2773 assert not directory
2774 assert parsed_issue_arg.valid
2775
2776 self._changelist.issue = parsed_issue_arg.issue
2777
2778 if parsed_issue_arg.hostname:
2779 self._gerrit_host = parsed_issue_arg.hostname
2780 self._gerrit_server = 'https://%s' % self._gerrit_host
2781
tandriic2405f52016-10-10 08:13:15 -07002782 try:
2783 detail = self._GetChangeDetail(['ALL_REVISIONS'])
Aaron Gablea45ee112016-11-22 15:14:38 -08002784 except GerritChangeNotExists as e:
tandriic2405f52016-10-10 08:13:15 -07002785 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002786
2787 if not parsed_issue_arg.patchset:
2788 # Use current revision by default.
2789 revision_info = detail['revisions'][detail['current_revision']]
2790 patchset = int(revision_info['_number'])
2791 else:
2792 patchset = parsed_issue_arg.patchset
2793 for revision_info in detail['revisions'].itervalues():
2794 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2795 break
2796 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08002797 DieWithError('Couldn\'t find patchset %i in change %i' %
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002798 (parsed_issue_arg.patchset, self.GetIssue()))
2799
2800 fetch_info = revision_info['fetch']['http']
2801 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
Aaron Gable9387b4f2017-06-08 10:50:03 -07002802
Aaron Gable62619a32017-06-16 08:22:09 -07002803 if force:
2804 RunGit(['reset', '--hard', 'FETCH_HEAD'])
2805 print('Checked out commit for change %i patchset %i locally' %
2806 (parsed_issue_arg.issue, patchset))
2807 else:
Aaron Gable9387b4f2017-06-08 10:50:03 -07002808 RunGit(['cherry-pick', 'FETCH_HEAD'])
2809 print('Committed patch for change %i patchset %i locally.' %
Aaron Gable62619a32017-06-16 08:22:09 -07002810 (parsed_issue_arg.issue, patchset))
2811 print('Note: this created a local commit which does not have '
2812 'the same hash as the one uploaded for review. This will make '
2813 'uploading changes based on top of this branch difficult.\n'
2814 'If you want to do that, use "git cl patch --force" instead.')
2815
2816 self.SetIssue(parsed_issue_arg.issue)
2817 self.SetPatchset(patchset)
2818 fetched_hash = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2819 self._GitSetBranchConfigValue('last-upload-hash', fetched_hash)
2820 self._GitSetBranchConfigValue('gerritsquashhash', fetched_hash)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002821 return 0
2822
2823 @staticmethod
2824 def ParseIssueURL(parsed_url):
2825 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2826 return None
2827 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2828 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2829 # Short urls like https://domain/<issue_number> can be used, but don't allow
2830 # specifying the patchset (you'd 404), but we allow that here.
2831 if parsed_url.path == '/':
2832 part = parsed_url.fragment
2833 else:
2834 part = parsed_url.path
2835 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2836 if match:
2837 return _ParsedIssueNumberArgument(
2838 issue=int(match.group(2)),
2839 patchset=int(match.group(4)) if match.group(4) else None,
Andrii Shyshkalov90f31922017-04-10 16:10:21 +02002840 hostname=parsed_url.netloc,
2841 codereview='gerrit')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002842 return None
2843
tandrii16e0b4e2016-06-07 10:34:28 -07002844 def _GerritCommitMsgHookCheck(self, offer_removal):
2845 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2846 if not os.path.exists(hook):
2847 return
2848 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2849 # custom developer made one.
2850 data = gclient_utils.FileRead(hook)
2851 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2852 return
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002853 print('WARNING: You have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002854 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002855 'and may interfere with it in subtle ways.\n'
2856 'We recommend you remove the commit-msg hook.')
2857 if offer_removal:
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002858 if ask_for_explicit_yes('Do you want to remove it now?'):
tandrii16e0b4e2016-06-07 10:34:28 -07002859 gclient_utils.rm_file_or_tree(hook)
2860 print('Gerrit commit-msg hook removed.')
2861 else:
2862 print('OK, will keep Gerrit commit-msg hook in place.')
2863
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002864 def CMDUploadChange(self, options, git_diff_args, custom_cl_base, change):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002865 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002866 if options.squash and options.no_squash:
2867 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002868
2869 if not options.squash and not options.no_squash:
2870 # Load default for user, repo, squash=true, in this order.
2871 options.squash = settings.GetSquashGerritUploads()
2872 elif options.no_squash:
2873 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002874
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002875 remote, remote_branch = self.GetRemoteBranch()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002876 branch = GetTargetRef(remote, remote_branch, options.target_branch)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002877
Aaron Gableb56ad332017-01-06 15:24:31 -08002878 # This may be None; default fallback value is determined in logic below.
2879 title = options.title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002880 automatic_title = False
Aaron Gableb56ad332017-01-06 15:24:31 -08002881
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002882 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002883 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002884 if self.GetIssue():
2885 # Try to get the message from a previous upload.
2886 message = self.GetDescription()
2887 if not message:
2888 DieWithError(
Aaron Gablea45ee112016-11-22 15:14:38 -08002889 'failed to fetch description from current Gerrit change %d\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002890 '%s' % (self.GetIssue(), self.GetIssueURL()))
Aaron Gableb56ad332017-01-06 15:24:31 -08002891 if not title:
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002892 if options.message:
Aaron Gable7303dcb2017-06-07 14:17:32 -07002893 # When uploading a subsequent patchset, -m|--message is taken
2894 # as the patchset title if --title was not provided.
2895 title = options.message.strip()
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02002896 else:
2897 default_title = RunGit(
2898 ['show', '-s', '--format=%s', 'HEAD']).strip()
Aaron Gable7303dcb2017-06-07 14:17:32 -07002899 if options.force:
2900 title = default_title
2901 else:
2902 title = ask_for_data(
2903 'Title for patchset [%s]: ' % default_title) or default_title
2904 if title == default_title:
2905 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002906 change_id = self._GetChangeDetail()['change_id']
2907 while True:
2908 footer_change_ids = git_footers.get_footer_change_id(message)
2909 if footer_change_ids == [change_id]:
2910 break
2911 if not footer_change_ids:
2912 message = git_footers.add_footer_change_id(message, change_id)
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002913 print('WARNING: appended missing Change-Id to change description.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002914 continue
2915 # There is already a valid footer but with different or several ids.
2916 # Doing this automatically is non-trivial as we don't want to lose
2917 # existing other footers, yet we want to append just 1 desired
2918 # Change-Id. Thus, just create a new footer, but let user verify the
2919 # new description.
2920 message = '%s\n\nChange-Id: %s' % (message, change_id)
2921 print(
Aaron Gablea45ee112016-11-22 15:14:38 -08002922 'WARNING: change %s has Change-Id footer(s):\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002923 ' %s\n'
Aaron Gablea45ee112016-11-22 15:14:38 -08002924 'but change has Change-Id %s, according to Gerrit.\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002925 'Please, check the proposed correction to the description, '
2926 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2927 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2928 change_id))
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002929 confirm_or_exit(action='edit')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002930 if not options.force:
2931 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002932 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002933 message = change_desc.description
2934 if not message:
2935 DieWithError("Description is empty. Aborting...")
2936 # Continue the while loop.
2937 # Sanity check of this code - we should end up with proper message
2938 # footer.
2939 assert [change_id] == git_footers.get_footer_change_id(message)
2940 change_desc = ChangeDescription(message)
Aaron Gableb56ad332017-01-06 15:24:31 -08002941 else: # if not self.GetIssue()
2942 if options.message:
2943 message = options.message
2944 else:
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002945 message = CreateDescriptionFromLog(git_diff_args)
Aaron Gableb56ad332017-01-06 15:24:31 -08002946 if options.title:
2947 message = options.title + '\n\n' + message
2948 change_desc = ChangeDescription(message)
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002949
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002950 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002951 change_desc.prompt(bug=options.bug)
Aaron Gableb56ad332017-01-06 15:24:31 -08002952 # On first upload, patchset title is always this string, while
2953 # --title flag gets converted to first line of message.
2954 title = 'Initial upload'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00002955 automatic_title = True
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002956 if not change_desc.description:
2957 DieWithError("Description is empty. Aborting...")
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002958 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002959 if len(change_ids) > 1:
2960 DieWithError('too many Change-Id footers, at most 1 allowed.')
2961 if not change_ids:
2962 # Generate the Change-Id automatically.
Andrii Shyshkalov8c90d032017-04-19 21:27:26 +02002963 change_desc.set_description(git_footers.add_footer_change_id(
2964 change_desc.description,
2965 GenerateGerritChangeId(change_desc.description)))
2966 change_ids = git_footers.get_footer_change_id(change_desc.description)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002967 assert len(change_ids) == 1
2968 change_id = change_ids[0]
2969
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002970 if options.reviewers or options.tbrs or options.add_owners_to:
2971 change_desc.update_reviewers(options.reviewers, options.tbrs,
2972 options.add_owners_to, change)
2973
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002974 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002975 parent = self._ComputeParent(remote, upstream_branch, custom_cl_base,
2976 options.force, change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002977 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2978 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002979 '-m', change_desc.description]).strip()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002980 else:
2981 change_desc = ChangeDescription(
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002982 options.message or CreateDescriptionFromLog(git_diff_args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002983 if not change_desc.description:
2984 DieWithError("Description is empty. Aborting...")
2985
2986 if not git_footers.get_footer_change_id(change_desc.description):
2987 DownloadGerritHook(False)
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002988 change_desc.set_description(
2989 self._AddChangeIdToCommitMessage(options, git_diff_args))
Robert Iannuccidb02dd02017-04-19 12:18:20 -07002990 if options.reviewers or options.tbrs or options.add_owners_to:
2991 change_desc.update_reviewers(options.reviewers, options.tbrs,
2992 options.add_owners_to, change)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002993 ref_to_push = 'HEAD'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02002994 # For no-squash mode, we assume the remote called "origin" is the one we
2995 # want. It is not worthwhile to support different workflows for
2996 # no-squash mode.
2997 parent = 'origin/%s' % branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002998 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2999
3000 assert change_desc
3001 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
3002 ref_to_push)]).splitlines()
3003 if len(commits) > 1:
3004 print('WARNING: This will upload %d commits. Run the following command '
3005 'to see which commits will be uploaded: ' % len(commits))
3006 print('git log %s..%s' % (parent, ref_to_push))
3007 print('You can also use `git squash-branch` to squash these into a '
3008 'single commit.')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003009 confirm_or_exit(action='upload')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003010
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003011 if options.reviewers or options.tbrs or options.add_owners_to:
3012 change_desc.update_reviewers(options.reviewers, options.tbrs,
3013 options.add_owners_to, change)
3014
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003015 # Extra options that can be specified at push time. Doc:
3016 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003017 refspec_opts = []
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003018
Aaron Gable70f4e242017-06-26 10:45:59 -07003019 if not options.send_mail:
3020 refspec_opts.append('wip')
3021
Andrii Shyshkalov2d8a2072017-04-10 15:02:18 +02003022 # TODO(tandrii): options.message should be posted as a comment
3023 # if --send-email is set on non-initial upload as Rietveld used to do it.
3024
Aaron Gable9b713dd2016-12-14 16:04:21 -08003025 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003026 if not re.match(r'^[\w ]+$', title):
3027 title = re.sub(r'[^\w ]', '', title)
3028 if not automatic_title:
3029 print('WARNING: Patchset title may only contain alphanumeric chars '
3030 'and spaces. You can edit it in the UI. '
3031 'See https://crbug.com/663787.\n'
3032 'Cleaned up title: %s' % title)
3033 # Per doc, spaces must be converted to underscores, and Gerrit will do the
3034 # reverse on its side.
3035 refspec_opts.append('m=' + title.replace(' ', '_'))
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00003036
agablec6787972016-09-09 16:13:34 -07003037 if options.private:
Aaron Gableb02daf02017-05-23 11:53:46 -07003038 refspec_opts.append('private')
agablec6787972016-09-09 16:13:34 -07003039
rmistry9eadede2016-09-19 11:22:43 -07003040 if options.topic:
3041 # Documentation on Gerrit topics is here:
3042 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003043 refspec_opts.append('topic=%s' % options.topic)
rmistry9eadede2016-09-19 11:22:43 -07003044
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003045 refspec_suffix = ''
3046 if refspec_opts:
3047 refspec_suffix = '%' + ','.join(refspec_opts)
3048 assert ' ' not in refspec_suffix, (
3049 'spaces not allowed in refspec: "%s"' % refspec_suffix)
3050 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
3051
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003052 try:
3053 push_stdout = gclient_utils.CheckCallAndFilter(
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00003054 ['git', 'push', self.GetRemoteUrl(), refspec],
3055 print_stdout=True,
Andrii Shyshkalov7d518832016-12-15 20:48:21 +01003056 # Flush after every line: useful for seeing progress when running as
3057 # recipe.
3058 filter_fn=lambda _: sys.stdout.flush())
3059 except subprocess2.CalledProcessError:
3060 DieWithError('Failed to create a change. Please examine output above '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003061 'for the reason of the failure.\n'
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003062 'Hint: run command below to diagnose common Git/Gerrit '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02003063 'credential problems:\n'
3064 ' git cl creds-check\n',
3065 change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003066
3067 if options.squash:
3068 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
3069 change_numbers = [m.group(1)
3070 for m in map(regex.match, push_stdout.splitlines())
3071 if m]
3072 if len(change_numbers) != 1:
3073 DieWithError(
3074 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
Christopher Lamf732cd52017-01-24 12:40:11 +11003075 'Change-Id: %s') % (len(change_numbers), change_id), change_desc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003076 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07003077 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07003078
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003079 reviewers = sorted(change_desc.get_reviewers())
3080
tandrii88189772016-09-29 04:29:57 -07003081 # Add cc's from the CC_LIST and --cc flag (if any).
Aaron Gabled1052492017-05-15 15:05:34 -07003082 if not options.private:
3083 cc = self.GetCCList().split(',')
3084 else:
3085 cc = []
tandrii88189772016-09-29 04:29:57 -07003086 if options.cc:
3087 cc.extend(options.cc)
3088 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07003089 if change_desc.get_cced():
3090 cc.extend(change_desc.get_cced())
Aaron Gable6dadfbf2017-05-09 14:27:58 -07003091
3092 gerrit_util.AddReviewers(
3093 self._GetGerritHost(), self.GetIssue(), reviewers, cc,
3094 notify=bool(options.send_mail))
3095
Aaron Gablefd238082017-06-07 13:42:34 -07003096 if change_desc.get_reviewers(tbr_only=True):
3097 print('Adding self-LGTM (Code-Review +1) because of TBRs.')
3098 gerrit_util.SetReview(
3099 self._GetGerritHost(), self.GetIssue(),
Aaron Gable75e78722017-06-09 10:40:16 -07003100 labels={'Code-Review': 1}, notify=bool(options.send_mail))
Aaron Gablefd238082017-06-07 13:42:34 -07003101
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003102 return 0
3103
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003104 def _ComputeParent(self, remote, upstream_branch, custom_cl_base, force,
3105 change_desc):
3106 """Computes parent of the generated commit to be uploaded to Gerrit.
3107
3108 Returns revision or a ref name.
3109 """
3110 if custom_cl_base:
3111 # Try to avoid creating additional unintended CLs when uploading, unless
3112 # user wants to take this risk.
3113 local_ref_of_target_remote = self.GetRemoteBranch()[1]
3114 code, _ = RunGitWithCode(['merge-base', '--is-ancestor', custom_cl_base,
3115 local_ref_of_target_remote])
3116 if code == 1:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003117 print('\nWARNING: Manually specified base of this CL `%s` '
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003118 'doesn\'t seem to belong to target remote branch `%s`.\n\n'
3119 'If you proceed with upload, more than 1 CL may be created by '
3120 'Gerrit as a result, in turn confusing or crashing git cl.\n\n'
3121 'If you are certain that specified base `%s` has already been '
3122 'uploaded to Gerrit as another CL, you may proceed.\n' %
3123 (custom_cl_base, local_ref_of_target_remote, custom_cl_base))
3124 if not force:
3125 confirm_or_exit(
3126 'Do you take responsibility for cleaning up potential mess '
3127 'resulting from proceeding with upload?',
3128 action='upload')
3129 return custom_cl_base
3130
Aaron Gablef97e33d2017-03-30 15:44:27 -07003131 if remote != '.':
3132 return self.GetCommonAncestorWithUpstream()
3133
3134 # If our upstream branch is local, we base our squashed commit on its
3135 # squashed version.
3136 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
3137
Aaron Gablef97e33d2017-03-30 15:44:27 -07003138 if upstream_branch_name == 'master':
Aaron Gable0bbd1c22017-05-08 14:37:08 -07003139 return self.GetCommonAncestorWithUpstream()
Aaron Gablef97e33d2017-03-30 15:44:27 -07003140
3141 # Check the squashed hash of the parent.
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02003142 # TODO(tandrii): consider checking parent change in Gerrit and using its
3143 # hash if tree hash of latest parent revision (patchset) in Gerrit matches
3144 # the tree hash of the parent branch. The upside is less likely bogus
3145 # requests to reupload parent change just because it's uploadhash is
3146 # missing, yet the downside likely exists, too (albeit unknown to me yet).
Aaron Gablef97e33d2017-03-30 15:44:27 -07003147 parent = RunGit(['config',
3148 'branch.%s.gerritsquashhash' % upstream_branch_name],
3149 error_ok=True).strip()
3150 # Verify that the upstream branch has been uploaded too, otherwise
3151 # Gerrit will create additional CLs when uploading.
3152 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
3153 RunGitSilent(['rev-parse', parent + ':'])):
3154 DieWithError(
3155 '\nUpload upstream branch %s first.\n'
3156 'It is likely that this branch has been rebased since its last '
3157 'upload, so you just need to upload it again.\n'
3158 '(If you uploaded it with --no-squash, then branch dependencies '
3159 'are not supported, and you should reupload with --squash.)'
3160 % upstream_branch_name,
3161 change_desc)
3162 return parent
3163
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003164 def _AddChangeIdToCommitMessage(self, options, args):
3165 """Re-commits using the current message, assumes the commit hook is in
3166 place.
3167 """
3168 log_desc = options.message or CreateDescriptionFromLog(args)
3169 git_command = ['commit', '--amend', '-m', log_desc]
3170 RunGit(git_command)
3171 new_log_desc = CreateDescriptionFromLog(args)
3172 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07003173 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003174 return new_log_desc
3175 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00003176 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00003177
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003178 def SetCQState(self, new_state):
3179 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003180 vote_map = {
3181 _CQState.NONE: 0,
3182 _CQState.DRY_RUN: 1,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003183 _CQState.COMMIT: 2,
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003184 }
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003185 kwargs = {'labels': {'Commit-Queue': vote_map[new_state]}}
3186 if new_state == _CQState.DRY_RUN:
3187 # Don't spam everybody reviewer/owner.
Aaron Gable75e78722017-06-09 10:40:16 -07003188 kwargs['notify'] = False
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01003189 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(), **kwargs)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00003190
tandriie113dfd2016-10-11 10:20:12 -07003191 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07003192 try:
3193 data = self._GetChangeDetail()
Aaron Gablea45ee112016-11-22 15:14:38 -08003194 except GerritChangeNotExists:
3195 return 'Gerrit doesn\'t know about your change %s' % self.GetIssue()
tandrii8c5a3532016-11-04 07:52:02 -07003196
3197 if data['status'] in ('ABANDONED', 'MERGED'):
3198 return 'CL %s is closed' % self.GetIssue()
3199
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003200 def GetTryJobProperties(self, patchset=None):
3201 """Returns dictionary of properties to launch try job."""
tandrii8c5a3532016-11-04 07:52:02 -07003202 data = self._GetChangeDetail(['ALL_REVISIONS'])
3203 patchset = int(patchset or self.GetPatchset())
3204 assert patchset
3205 revision_data = None # Pylint wants it to be defined.
3206 for revision_data in data['revisions'].itervalues():
3207 if int(revision_data['_number']) == patchset:
3208 break
3209 else:
Aaron Gablea45ee112016-11-22 15:14:38 -08003210 raise Exception('Patchset %d is not known in Gerrit change %d' %
tandrii8c5a3532016-11-04 07:52:02 -07003211 (patchset, self.GetIssue()))
3212 return {
3213 'patch_issue': self.GetIssue(),
3214 'patch_set': patchset or self.GetPatchset(),
3215 'patch_project': data['project'],
3216 'patch_storage': 'gerrit',
3217 'patch_ref': revision_data['fetch']['http']['ref'],
3218 'patch_repository_url': revision_data['fetch']['http']['url'],
3219 'patch_gerrit_url': self.GetCodereviewServer(),
3220 }
tandriie113dfd2016-10-11 10:20:12 -07003221
tandriide281ae2016-10-12 06:02:30 -07003222 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07003223 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07003224
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003225
3226_CODEREVIEW_IMPLEMENTATIONS = {
3227 'rietveld': _RietveldChangelistImpl,
3228 'gerrit': _GerritChangelistImpl,
3229}
3230
tandrii@chromium.org013a2802016-03-29 09:52:33 +00003231
iannuccie53c9352016-08-17 14:40:40 -07003232def _add_codereview_issue_select_options(parser, extra=""):
3233 _add_codereview_select_options(parser)
3234
3235 text = ('Operate on this issue number instead of the current branch\'s '
3236 'implicit issue.')
3237 if extra:
3238 text += ' '+extra
3239 parser.add_option('-i', '--issue', type=int, help=text)
3240
3241
3242def _process_codereview_issue_select_options(parser, options):
3243 _process_codereview_select_options(parser, options)
3244 if options.issue is not None and not options.forced_codereview:
3245 parser.error('--issue must be specified with either --rietveld or --gerrit')
3246
3247
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003248def _add_codereview_select_options(parser):
3249 """Appends --gerrit and --rietveld options to force specific codereview."""
3250 parser.codereview_group = optparse.OptionGroup(
3251 parser, 'EXPERIMENTAL! Codereview override options')
3252 parser.add_option_group(parser.codereview_group)
3253 parser.codereview_group.add_option(
3254 '--gerrit', action='store_true',
3255 help='Force the use of Gerrit for codereview')
3256 parser.codereview_group.add_option(
3257 '--rietveld', action='store_true',
3258 help='Force the use of Rietveld for codereview')
3259
3260
3261def _process_codereview_select_options(parser, options):
3262 if options.gerrit and options.rietveld:
3263 parser.error('Options --gerrit and --rietveld are mutually exclusive')
3264 options.forced_codereview = None
3265 if options.gerrit:
3266 options.forced_codereview = 'gerrit'
3267 elif options.rietveld:
3268 options.forced_codereview = 'rietveld'
3269
3270
tandriif9aefb72016-07-01 09:06:51 -07003271def _get_bug_line_values(default_project, bugs):
3272 """Given default_project and comma separated list of bugs, yields bug line
3273 values.
3274
3275 Each bug can be either:
3276 * a number, which is combined with default_project
3277 * string, which is left as is.
3278
3279 This function may produce more than one line, because bugdroid expects one
3280 project per line.
3281
3282 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
3283 ['v8:123', 'chromium:789']
3284 """
3285 default_bugs = []
3286 others = []
3287 for bug in bugs.split(','):
3288 bug = bug.strip()
3289 if bug:
3290 try:
3291 default_bugs.append(int(bug))
3292 except ValueError:
3293 others.append(bug)
3294
3295 if default_bugs:
3296 default_bugs = ','.join(map(str, default_bugs))
3297 if default_project:
3298 yield '%s:%s' % (default_project, default_bugs)
3299 else:
3300 yield default_bugs
3301 for other in sorted(others):
3302 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
3303 yield other
3304
3305
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003306class ChangeDescription(object):
3307 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00003308 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07003309 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
Aaron Gable3a16ed12017-03-23 10:51:55 -07003310 BUG_LINE = r'^[ \t]*(?:(BUG)[ \t]*=|Bug:)[ \t]*(.*?)[ \t]*$'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003311 CHERRY_PICK_LINE = r'^\(cherry picked from commit [a-fA-F0-9]{40}\)$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003312
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003313 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00003314 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003315
agable@chromium.org42c20792013-09-12 17:34:49 +00003316 @property # www.logilab.org/ticket/89786
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08003317 def description(self): # pylint: disable=method-hidden
agable@chromium.org42c20792013-09-12 17:34:49 +00003318 return '\n'.join(self._description_lines)
3319
3320 def set_description(self, desc):
3321 if isinstance(desc, basestring):
3322 lines = desc.splitlines()
3323 else:
3324 lines = [line.rstrip() for line in desc]
3325 while lines and not lines[0]:
3326 lines.pop(0)
3327 while lines and not lines[-1]:
3328 lines.pop(-1)
3329 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003330
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003331 def update_reviewers(self, reviewers, tbrs, add_owners_to=None, change=None):
3332 """Rewrites the R=/TBR= line(s) as a single line each.
3333
3334 Args:
3335 reviewers (list(str)) - list of additional emails to use for reviewers.
3336 tbrs (list(str)) - list of additional emails to use for TBRs.
3337 add_owners_to (None|'R'|'TBR') - Pass to do an OWNERS lookup for files in
3338 the change that are missing OWNER coverage. If this is not None, you
3339 must also pass a value for `change`.
3340 change (Change) - The Change that should be used for OWNERS lookups.
3341 """
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003342 assert isinstance(reviewers, list), reviewers
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003343 assert isinstance(tbrs, list), tbrs
3344
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003345 assert add_owners_to in (None, 'TBR', 'R'), add_owners_to
Robert Iannuccia28592e2017-04-18 13:14:49 -07003346 assert not add_owners_to or change, add_owners_to
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003347
3348 if not reviewers and not tbrs and not add_owners_to:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003349 return
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003350
3351 reviewers = set(reviewers)
3352 tbrs = set(tbrs)
3353 LOOKUP = {
3354 'TBR': tbrs,
3355 'R': reviewers,
3356 }
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003357
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003358 # Get the set of R= and TBR= lines and remove them from the description.
agable@chromium.org42c20792013-09-12 17:34:49 +00003359 regexp = re.compile(self.R_LINE)
3360 matches = [regexp.match(line) for line in self._description_lines]
3361 new_desc = [l for i, l in enumerate(self._description_lines)
3362 if not matches[i]]
3363 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003364
agable@chromium.org42c20792013-09-12 17:34:49 +00003365 # Construct new unified R= and TBR= lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003366
3367 # First, update tbrs/reviewers with names from the R=/TBR= lines (if any).
agable@chromium.org42c20792013-09-12 17:34:49 +00003368 for match in matches:
3369 if not match:
3370 continue
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003371 LOOKUP[match.group(1)].update(cleanup_list([match.group(2).strip()]))
3372
3373 # Next, maybe fill in OWNERS coverage gaps to either tbrs/reviewers.
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003374 if add_owners_to:
piman@chromium.org336f9122014-09-04 02:16:55 +00003375 owners_db = owners.Database(change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02003376 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003377 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
Robert Iannucci100aa212017-04-18 17:28:26 -07003378 (tbrs | reviewers))
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003379 LOOKUP[add_owners_to].update(
3380 owners_db.reviewers_for(missing_files, change.author_email))
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003381
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003382 # If any folks ended up in both groups, remove them from tbrs.
3383 tbrs -= reviewers
Robert Iannuccif2708bd2017-04-17 15:49:02 -07003384
Robert Iannucci6c98dc62017-04-18 11:38:00 -07003385 new_r_line = 'R=' + ', '.join(sorted(reviewers)) if reviewers else None
3386 new_tbr_line = 'TBR=' + ', '.join(sorted(tbrs)) if tbrs else None
agable@chromium.org42c20792013-09-12 17:34:49 +00003387
3388 # Put the new lines in the description where the old first R= line was.
3389 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3390 if 0 <= line_loc < len(self._description_lines):
3391 if new_tbr_line:
3392 self._description_lines.insert(line_loc, new_tbr_line)
3393 if new_r_line:
3394 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003395 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003396 if new_r_line:
3397 self.append_footer(new_r_line)
3398 if new_tbr_line:
3399 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003400
Aaron Gable3a16ed12017-03-23 10:51:55 -07003401 def prompt(self, bug=None, git_footer=True):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003402 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003403 self.set_description([
3404 '# Enter a description of the change.',
3405 '# This will be displayed on the codereview site.',
3406 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003407 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003408 '--------------------',
3409 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003410
agable@chromium.org42c20792013-09-12 17:34:49 +00003411 regexp = re.compile(self.BUG_LINE)
3412 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003413 prefix = settings.GetBugPrefix()
3414 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
Aaron Gable3a16ed12017-03-23 10:51:55 -07003415 if git_footer:
3416 self.append_footer('Bug: %s' % ', '.join(values))
3417 else:
3418 for value in values:
3419 self.append_footer('BUG=%s' % value)
tandriif9aefb72016-07-01 09:06:51 -07003420
agable@chromium.org42c20792013-09-12 17:34:49 +00003421 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003422 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003423 if not content:
3424 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003425 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003426
3427 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003428 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3429 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003430 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003431 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003432
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003433 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003434 """Adds a footer line to the description.
3435
3436 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3437 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3438 that Gerrit footers are always at the end.
3439 """
3440 parsed_footer_line = git_footers.parse_footer(line)
3441 if parsed_footer_line:
3442 # Line is a gerrit footer in the form: Footer-Key: any value.
3443 # Thus, must be appended observing Gerrit footer rules.
3444 self.set_description(
3445 git_footers.add_footer(self.description,
3446 key=parsed_footer_line[0],
3447 value=parsed_footer_line[1]))
3448 return
3449
3450 if not self._description_lines:
3451 self._description_lines.append(line)
3452 return
3453
3454 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3455 if gerrit_footers:
3456 # git_footers.split_footers ensures that there is an empty line before
3457 # actual (gerrit) footers, if any. We have to keep it that way.
3458 assert top_lines and top_lines[-1] == ''
3459 top_lines, separator = top_lines[:-1], top_lines[-1:]
3460 else:
3461 separator = [] # No need for separator if there are no gerrit_footers.
3462
3463 prev_line = top_lines[-1] if top_lines else ''
3464 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3465 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3466 top_lines.append('')
3467 top_lines.append(line)
3468 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003469
tandrii99a72f22016-08-17 14:33:24 -07003470 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003471 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003472 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003473 reviewers = [match.group(2).strip()
3474 for match in matches
3475 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003476 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003477
bradnelsond975b302016-10-23 12:20:23 -07003478 def get_cced(self):
3479 """Retrieves the list of reviewers."""
3480 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3481 cced = [match.group(2).strip() for match in matches if match]
3482 return cleanup_list(cced)
3483
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003484 def update_with_git_number_footers(self, parent_hash, parent_msg, dest_ref):
3485 """Updates this commit description given the parent.
3486
3487 This is essentially what Gnumbd used to do.
3488 Consult https://goo.gl/WMmpDe for more details.
3489 """
3490 assert parent_msg # No, orphan branch creation isn't supported.
3491 assert parent_hash
3492 assert dest_ref
3493 parent_footer_map = git_footers.parse_footers(parent_msg)
3494 # This will also happily parse svn-position, which GnumbD is no longer
3495 # supporting. While we'd generate correct footers, the verifier plugin
3496 # installed in Gerrit will block such commit (ie git push below will fail).
3497 parent_position = git_footers.get_position(parent_footer_map)
3498
3499 # Cherry-picks may have last line obscuring their prior footers,
3500 # from git_footers perspective. This is also what Gnumbd did.
3501 cp_line = None
3502 if (self._description_lines and
3503 re.match(self.CHERRY_PICK_LINE, self._description_lines[-1])):
3504 cp_line = self._description_lines.pop()
3505
3506 top_lines, _, parsed_footers = git_footers.split_footers(self.description)
3507
3508 # Original-ify all Cr- footers, to avoid re-lands, cherry-picks, or just
3509 # user interference with actual footers we'd insert below.
3510 for i, (k, v) in enumerate(parsed_footers):
3511 if k.startswith('Cr-'):
3512 parsed_footers[i] = (k.replace('Cr-', 'Cr-Original-'), v)
3513
3514 # Add Position and Lineage footers based on the parent.
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +01003515 lineage = list(reversed(parent_footer_map.get('Cr-Branched-From', [])))
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01003516 if parent_position[0] == dest_ref:
3517 # Same branch as parent.
3518 number = int(parent_position[1]) + 1
3519 else:
3520 number = 1 # New branch, and extra lineage.
3521 lineage.insert(0, '%s-%s@{#%d}' % (parent_hash, parent_position[0],
3522 int(parent_position[1])))
3523
3524 parsed_footers.append(('Cr-Commit-Position',
3525 '%s@{#%d}' % (dest_ref, number)))
3526 parsed_footers.extend(('Cr-Branched-From', v) for v in lineage)
3527
3528 self._description_lines = top_lines
3529 if cp_line:
3530 self._description_lines.append(cp_line)
3531 if self._description_lines[-1] != '':
3532 self._description_lines.append('') # Ensure footer separator.
3533 self._description_lines.extend('%s: %s' % kv for kv in parsed_footers)
3534
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003535
Aaron Gablea1bab272017-04-11 16:38:18 -07003536def get_approving_reviewers(props, disapproval=False):
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003537 """Retrieves the reviewers that approved a CL from the issue properties with
3538 messages.
3539
3540 Note that the list may contain reviewers that are not committer, thus are not
3541 considered by the CQ.
Aaron Gablea1bab272017-04-11 16:38:18 -07003542
3543 If disapproval is True, instead returns reviewers who 'not lgtm'd the CL.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003544 """
Aaron Gablea1bab272017-04-11 16:38:18 -07003545 approval_type = 'disapproval' if disapproval else 'approval'
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003546 return sorted(
3547 set(
3548 message['sender']
3549 for message in props['messages']
Aaron Gablea1bab272017-04-11 16:38:18 -07003550 if message[approval_type] and message['sender'] in props['reviewers']
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003551 )
3552 )
3553
3554
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003555def FindCodereviewSettingsFile(filename='codereview.settings'):
3556 """Finds the given file starting in the cwd and going up.
3557
3558 Only looks up to the top of the repository unless an
3559 'inherit-review-settings-ok' file exists in the root of the repository.
3560 """
3561 inherit_ok_file = 'inherit-review-settings-ok'
3562 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003563 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003564 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3565 root = '/'
3566 while True:
3567 if filename in os.listdir(cwd):
3568 if os.path.isfile(os.path.join(cwd, filename)):
3569 return open(os.path.join(cwd, filename))
3570 if cwd == root:
3571 break
3572 cwd = os.path.dirname(cwd)
3573
3574
3575def LoadCodereviewSettingsFromFile(fileobj):
3576 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003577 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003578
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003579 def SetProperty(name, setting, unset_error_ok=False):
3580 fullname = 'rietveld.' + name
3581 if setting in keyvals:
3582 RunGit(['config', fullname, keyvals[setting]])
3583 else:
3584 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3585
tandrii48df5812016-10-17 03:55:37 -07003586 if not keyvals.get('GERRIT_HOST', False):
3587 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003588 # Only server setting is required. Other settings can be absent.
3589 # In that case, we ignore errors raised during option deletion attempt.
3590 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003591 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003592 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3593 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003594 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003595 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
3596 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003597 SetProperty('project', 'PROJECT', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003598 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3599 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003600
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003601 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003602 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003603
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003604 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003605 RunGit(['config', 'gerrit.squash-uploads',
3606 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003607
tandrii@chromium.org28253532016-04-14 13:46:56 +00003608 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003609 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003610 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003612 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003613 # should be of the form
3614 # PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3615 # ORIGIN_URL_CONFIG: http://src.chromium.org/git
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003616 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3617 keyvals['ORIGIN_URL_CONFIG']])
3618
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003619
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003620def urlretrieve(source, destination):
3621 """urllib is broken for SSL connections via a proxy therefore we
3622 can't use urllib.urlretrieve()."""
3623 with open(destination, 'w') as f:
3624 f.write(urllib2.urlopen(source).read())
3625
3626
ukai@chromium.org712d6102013-11-27 00:52:58 +00003627def hasSheBang(fname):
3628 """Checks fname is a #! script."""
3629 with open(fname) as f:
3630 return f.read(2).startswith('#!')
3631
3632
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003633# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3634def DownloadHooks(*args, **kwargs):
3635 pass
3636
3637
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003638def DownloadGerritHook(force):
3639 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003640
3641 Args:
3642 force: True to update hooks. False to install hooks if not present.
3643 """
3644 if not settings.GetIsGerrit():
3645 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003646 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003647 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3648 if not os.access(dst, os.X_OK):
3649 if os.path.exists(dst):
3650 if not force:
3651 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003652 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003653 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003654 if not hasSheBang(dst):
3655 DieWithError('Not a script: %s\n'
3656 'You need to download from\n%s\n'
3657 'into .git/hooks/commit-msg and '
3658 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003659 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3660 except Exception:
3661 if os.path.exists(dst):
3662 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003663 DieWithError('\nFailed to download hooks.\n'
3664 'You need to download from\n%s\n'
3665 'into .git/hooks/commit-msg and '
3666 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003667
3668
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003669def GetRietveldCodereviewSettingsInteractively():
3670 """Prompt the user for settings."""
3671 server = settings.GetDefaultServerUrl(error_ok=True)
3672 prompt = 'Rietveld server (host[:port])'
3673 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3674 newserver = ask_for_data(prompt + ':')
3675 if not server and not newserver:
3676 newserver = DEFAULT_SERVER
3677 if newserver:
3678 newserver = gclient_utils.UpgradeToHttps(newserver)
3679 if newserver != server:
3680 RunGit(['config', 'rietveld.server', newserver])
3681
3682 def SetProperty(initial, caption, name, is_url):
3683 prompt = caption
3684 if initial:
3685 prompt += ' ("x" to clear) [%s]' % initial
3686 new_val = ask_for_data(prompt + ':')
3687 if new_val == 'x':
3688 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3689 elif new_val:
3690 if is_url:
3691 new_val = gclient_utils.UpgradeToHttps(new_val)
3692 if new_val != initial:
3693 RunGit(['config', 'rietveld.' + name, new_val])
3694
3695 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3696 SetProperty(settings.GetDefaultPrivateFlag(),
3697 'Private flag (rietveld only)', 'private', False)
3698 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3699 'tree-status-url', False)
3700 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3701 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3702 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3703 'run-post-upload-hook', False)
3704
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003705
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003706class _GitCookiesChecker(object):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003707 """Provides facilities for validating and suggesting fixes to .gitcookies."""
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003708
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003709 _GOOGLESOURCE = 'googlesource.com'
3710
3711 def __init__(self):
3712 # Cached list of [host, identity, source], where source is either
3713 # .gitcookies or .netrc.
3714 self._all_hosts = None
3715
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003716 def ensure_configured_gitcookies(self):
3717 """Runs checks and suggests fixes to make git use .gitcookies from default
3718 path."""
3719 default = gerrit_util.CookiesAuthenticator.get_gitcookies_path()
3720 configured_path = RunGitSilent(
3721 ['config', '--global', 'http.cookiefile']).strip()
Andrii Shyshkalov1e250cd2017-05-10 15:39:31 +02003722 configured_path = os.path.expanduser(configured_path)
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003723 if configured_path:
3724 self._ensure_default_gitcookies_path(configured_path, default)
3725 else:
3726 self._configure_gitcookies_path(default)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003727
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003728 @staticmethod
3729 def _ensure_default_gitcookies_path(configured_path, default_path):
3730 assert configured_path
3731 if configured_path == default_path:
3732 print('git is already configured to use your .gitcookies from %s' %
3733 configured_path)
3734 return
3735
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003736 print('WARNING: You have configured custom path to .gitcookies: %s\n'
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003737 'Gerrit and other depot_tools expect .gitcookies at %s\n' %
3738 (configured_path, default_path))
3739
3740 if not os.path.exists(configured_path):
3741 print('However, your configured .gitcookies file is missing.')
3742 confirm_or_exit('Reconfigure git to use default .gitcookies?',
3743 action='reconfigure')
3744 RunGit(['config', '--global', 'http.cookiefile', default_path])
3745 return
3746
3747 if os.path.exists(default_path):
3748 print('WARNING: default .gitcookies file already exists %s' %
3749 default_path)
3750 DieWithError('Please delete %s manually and re-run git cl creds-check' %
3751 default_path)
3752
3753 confirm_or_exit('Move existing .gitcookies to default location?',
3754 action='move')
3755 shutil.move(configured_path, default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003756 RunGit(['config', '--global', 'http.cookiefile', default_path])
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003757 print('Moved and reconfigured git to use .gitcookies from %s' %
3758 default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003759
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003760 @staticmethod
3761 def _configure_gitcookies_path(default_path):
3762 netrc_path = gerrit_util.CookiesAuthenticator.get_netrc_path()
3763 if os.path.exists(netrc_path):
3764 print('You seem to be using outdated .netrc for git credentials: %s' %
3765 netrc_path)
3766 print('This tool will guide you through setting up recommended '
3767 '.gitcookies store for git credentials.\n'
3768 '\n'
3769 'IMPORTANT: If something goes wrong and you decide to go back, do:\n'
3770 ' git config --global --unset http.cookiefile\n'
3771 ' mv %s %s.backup\n\n' % (default_path, default_path))
3772 confirm_or_exit(action='setup .gitcookies')
3773 RunGit(['config', '--global', 'http.cookiefile', default_path])
3774 print('Configured git to use .gitcookies from %s' % default_path)
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003775
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003776 def get_hosts_with_creds(self, include_netrc=False):
3777 if self._all_hosts is None:
3778 a = gerrit_util.CookiesAuthenticator()
3779 self._all_hosts = [
3780 (h, u, s)
3781 for h, u, s in itertools.chain(
3782 ((h, u, '.netrc') for h, (u, _, _) in a.netrc.hosts.iteritems()),
3783 ((h, u, '.gitcookies') for h, (u, _) in a.gitcookies.iteritems())
3784 )
3785 if h.endswith(self._GOOGLESOURCE)
3786 ]
3787
3788 if include_netrc:
3789 return self._all_hosts
3790 return [(h, u, s) for h, u, s in self._all_hosts if s != '.netrc']
3791
3792 def print_current_creds(self, include_netrc=False):
3793 hosts = sorted(self.get_hosts_with_creds(include_netrc=include_netrc))
3794 if not hosts:
3795 print('No Git/Gerrit credentials found')
3796 return
3797 lengths = [max(map(len, (row[i] for row in hosts))) for i in xrange(3)]
3798 header = [('Host', 'User', 'Which file'),
3799 ['=' * l for l in lengths]]
3800 for row in (header + hosts):
3801 print('\t'.join((('%%+%ds' % l) % s)
3802 for l, s in zip(lengths, row)))
3803
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003804 @staticmethod
3805 def _parse_identity(identity):
3806 """Parses identity "git-<ldap>.example.com" into <ldap> and domain."""
3807 username, domain = identity.split('.', 1)
3808 if username.startswith('git-'):
3809 username = username[len('git-'):]
3810 return username, domain
3811
3812 def _get_usernames_of_domain(self, domain):
3813 """Returns list of usernames referenced by .gitcookies in a given domain."""
3814 identities_by_domain = {}
3815 for _, identity, _ in self.get_hosts_with_creds():
3816 username, domain = self._parse_identity(identity)
3817 identities_by_domain.setdefault(domain, []).append(username)
3818 return identities_by_domain.get(domain)
3819
3820 def _canonical_git_googlesource_host(self, host):
3821 """Normalizes Gerrit hosts (with '-review') to Git host."""
3822 assert host.endswith(self._GOOGLESOURCE)
3823 # Prefix doesn't include '.' at the end.
3824 prefix = host[:-(1 + len(self._GOOGLESOURCE))]
3825 if prefix.endswith('-review'):
3826 prefix = prefix[:-len('-review')]
3827 return prefix + '.' + self._GOOGLESOURCE
3828
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003829 def _canonical_gerrit_googlesource_host(self, host):
3830 git_host = self._canonical_git_googlesource_host(host)
3831 prefix = git_host.split('.', 1)[0]
3832 return prefix + '-review.' + self._GOOGLESOURCE
3833
Andrii Shyshkalov97800502017-03-16 16:04:32 +01003834 def has_generic_host(self):
3835 """Returns whether generic .googlesource.com has been configured.
3836
3837 Chrome Infra recommends to use explicit ${host}.googlesource.com instead.
3838 """
3839 for host, _, _ in self.get_hosts_with_creds(include_netrc=False):
3840 if host == '.' + self._GOOGLESOURCE:
3841 return True
3842 return False
3843
3844 def _get_git_gerrit_identity_pairs(self):
3845 """Returns map from canonic host to pair of identities (Git, Gerrit).
3846
3847 One of identities might be None, meaning not configured.
3848 """
3849 host_to_identity_pairs = {}
3850 for host, identity, _ in self.get_hosts_with_creds():
3851 canonical = self._canonical_git_googlesource_host(host)
3852 pair = host_to_identity_pairs.setdefault(canonical, [None, None])
3853 idx = 0 if canonical == host else 1
3854 pair[idx] = identity
3855 return host_to_identity_pairs
3856
3857 def get_partially_configured_hosts(self):
3858 return set(
3859 host for host, identities_pair in
3860 self._get_git_gerrit_identity_pairs().iteritems()
3861 if None in identities_pair and host != '.' + self._GOOGLESOURCE)
3862
3863 def get_conflicting_hosts(self):
3864 return set(
3865 host for host, (i1, i2) in
3866 self._get_git_gerrit_identity_pairs().iteritems()
3867 if None not in (i1, i2) and i1 != i2)
3868
3869 def get_duplicated_hosts(self):
3870 counters = collections.Counter(h for h, _, _ in self.get_hosts_with_creds())
3871 return set(host for host, count in counters.iteritems() if count > 1)
3872
3873 _EXPECTED_HOST_IDENTITY_DOMAINS = {
3874 'chromium.googlesource.com': 'chromium.org',
3875 'chrome-internal.googlesource.com': 'google.com',
3876 }
3877
3878 def get_hosts_with_wrong_identities(self):
3879 """Finds hosts which **likely** reference wrong identities.
3880
3881 Note: skips hosts which have conflicting identities for Git and Gerrit.
3882 """
3883 hosts = set()
3884 for host, expected in self._EXPECTED_HOST_IDENTITY_DOMAINS.iteritems():
3885 pair = self._get_git_gerrit_identity_pairs().get(host)
3886 if pair and pair[0] == pair[1]:
3887 _, domain = self._parse_identity(pair[0])
3888 if domain != expected:
3889 hosts.add(host)
3890 return hosts
3891
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003892 @staticmethod
3893 def print_hosts(hosts, extra_column_func=None):
3894 hosts = sorted(hosts)
3895 assert hosts
3896 if extra_column_func is None:
3897 extras = [''] * len(hosts)
3898 else:
3899 extras = [extra_column_func(host) for host in hosts]
3900 tmpl = ' %%-%ds %%-%ds' % (max(map(len, hosts)), max(map(len, extras)))
3901 for he in zip(hosts, extras):
3902 print(tmpl % he)
3903 print()
3904
3905 def find_and_report_problems(self):
3906 """Returns True if there was at least one problem, else False."""
3907 problems = [False]
3908 def add_problem():
3909 if not problems[0]:
Andrii Shyshkalov4812e612017-03-27 17:22:57 +02003910 print('\n\n.gitcookies problem report:\n')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003911 problems[0] = True
3912
3913 if self.has_generic_host():
3914 add_problem()
3915 print(' .googlesource.com record detected\n'
3916 ' Chrome Infrastructure team recommends to list full host names '
3917 'explicitly.\n')
3918
3919 dups = self.get_duplicated_hosts()
3920 if dups:
3921 add_problem()
3922 print(' The following hosts were defined twice:\n')
3923 self.print_hosts(dups)
3924
3925 partial = self.get_partially_configured_hosts()
3926 if partial:
3927 add_problem()
3928 print(' Credentials should come in pairs for Git and Gerrit hosts. '
3929 'These hosts are missing:')
3930 self.print_hosts(partial)
3931
3932 conflicting = self.get_conflicting_hosts()
3933 if conflicting:
3934 add_problem()
3935 print(' The following Git hosts have differing credentials from their '
3936 'Gerrit counterparts:\n')
3937 self.print_hosts(conflicting, lambda host: '%s vs %s' %
3938 tuple(self._get_git_gerrit_identity_pairs()[host]))
3939
3940 wrong = self.get_hosts_with_wrong_identities()
3941 if wrong:
3942 add_problem()
3943 print(' These hosts likely use wrong identity:\n')
3944 self.print_hosts(wrong, lambda host: '%s but %s recommended' %
3945 (self._get_git_gerrit_identity_pairs()[host][0],
3946 self._EXPECTED_HOST_IDENTITY_DOMAINS[host]))
3947 return problems[0]
3948
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003949
3950def CMDcreds_check(parser, args):
3951 """Checks credentials and suggests changes."""
3952 _, _ = parser.parse_args(args)
3953
3954 if gerrit_util.GceAuthenticator.is_gce():
3955 DieWithError('this command is not designed for GCE, are you on a bot?')
3956
Andrii Shyshkalov517948b2017-03-15 15:51:59 +01003957 checker = _GitCookiesChecker()
3958 checker.ensure_configured_gitcookies()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003959
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003960 print('Your .netrc and .gitcookies have credentials for these hosts:')
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003961 checker.print_current_creds(include_netrc=True)
3962
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003963 if not checker.find_and_report_problems():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003964 print('\nNo problems detected in your .gitcookies file.')
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003965 return 0
3966 return 1
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003967
3968
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003969@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003970def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003971 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003972
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003973 print('WARNING: git cl config works for Rietveld only.')
tandrii5d0a0422016-09-14 06:24:35 -07003974 # TODO(tandrii): remove this once we switch to Gerrit.
3975 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003976 parser.add_option('--activate-update', action='store_true',
3977 help='activate auto-updating [rietveld] section in '
3978 '.git/config')
3979 parser.add_option('--deactivate-update', action='store_true',
3980 help='deactivate auto-updating [rietveld] section in '
3981 '.git/config')
3982 options, args = parser.parse_args(args)
3983
3984 if options.deactivate_update:
3985 RunGit(['config', 'rietveld.autoupdate', 'false'])
3986 return
3987
3988 if options.activate_update:
3989 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3990 return
3991
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003992 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003993 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003994 return 0
3995
3996 url = args[0]
3997 if not url.endswith('codereview.settings'):
3998 url = os.path.join(url, 'codereview.settings')
3999
4000 # Load code review settings and download hooks (if available).
4001 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
4002 return 0
4003
4004
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004005def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004006 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004007 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
4008 branch = ShortBranchName(branchref)
4009 _, args = parser.parse_args(args)
4010 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07004011 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004012 return RunGit(['config', 'branch.%s.base-url' % branch],
4013 error_ok=False).strip()
4014 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004015 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00004016 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
4017 error_ok=False).strip()
4018
4019
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004020def color_for_status(status):
4021 """Maps a Changelist status to color, for CMDstatus and other tools."""
4022 return {
Aaron Gable9ab38c62017-04-06 14:36:33 -07004023 'unsent': Fore.YELLOW,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004024 'waiting': Fore.BLUE,
4025 'reply': Fore.YELLOW,
Aaron Gable9ab38c62017-04-06 14:36:33 -07004026 'not lgtm': Fore.RED,
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004027 'lgtm': Fore.GREEN,
4028 'commit': Fore.MAGENTA,
4029 'closed': Fore.CYAN,
4030 'error': Fore.WHITE,
4031 }.get(status, Fore.WHITE)
4032
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00004033
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004034def get_cl_statuses(changes, fine_grained, max_processes=None):
4035 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004036
4037 If fine_grained is true, this will fetch CL statuses from the server.
4038 Otherwise, simply indicate if there's a matching url for the given branches.
4039
4040 If max_processes is specified, it is used as the maximum number of processes
4041 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
4042 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004043
4044 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004045 """
qyearsley12fa6ff2016-08-24 09:18:40 -07004046 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004047 upload.verbosity = 0
4048
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004049 if not changes:
4050 raise StopIteration()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00004051
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004052 if not fine_grained:
4053 # Fast path which doesn't involve querying codereview servers.
Aaron Gablea1bab272017-04-11 16:38:18 -07004054 # Do not use get_approving_reviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004055 for cl in changes:
4056 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
Andrii Shyshkalov2f8e9242017-01-23 19:20:19 +01004057 return
4058
4059 # First, sort out authentication issues.
4060 logging.debug('ensuring credentials exist')
4061 for cl in changes:
4062 cl.EnsureAuthenticated(force=False, refresh=True)
4063
4064 def fetch(cl):
4065 try:
4066 return (cl, cl.GetStatus())
4067 except:
4068 # See http://crbug.com/629863.
4069 logging.exception('failed to fetch status for %s:', cl)
4070 raise
4071
4072 threads_count = len(changes)
4073 if max_processes:
4074 threads_count = max(1, min(threads_count, max_processes))
4075 logging.debug('querying %d CLs using %d threads', len(changes), threads_count)
4076
4077 pool = ThreadPool(threads_count)
4078 fetched_cls = set()
4079 try:
4080 it = pool.imap_unordered(fetch, changes).__iter__()
4081 while True:
4082 try:
4083 cl, status = it.next(timeout=5)
4084 except multiprocessing.TimeoutError:
4085 break
4086 fetched_cls.add(cl)
4087 yield cl, status
4088 finally:
4089 pool.close()
4090
4091 # Add any branches that failed to fetch.
4092 for cl in set(changes) - fetched_cls:
4093 yield (cl, 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00004094
rmistry@google.com2dd99862015-06-22 12:22:18 +00004095
4096def upload_branch_deps(cl, args):
4097 """Uploads CLs of local branches that are dependents of the current branch.
4098
4099 If the local branch dependency tree looks like:
4100 test1 -> test2.1 -> test3.1
4101 -> test3.2
4102 -> test2.2 -> test3.3
4103
4104 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
4105 run on the dependent branches in this order:
4106 test2.1, test3.1, test3.2, test2.2, test3.3
4107
4108 Note: This function does not rebase your local dependent branches. Use it when
4109 you make a change to the parent branch that will not conflict with its
4110 dependent branches, and you would like their dependencies updated in
4111 Rietveld.
4112 """
4113 if git_common.is_dirty_git_tree('upload-branch-deps'):
4114 return 1
4115
4116 root_branch = cl.GetBranch()
4117 if root_branch is None:
4118 DieWithError('Can\'t find dependent branches from detached HEAD state. '
4119 'Get on a branch!')
Andrii Shyshkalov1090fd52017-01-26 09:37:54 +01004120 if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()):
rmistry@google.com2dd99862015-06-22 12:22:18 +00004121 DieWithError('Current branch does not have an uploaded CL. We cannot set '
4122 'patchset dependencies without an uploaded CL.')
4123
4124 branches = RunGit(['for-each-ref',
4125 '--format=%(refname:short) %(upstream:short)',
4126 'refs/heads'])
4127 if not branches:
4128 print('No local branches found.')
4129 return 0
4130
4131 # Create a dictionary of all local branches to the branches that are dependent
4132 # on it.
4133 tracked_to_dependents = collections.defaultdict(list)
4134 for b in branches.splitlines():
4135 tokens = b.split()
4136 if len(tokens) == 2:
4137 branch_name, tracked = tokens
4138 tracked_to_dependents[tracked].append(branch_name)
4139
vapiera7fbd5a2016-06-16 09:17:49 -07004140 print()
4141 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004142 dependents = []
4143 def traverse_dependents_preorder(branch, padding=''):
4144 dependents_to_process = tracked_to_dependents.get(branch, [])
4145 padding += ' '
4146 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07004147 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00004148 dependents.append(dependent)
4149 traverse_dependents_preorder(dependent, padding)
4150 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07004151 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004152
4153 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004154 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004155 return 0
4156
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01004157 confirm_or_exit('This command will checkout all dependent branches and run '
4158 '"git cl upload".', action='continue')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004159
andybons@chromium.org962f9462016-02-03 20:00:42 +00004160 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00004161 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00004162 args.extend(['-t', 'Updated patchset dependency'])
4163
rmistry@google.com2dd99862015-06-22 12:22:18 +00004164 # Record all dependents that failed to upload.
4165 failures = {}
4166 # Go through all dependents, checkout the branch and upload.
4167 try:
4168 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07004169 print()
4170 print('--------------------------------------')
4171 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004172 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07004173 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004174 try:
4175 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00004177 failures[dependent_branch] = 1
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004178 except: # pylint: disable=bare-except
rmistry@google.com2dd99862015-06-22 12:22:18 +00004179 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07004180 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004181 finally:
4182 # Swap back to the original root branch.
4183 RunGit(['checkout', '-q', root_branch])
4184
vapiera7fbd5a2016-06-16 09:17:49 -07004185 print()
4186 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004187 for dependent_branch in dependents:
4188 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07004189 print(' %s : %s' % (dependent_branch, upload_status))
4190 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00004191
4192 return 0
4193
4194
kmarshall3bff56b2016-06-06 18:31:47 -07004195def CMDarchive(parser, args):
4196 """Archives and deletes branches associated with closed changelists."""
4197 parser.add_option(
4198 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07004199 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07004200 parser.add_option(
4201 '-f', '--force', action='store_true',
4202 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07004203 parser.add_option(
4204 '-d', '--dry-run', action='store_true',
4205 help='Skip the branch tagging and removal steps.')
4206 parser.add_option(
4207 '-t', '--notags', action='store_true',
4208 help='Do not tag archived branches. '
4209 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07004210
4211 auth.add_auth_options(parser)
4212 options, args = parser.parse_args(args)
4213 if args:
4214 parser.error('Unsupported args: %s' % ' '.join(args))
4215 auth_config = auth.extract_auth_config_from_options(options)
4216
4217 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4218 if not branches:
4219 return 0
4220
vapiera7fbd5a2016-06-16 09:17:49 -07004221 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07004222 changes = [Changelist(branchref=b, auth_config=auth_config)
4223 for b in branches.splitlines()]
4224 alignment = max(5, max(len(c.GetBranch()) for c in changes))
4225 statuses = get_cl_statuses(changes,
4226 fine_grained=True,
4227 max_processes=options.maxjobs)
4228 proposal = [(cl.GetBranch(),
4229 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
4230 for cl, status in statuses
4231 if status == 'closed']
4232 proposal.sort()
4233
4234 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07004235 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07004236 return 0
4237
4238 current_branch = GetCurrentBranch()
4239
vapiera7fbd5a2016-06-16 09:17:49 -07004240 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07004241 if options.notags:
4242 for next_item in proposal:
4243 print(' ' + next_item[0])
4244 else:
4245 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
4246 for next_item in proposal:
4247 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07004248
kmarshall9249e012016-08-23 12:02:16 -07004249 # Quit now on precondition failure or if instructed by the user, either
4250 # via an interactive prompt or by command line flags.
4251 if options.dry_run:
4252 print('\nNo changes were made (dry run).\n')
4253 return 0
4254 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07004255 print('You are currently on a branch \'%s\' which is associated with a '
4256 'closed codereview issue, so archive cannot proceed. Please '
4257 'checkout another branch and run this command again.' %
4258 current_branch)
4259 return 1
kmarshall9249e012016-08-23 12:02:16 -07004260 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07004261 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
4262 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07004263 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07004264 return 1
4265
4266 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07004267 if not options.notags:
4268 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07004269 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07004270
vapiera7fbd5a2016-06-16 09:17:49 -07004271 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07004272
4273 return 0
4274
4275
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004276def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004277 """Show status of changelists.
4278
4279 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004280 - Blue waiting for review
Aaron Gable9ab38c62017-04-06 14:36:33 -07004281 - Yellow waiting for you to reply to review, or not yet sent
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004282 - Green LGTM'ed
Aaron Gable9ab38c62017-04-06 14:36:33 -07004283 - Red 'not LGTM'ed
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00004284 - Magenta in the commit queue
4285 - Cyan was committed, branch can be deleted
Aaron Gable9ab38c62017-04-06 14:36:33 -07004286 - White error, or unknown status
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004287
4288 Also see 'git cl comments'.
4289 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004290 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07004291 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004292 parser.add_option('-f', '--fast', action='store_true',
4293 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004294 parser.add_option(
4295 '-j', '--maxjobs', action='store', type=int,
4296 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004297
4298 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004299 _add_codereview_issue_select_options(
4300 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004301 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004302 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004303 if args:
4304 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004305 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004306
iannuccie53c9352016-08-17 14:40:40 -07004307 if options.issue is not None and not options.field:
4308 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07004309
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004310 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07004311 cl = Changelist(auth_config=auth_config, issue=options.issue,
4312 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004313 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07004314 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004315 elif options.field == 'id':
4316 issueid = cl.GetIssue()
4317 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07004318 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004319 elif options.field == 'patch':
4320 patchset = cl.GetPatchset()
4321 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07004322 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07004323 elif options.field == 'status':
4324 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004325 elif options.field == 'url':
4326 url = cl.GetIssueURL()
4327 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07004328 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00004329 return 0
4330
4331 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
4332 if not branches:
4333 print('No local branch found.')
4334 return 0
4335
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004336 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004337 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004338 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07004339 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004340 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004341 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004342 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004343
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004344 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004345 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
4346 for cl in sorted(changes, key=lambda c: c.GetBranch()):
4347 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00004348 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004349 c, status = output.next()
4350 branch_statuses[c.GetBranch()] = status
4351 status = branch_statuses.pop(branch)
4352 url = cl.GetIssueURL()
4353 if url and (not status or status == 'error'):
4354 # The issue probably doesn't exist anymore.
4355 url += ' (broken)'
4356
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004357 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00004358 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004359 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00004360 color = ''
4361 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00004362 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07004363 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00004364 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07004365 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004366
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004367
4368 branch = GetCurrentBranch()
vapiera7fbd5a2016-06-16 09:17:49 -07004369 print()
Andrii Shyshkalovd0e1d9d2017-01-24 17:10:51 +01004370 print('Current branch: %s' % branch)
4371 for cl in changes:
4372 if cl.GetBranch() == branch:
4373 break
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004374 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07004375 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00004376 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07004377 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00004378 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07004379 print('Issue description:')
4380 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004381 return 0
4382
4383
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004384def colorize_CMDstatus_doc():
4385 """To be called once in main() to add colors to git cl status help."""
4386 colors = [i for i in dir(Fore) if i[0].isupper()]
4387
4388 def colorize_line(line):
4389 for color in colors:
4390 if color in line.upper():
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004391 # Extract whitespace first and the leading '-'.
maruel@chromium.org39c0b222013-08-17 16:57:01 +00004392 indent = len(line) - len(line.lstrip(' ')) + 1
4393 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
4394 return line
4395
4396 lines = CMDstatus.__doc__.splitlines()
4397 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
4398
4399
phajdan.jre328cf92016-08-22 04:12:17 -07004400def write_json(path, contents):
Stefan Zager1306bd02017-06-22 19:26:46 -07004401 if path == '-':
4402 json.dump(contents, sys.stdout)
4403 else:
4404 with open(path, 'w') as f:
4405 json.dump(contents, f)
phajdan.jre328cf92016-08-22 04:12:17 -07004406
4407
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004408@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004409def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004410 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004411
4412 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004413 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00004414 parser.add_option('-r', '--reverse', action='store_true',
4415 help='Lookup the branch(es) for the specified issues. If '
4416 'no issues are specified, all branches with mapped '
4417 'issues will be listed.')
Stefan Zager1306bd02017-06-22 19:26:46 -07004418 parser.add_option('--json',
4419 help='Path to JSON output file, or "-" for stdout.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004420 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004421 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004422 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004423
dnj@chromium.org406c4402015-03-03 17:22:28 +00004424 if options.reverse:
4425 branches = RunGit(['for-each-ref', 'refs/heads',
4426 '--format=%(refname:short)']).splitlines()
dnj@chromium.org406c4402015-03-03 17:22:28 +00004427 # Reverse issue lookup.
4428 issue_branch_map = {}
4429 for branch in branches:
4430 cl = Changelist(branchref=branch)
4431 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
4432 if not args:
4433 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07004434 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00004435 for issue in args:
4436 if not issue:
4437 continue
phajdan.jre328cf92016-08-22 04:12:17 -07004438 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07004439 print('Branch for issue number %s: %s' % (
4440 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07004441 if options.json:
4442 write_json(options.json, result)
Aaron Gable78753da2017-06-15 10:35:49 -07004443 return 0
4444
4445 if len(args) > 0:
4446 issue = ParseIssueNumberArgument(args[0], options.forced_codereview)
4447 if not issue.valid:
4448 DieWithError('Pass a url or number to set the issue, 0 to unset it, '
4449 'or no argument to list it.\n'
4450 'Maybe you want to run git cl status?')
4451 cl = Changelist(codereview=issue.codereview)
4452 cl.SetIssue(issue.issue)
dnj@chromium.org406c4402015-03-03 17:22:28 +00004453 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004454 cl = Changelist(codereview=options.forced_codereview)
Aaron Gable78753da2017-06-15 10:35:49 -07004455 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
4456 if options.json:
4457 write_json(options.json, {
4458 'issue': cl.GetIssue(),
4459 'issue_url': cl.GetIssueURL(),
4460 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004461 return 0
4462
4463
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004464def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004465 """Shows or posts review comments for any changelist."""
4466 parser.add_option('-a', '--add-comment', dest='comment',
4467 help='comment to add to an issue')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004468 parser.add_option('-i', '--issue', dest='issue',
4469 help='review issue id (defaults to current issue). '
4470 'If given, requires --rietveld or --gerrit')
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004471 parser.add_option('-m', '--machine-readable', dest='readable',
4472 action='store_false', default=True,
4473 help='output comments in a format compatible with '
4474 'editor parsing')
smut@google.comc85ac942015-09-15 16:34:43 +00004475 parser.add_option('-j', '--json-file',
Stefan Zager1306bd02017-06-22 19:26:46 -07004476 help='File to write JSON summary to, or "-" for stdout')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004477 auth.add_auth_options(parser)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004478 _add_codereview_select_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004479 options, args = parser.parse_args(args)
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004480 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004481 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004482
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004483 issue = None
4484 if options.issue:
4485 try:
4486 issue = int(options.issue)
4487 except ValueError:
4488 DieWithError('A review issue id is expected to be a number')
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01004489 if not options.forced_codereview:
4490 parser.error('--gerrit or --rietveld is required if --issue is specified')
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004491
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004492 cl = Changelist(issue=issue,
Andrii Shyshkalov70909e12017-04-10 14:38:32 +02004493 codereview=options.forced_codereview,
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01004494 auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004495
4496 if options.comment:
4497 cl.AddComment(options.comment)
4498 return 0
4499
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07004500 summary = sorted(cl.GetCommentsSummary(readable=options.readable),
4501 key=lambda c: c.date)
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004502 for comment in summary:
4503 if comment.disapproval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004504 color = Fore.RED
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004505 elif comment.approval:
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004506 color = Fore.GREEN
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004507 elif comment.sender == cl.GetIssueOwner():
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00004508 color = Fore.MAGENTA
4509 else:
4510 color = Fore.BLUE
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004511 print('\n%s%s %s%s\n%s' % (
4512 color,
4513 comment.date.strftime('%Y-%m-%d %H:%M:%S UTC'),
4514 comment.sender,
4515 Fore.RESET,
4516 '\n'.join(' ' + l for l in comment.message.strip().splitlines())))
4517
smut@google.comc85ac942015-09-15 16:34:43 +00004518 if options.json_file:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004519 def pre_serialize(c):
4520 dct = c.__dict__.copy()
4521 dct['date'] = dct['date'].strftime('%Y-%m-%d %H:%M:%S.%f')
4522 return dct
smut@google.comc85ac942015-09-15 16:34:43 +00004523 with open(options.json_file, 'wb') as f:
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01004524 json.dump(map(pre_serialize, summary), f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00004525 return 0
4526
4527
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004528@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004529def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004530 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00004531 parser.add_option('-d', '--display', action='store_true',
4532 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004533 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07004534 help='New description to set for this issue (- for stdin, '
4535 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07004536 parser.add_option('-f', '--force', action='store_true',
4537 help='Delete any unpublished Gerrit edits for this issue '
4538 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004539
4540 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004541 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004542 options, args = parser.parse_args(args)
4543 _process_codereview_select_options(parser, options)
4544
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004545 target_issue_arg = None
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004546 if len(args) > 0:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004547 target_issue_arg = ParseIssueNumberArgument(args[0],
4548 options.forced_codereview)
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004549 if not target_issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02004550 parser.error('invalid codereview url or CL id')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004551
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004552 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00004553
martiniss6eda05f2016-06-30 10:18:35 -07004554 kwargs = {
4555 'auth_config': auth_config,
4556 'codereview': options.forced_codereview,
4557 }
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004558 detected_codereview_from_url = False
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01004559 if target_issue_arg:
4560 kwargs['issue'] = target_issue_arg.issue
4561 kwargs['codereview_host'] = target_issue_arg.hostname
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004562 if target_issue_arg.codereview and not options.forced_codereview:
4563 detected_codereview_from_url = True
4564 kwargs['codereview'] = target_issue_arg.codereview
martiniss6eda05f2016-06-30 10:18:35 -07004565
4566 cl = Changelist(**kwargs)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004567 if not cl.GetIssue():
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004568 assert not detected_codereview_from_url
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004569 DieWithError('This branch has no associated changelist.')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02004570
4571 if detected_codereview_from_url:
4572 logging.info('canonical issue/change URL: %s (type: %s)\n',
4573 cl.GetIssueURL(), target_issue_arg.codereview)
4574
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004575 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004576
smut@google.com34fb6b12015-07-13 20:03:26 +00004577 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07004578 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00004579 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004580
4581 if options.new_description:
4582 text = options.new_description
4583 if text == '-':
4584 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07004585 elif text == '+':
4586 base_branch = cl.GetCommonAncestorWithUpstream()
4587 change = cl.GetChange(base_branch, None, local_description=True)
4588 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004589
4590 description.set_description(text)
4591 else:
Aaron Gable3a16ed12017-03-23 10:51:55 -07004592 description.prompt(git_footer=cl.IsGerrit())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00004593
Andrii Shyshkalov680253d2017-03-15 21:07:36 +01004594 if cl.GetDescription().strip() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07004595 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00004596 return 0
4597
4598
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004599def CreateDescriptionFromLog(args):
4600 """Pulls out the commit log to use as a base for the CL description."""
4601 log_args = []
4602 if len(args) == 1 and not args[0].endswith('.'):
4603 log_args = [args[0] + '..']
4604 elif len(args) == 1 and args[0].endswith('...'):
4605 log_args = [args[0][:-1]]
4606 elif len(args) == 2:
4607 log_args = [args[0] + '..' + args[1]]
4608 else:
4609 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00004610 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004611
4612
thestig@chromium.org44202a22014-03-11 19:22:18 +00004613def CMDlint(parser, args):
4614 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004615 parser.add_option('--filter', action='append', metavar='-x,+y',
4616 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004617 auth.add_auth_options(parser)
4618 options, args = parser.parse_args(args)
4619 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004620
4621 # Access to a protected member _XX of a client class
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -08004622 # pylint: disable=protected-access
thestig@chromium.org44202a22014-03-11 19:22:18 +00004623 try:
4624 import cpplint
4625 import cpplint_chromium
4626 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07004627 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00004628 return 1
4629
4630 # Change the current working directory before calling lint so that it
4631 # shows the correct base.
4632 previous_cwd = os.getcwd()
4633 os.chdir(settings.GetRoot())
4634 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004635 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004636 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
4637 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004638 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07004639 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00004640 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00004641
4642 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00004643 command = args + files
4644 if options.filter:
4645 command = ['--filter=' + ','.join(options.filter)] + command
4646 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004647
4648 white_regex = re.compile(settings.GetLintRegex())
4649 black_regex = re.compile(settings.GetLintIgnoreRegex())
4650 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
4651 for filename in filenames:
4652 if white_regex.match(filename):
4653 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07004654 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004655 else:
4656 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
4657 extra_check_functions)
4658 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004659 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004660 finally:
4661 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07004662 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00004663 if cpplint._cpplint_state.error_count != 0:
4664 return 1
4665 return 0
4666
4667
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004668def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004669 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004670 parser.add_option('-u', '--upload', action='store_true',
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004671 help='Run upload hook instead of the push hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00004672 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00004673 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004674 auth.add_auth_options(parser)
4675 options, args = parser.parse_args(args)
4676 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004677
sbc@chromium.org71437c02015-04-09 19:29:40 +00004678 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004679 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004680 return 1
4681
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004682 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683 if args:
4684 base_branch = args[0]
4685 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004686 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004687 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004688
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004689 cl.RunHook(
4690 committing=not options.upload,
4691 may_prompt=False,
4692 verbose=options.verbose,
4693 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004694 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004695
4696
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004697def GenerateGerritChangeId(message):
4698 """Returns Ixxxxxx...xxx change id.
4699
4700 Works the same way as
4701 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4702 but can be called on demand on all platforms.
4703
4704 The basic idea is to generate git hash of a state of the tree, original commit
4705 message, author/committer info and timestamps.
4706 """
4707 lines = []
4708 tree_hash = RunGitSilent(['write-tree'])
4709 lines.append('tree %s' % tree_hash.strip())
4710 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4711 if code == 0:
4712 lines.append('parent %s' % parent.strip())
4713 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4714 lines.append('author %s' % author.strip())
4715 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4716 lines.append('committer %s' % committer.strip())
4717 lines.append('')
4718 # Note: Gerrit's commit-hook actually cleans message of some lines and
4719 # whitespace. This code is not doing this, but it clearly won't decrease
4720 # entropy.
4721 lines.append(message)
4722 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4723 stdin='\n'.join(lines))
4724 return 'I%s' % change_hash.strip()
4725
4726
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01004727def GetTargetRef(remote, remote_branch, target_branch):
wittman@chromium.org455dc922015-01-26 20:15:50 +00004728 """Computes the remote branch ref to use for the CL.
4729
4730 Args:
4731 remote (str): The git remote for the CL.
4732 remote_branch (str): The git remote branch for the CL.
4733 target_branch (str): The target branch specified by the user.
wittman@chromium.org455dc922015-01-26 20:15:50 +00004734 """
4735 if not (remote and remote_branch):
4736 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004737
wittman@chromium.org455dc922015-01-26 20:15:50 +00004738 if target_branch:
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004739 # Canonicalize branch references to the equivalent local full symbolic
wittman@chromium.org455dc922015-01-26 20:15:50 +00004740 # refs, which are then translated into the remote full symbolic refs
4741 # below.
4742 if '/' not in target_branch:
4743 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4744 else:
4745 prefix_replacements = (
4746 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4747 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4748 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4749 )
4750 match = None
4751 for regex, replacement in prefix_replacements:
4752 match = re.search(regex, target_branch)
4753 if match:
4754 remote_branch = target_branch.replace(match.group(0), replacement)
4755 break
4756 if not match:
4757 # This is a branch path but not one we recognize; use as-is.
4758 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004759 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4760 # Handle the refs that need to land in different refs.
4761 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004762
wittman@chromium.org455dc922015-01-26 20:15:50 +00004763 # Create the true path to the remote branch.
4764 # Does the following translation:
4765 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4766 # * refs/remotes/origin/master -> refs/heads/master
4767 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4768 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4769 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4770 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4771 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4772 'refs/heads/')
4773 elif remote_branch.startswith('refs/remotes/branch-heads'):
4774 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01004775
wittman@chromium.org455dc922015-01-26 20:15:50 +00004776 return remote_branch
4777
4778
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004779def cleanup_list(l):
4780 """Fixes a list so that comma separated items are put as individual items.
4781
4782 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4783 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4784 """
4785 items = sum((i.split(',') for i in l), [])
4786 stripped_items = (i.strip() for i in items)
4787 return sorted(filter(None, stripped_items))
4788
4789
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004790@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004791def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004792 """Uploads the current changelist to codereview.
4793
4794 Can skip dependency patchset uploads for a branch by running:
4795 git config branch.branch_name.skip-deps-uploads True
4796 To unset run:
4797 git config --unset branch.branch_name.skip-deps-uploads
4798 Can also set the above globally by using the --global flag.
4799 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004800 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4801 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004802 parser.add_option('--bypass-watchlists', action='store_true',
4803 dest='bypass_watchlists',
4804 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004805 parser.add_option('-f', action='store_true', dest='force',
4806 help="force yes to questions (don't prompt)")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004807 parser.add_option('--message', '-m', dest='message',
4808 help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004809 parser.add_option('-b', '--bug',
4810 help='pre-populate the bug number(s) for this issue. '
4811 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004812 parser.add_option('--message-file', dest='message_file',
4813 help='file which contains message for patchset')
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004814 parser.add_option('--title', '-t', dest='title',
4815 help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004816 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004817 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004818 help='reviewer email addresses')
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004819 parser.add_option('--tbrs',
4820 action='append', default=[],
4821 help='TBR email addresses')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004822 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004823 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004824 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004825 parser.add_option('-s', '--send-mail', action='store_true',
Aaron Gable59f48512017-01-12 10:54:46 -08004826 help='send email to reviewer(s) and cc(s) immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004827 parser.add_option('--emulate_svn_auto_props',
4828 '--emulate-svn-auto-props',
4829 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004830 dest="emulate_svn_auto_props",
4831 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004832 parser.add_option('-c', '--use-commit-queue', action='store_true',
4833 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004834 parser.add_option('--private', action='store_true',
4835 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004836 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004837 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004838 metavar='TARGET',
4839 help='Apply CL to remote ref TARGET. ' +
4840 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004841 parser.add_option('--squash', action='store_true',
4842 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004843 parser.add_option('--no-squash', action='store_true',
4844 help='Don\'t squash multiple commits into one ' +
4845 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004846 parser.add_option('--topic', default=None,
4847 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004848 parser.add_option('--email', default=None,
4849 help='email address to use to connect to Rietveld')
Robert Iannuccif2708bd2017-04-17 15:49:02 -07004850 parser.add_option('--tbr-owners', dest='add_owners_to', action='store_const',
4851 const='TBR', help='add a set of OWNERS to TBR')
4852 parser.add_option('--r-owners', dest='add_owners_to', action='store_const',
4853 const='R', help='add a set of OWNERS to R')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004854 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4855 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004856 help='Send the patchset to do a CQ dry run right after '
4857 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004858 parser.add_option('--dependencies', action='store_true',
4859 help='Uploads CLs of all the local branches that depend on '
4860 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004861
rmistry@google.com2dd99862015-06-22 12:22:18 +00004862 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004863 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004864 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004865 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004866 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004867 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004868 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004869
sbc@chromium.org71437c02015-04-09 19:29:40 +00004870 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004871 return 1
4872
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004873 options.reviewers = cleanup_list(options.reviewers)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07004874 options.tbrs = cleanup_list(options.tbrs)
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004875 options.cc = cleanup_list(options.cc)
4876
tandriib80458a2016-06-23 12:20:07 -07004877 if options.message_file:
4878 if options.message:
4879 parser.error('only one of --message and --message-file allowed.')
4880 options.message = gclient_utils.FileRead(options.message_file)
4881 options.message_file = None
4882
tandrii4d0545a2016-07-06 03:56:49 -07004883 if options.cq_dry_run and options.use_commit_queue:
4884 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4885
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004886 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4887 settings.GetIsGerrit()
4888
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004889 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004890 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004891
4892
Francois Dorayd42c6812017-05-30 15:10:20 -04004893@subcommand.usage('--description=<description file>')
4894def CMDsplit(parser, args):
4895 """Splits a branch into smaller branches and uploads CLs.
4896
4897 Creates a branch and uploads a CL for each group of files modified in the
4898 current branch that share a common OWNERS file. In the CL description and
Quinten Yearsley0c62da92017-05-31 13:39:42 -07004899 comment, the string '$directory', is replaced with the directory containing
Francois Dorayd42c6812017-05-30 15:10:20 -04004900 the shared OWNERS file.
4901 """
4902 parser.add_option("-d", "--description", dest="description_file",
4903 help="A text file containing a CL description. ")
4904 parser.add_option("-c", "--comment", dest="comment_file",
4905 help="A text file containing a CL comment.")
4906 options, _ = parser.parse_args(args)
4907
4908 if not options.description_file:
4909 parser.error('No --description flag specified.')
4910
4911 def WrappedCMDupload(args):
4912 return CMDupload(OptionParser(), args)
4913
4914 return split_cl.SplitCl(options.description_file, options.comment_file,
4915 Changelist, WrappedCMDupload)
4916
4917
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004918@subcommand.usage('DEPRECATED')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004919def CMDdcommit(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004920 """DEPRECATED: Used to commit the current changelist via git-svn."""
4921 message = ('git-cl no longer supports committing to SVN repositories via '
4922 'git-svn. You probably want to use `git cl land` instead.')
4923 print(message)
4924 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004925
4926
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01004927# Two special branches used by git cl land.
4928MERGE_BRANCH = 'git-cl-commit'
4929CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4930
4931
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004932@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004933def CMDland(parser, args):
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08004934 """Commits the current changelist via git.
4935
4936 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4937 upstream and closes the issue automatically and atomically.
4938
4939 Otherwise (in case of Rietveld):
4940 Squashes branch into a single commit.
4941 Updates commit message with metadata (e.g. pointer to review).
4942 Pushes the code upstream.
4943 Updates review and closes.
4944 """
4945 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4946 help='bypass upload presubmit hook')
4947 parser.add_option('-m', dest='message',
4948 help="override review description")
4949 parser.add_option('-f', action='store_true', dest='force',
4950 help="force yes to questions (don't prompt)")
4951 parser.add_option('-c', dest='contributor',
4952 help="external contributor for patch (appended to " +
4953 "description and used as author for git). Should be " +
4954 "formatted as 'First Last <email@example.com>'")
4955 add_git_similarity(parser)
4956 auth.add_auth_options(parser)
4957 (options, args) = parser.parse_args(args)
4958 auth_config = auth.extract_auth_config_from_options(options)
4959
4960 cl = Changelist(auth_config=auth_config)
4961
4962 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4963 if cl.IsGerrit():
4964 if options.message:
4965 # This could be implemented, but it requires sending a new patch to
4966 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4967 # Besides, Gerrit has the ability to change the commit message on submit
4968 # automatically, thus there is no need to support this option (so far?).
4969 parser.error('-m MESSAGE option is not supported for Gerrit.')
4970 if options.contributor:
4971 parser.error(
4972 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4973 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4974 'the contributor\'s "name <email>". If you can\'t upload such a '
4975 'commit for review, contact your repository admin and request'
4976 '"Forge-Author" permission.')
4977 if not cl.GetIssue():
4978 DieWithError('You must upload the change first to Gerrit.\n'
4979 ' If you would rather have `git cl land` upload '
4980 'automatically for you, see http://crbug.com/642759')
4981 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4982 options.verbose)
4983
4984 current = cl.GetBranch()
4985 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4986 if remote == '.':
4987 print()
4988 print('Attempting to push branch %r into another local branch!' % current)
4989 print()
4990 print('Either reparent this branch on top of origin/master:')
4991 print(' git reparent-branch --root')
4992 print()
4993 print('OR run `git rebase-update` if you think the parent branch is ')
4994 print('already committed.')
4995 print()
4996 print(' Current parent: %r' % upstream_branch)
4997 return 1
4998
4999 if not args:
5000 # Default to merging against our best guess of the upstream branch.
5001 args = [cl.GetUpstreamBranch()]
5002
5003 if options.contributor:
5004 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005005 print("Please provide contributor as 'First Last <email@example.com>'")
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005006 return 1
5007
5008 base_branch = args[0]
5009
5010 if git_common.is_dirty_git_tree('land'):
5011 return 1
5012
5013 # This rev-list syntax means "show all commits not in my branch that
5014 # are in base_branch".
5015 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
5016 base_branch]).splitlines()
5017 if upstream_commits:
5018 print('Base branch "%s" has %d commits '
5019 'not in this branch.' % (base_branch, len(upstream_commits)))
5020 print('Run "git merge %s" before attempting to land.' % base_branch)
5021 return 1
5022
5023 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
5024 if not options.bypass_hooks:
5025 author = None
5026 if options.contributor:
5027 author = re.search(r'\<(.*)\>', options.contributor).group(1)
5028 hook_results = cl.RunHook(
5029 committing=True,
5030 may_prompt=not options.force,
5031 verbose=options.verbose,
5032 change=cl.GetChange(merge_base, author))
5033 if not hook_results.should_continue():
5034 return 1
5035
5036 # Check the tree status if the tree status URL is set.
5037 status = GetTreeStatus()
5038 if 'closed' == status:
5039 print('The tree is closed. Please wait for it to reopen. Use '
5040 '"git cl land --bypass-hooks" to commit on a closed tree.')
5041 return 1
5042 elif 'unknown' == status:
5043 print('Unable to determine tree status. Please verify manually and '
5044 'use "git cl land --bypass-hooks" to commit on a closed tree.')
5045 return 1
5046
5047 change_desc = ChangeDescription(options.message)
5048 if not change_desc.description and cl.GetIssue():
5049 change_desc = ChangeDescription(cl.GetDescription())
5050
5051 if not change_desc.description:
5052 if not cl.GetIssue() and options.bypass_hooks:
5053 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
5054 else:
5055 print('No description set.')
5056 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
5057 return 1
5058
5059 # Keep a separate copy for the commit message, because the commit message
5060 # contains the link to the Rietveld issue, while the Rietveld message contains
5061 # the commit viewvc url.
5062 if cl.GetIssue():
Aaron Gablea1bab272017-04-11 16:38:18 -07005063 change_desc.update_reviewers(
Robert Iannucci6c98dc62017-04-18 11:38:00 -07005064 get_approving_reviewers(cl.GetIssueProperties()), [])
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005065
5066 commit_desc = ChangeDescription(change_desc.description)
5067 if cl.GetIssue():
5068 # Xcode won't linkify this URL unless there is a non-whitespace character
5069 # after it. Add a period on a new line to circumvent this. Also add a space
5070 # before the period to make sure that Gitiles continues to correctly resolve
5071 # the URL.
5072 commit_desc.append_footer('Review-Url: %s .' % cl.GetIssueURL())
5073 if options.contributor:
5074 commit_desc.append_footer('Patch from %s.' % options.contributor)
5075
5076 print('Description:')
5077 print(commit_desc.description)
5078
5079 branches = [merge_base, cl.GetBranchRef()]
5080 if not options.force:
5081 print_stats(options.similarity, options.find_copies, branches)
5082
5083 # We want to squash all this branch's commits into one commit with the proper
5084 # description. We do this by doing a "reset --soft" to the base branch (which
5085 # keeps the working copy the same), then landing that.
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005086 # Delete the special branches if they exist.
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005087 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
5088 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
5089 result = RunGitWithCode(showref_cmd)
5090 if result[0] == 0:
5091 RunGit(['branch', '-D', branch])
5092
5093 # We might be in a directory that's present in this branch but not in the
5094 # trunk. Move up to the top of the tree so that git commands that expect a
5095 # valid CWD won't fail after we check out the merge branch.
5096 rel_base_path = settings.GetRelativeRoot()
5097 if rel_base_path:
5098 os.chdir(rel_base_path)
5099
5100 # Stuff our change into the merge branch.
5101 # We wrap in a try...finally block so if anything goes wrong,
5102 # we clean up the branches.
5103 retcode = -1
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005104 revision = None
5105 try:
5106 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
5107 RunGit(['reset', '--soft', merge_base])
5108 if options.contributor:
5109 RunGit(
5110 [
5111 'commit', '--author', options.contributor,
5112 '-m', commit_desc.description,
5113 ])
5114 else:
5115 RunGit(['commit', '-m', commit_desc.description])
5116
5117 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
5118 mirror = settings.GetGitMirror(remote)
5119 if mirror:
5120 pushurl = mirror.url
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005121 git_numberer_enabled = _is_git_numberer_enabled(pushurl, branch)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005122 else:
5123 pushurl = remote # Usually, this is 'origin'.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005124 git_numberer_enabled = _is_git_numberer_enabled(
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005125 RunGit(['config', 'remote.%s.url' % remote]).strip(), branch)
5126
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005127 retcode = PushToGitWithAutoRebase(
5128 pushurl, branch, commit_desc.description, git_numberer_enabled)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005129 if retcode == 0:
5130 revision = RunGit(['rev-parse', 'HEAD']).strip()
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005131 if git_numberer_enabled:
5132 change_desc = ChangeDescription(
5133 RunGit(['show', '-s', '--format=%B', 'HEAD']).strip())
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005134 except: # pylint: disable=bare-except
5135 if _IS_BEING_TESTED:
5136 logging.exception('this is likely your ACTUAL cause of test failure.\n'
5137 + '-' * 30 + '8<' + '-' * 30)
5138 logging.error('\n' + '-' * 30 + '8<' + '-' * 30 + '\n\n\n')
5139 raise
5140 finally:
5141 # And then swap back to the original branch and clean up.
5142 RunGit(['checkout', '-q', cl.GetBranch()])
5143 RunGit(['branch', '-D', MERGE_BRANCH])
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005144 RunGit(['branch', '-D', CHERRY_PICK_BRANCH], error_ok=True)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005145
5146 if not revision:
5147 print('Failed to push. If this persists, please file a bug.')
5148 return 1
5149
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005150 if cl.GetIssue():
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005151 viewvc_url = settings.GetViewVCUrl()
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005152 if viewvc_url and revision:
5153 change_desc.append_footer(
5154 'Committed: %s%s' % (viewvc_url, revision))
5155 elif revision:
5156 change_desc.append_footer('Committed: %s' % (revision,))
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005157 print('Closing issue '
5158 '(you may be prompted for your codereview password)...')
5159 cl.UpdateDescription(change_desc.description)
5160 cl.CloseIssue()
5161 props = cl.GetIssueProperties()
5162 patch_num = len(props['patchsets'])
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005163 comment = "Committed patchset #%d (id:%d) manually as %s" % (
5164 patch_num, props['patchsets'][-1], revision)
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005165 if options.bypass_hooks:
5166 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
5167 else:
5168 comment += ' (presubmit successful).'
5169 cl.RpcServer().add_comment(cl.GetIssue(), comment)
5170
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08005171 if os.path.isfile(POSTUPSTREAM_HOOK):
5172 RunCommand([POSTUPSTREAM_HOOK, merge_base], error_ok=True)
5173
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01005174 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005175
5176
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005177def PushToGitWithAutoRebase(remote, branch, original_description,
5178 git_numberer_enabled, max_attempts=3):
5179 """Pushes current HEAD commit on top of remote's branch.
5180
5181 Attempts to fetch and autorebase on push failures.
5182 Adds git number footers on the fly.
5183
5184 Returns integer code from last command.
5185 """
5186 cherry = RunGit(['rev-parse', 'HEAD']).strip()
5187 code = 0
5188 attempts_left = max_attempts
5189 while attempts_left:
5190 attempts_left -= 1
5191 print('Attempt %d of %d' % (max_attempts - attempts_left, max_attempts))
5192
5193 # Fetch remote/branch into local cherry_pick_branch, overriding the latter.
5194 # If fetch fails, retry.
5195 print('Fetching %s/%s...' % (remote, branch))
5196 code, out = RunGitWithCode(
5197 ['retry', 'fetch', remote,
5198 '+%s:refs/heads/%s' % (branch, CHERRY_PICK_BRANCH)])
5199 if code:
5200 print('Fetch failed with exit code %d.' % code)
5201 print(out.strip())
5202 continue
5203
5204 print('Cherry-picking commit on top of latest %s' % branch)
5205 RunGitWithCode(['checkout', 'refs/heads/%s' % CHERRY_PICK_BRANCH],
5206 suppress_stderr=True)
5207 parent_hash = RunGit(['rev-parse', 'HEAD']).strip()
5208 code, out = RunGitWithCode(['cherry-pick', cherry])
5209 if code:
5210 print('Your patch doesn\'t apply cleanly to \'%s\' HEAD @ %s, '
5211 'the following files have merge conflicts:' %
5212 (branch, parent_hash))
5213 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
5214 print('Please rebase your patch and try again.')
5215 RunGitWithCode(['cherry-pick', '--abort'])
5216 break
5217
5218 commit_desc = ChangeDescription(original_description)
5219 if git_numberer_enabled:
5220 logging.debug('Adding git number footers')
5221 parent_msg = RunGit(['show', '-s', '--format=%B', parent_hash]).strip()
5222 commit_desc.update_with_git_number_footers(parent_hash, parent_msg,
5223 branch)
5224 # Ensure timestamps are monotonically increasing.
5225 timestamp = max(1 + _get_committer_timestamp(parent_hash),
5226 _get_committer_timestamp('HEAD'))
5227 _git_amend_head(commit_desc.description, timestamp)
5228
5229 code, out = RunGitWithCode(
5230 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
5231 print(out)
5232 if code == 0:
5233 break
5234 if IsFatalPushFailure(out):
5235 print('Fatal push error. Make sure your .netrc credentials and git '
Andrii Shyshkalov9d932212017-04-10 14:28:23 +02005236 'user.email are correct and you have push access to the repo.\n'
5237 'Hint: run command below to diangose common Git/Gerrit credential '
5238 'problems:\n'
5239 ' git cl creds-check\n')
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01005240 break
5241 return code
5242
5243
5244def IsFatalPushFailure(push_stdout):
5245 """True if retrying push won't help."""
5246 return '(prohibited by Gerrit)' in push_stdout
5247
5248
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005249@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005250def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00005251 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005252 parser.add_option('-b', dest='newbranch',
5253 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005254 parser.add_option('-f', '--force', action='store_true',
Aaron Gable62619a32017-06-16 08:22:09 -07005255 help='overwrite state on the current or chosen branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005256 parser.add_option('-d', '--directory', action='store', metavar='DIR',
Aaron Gable62619a32017-06-16 08:22:09 -07005257 help='change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005258 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00005259 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00005260 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005261 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005262 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005263 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005264
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005265
5266 group = optparse.OptionGroup(
5267 parser,
5268 'Options for continuing work on the current issue uploaded from a '
5269 'different clone (e.g. different machine). Must be used independently '
5270 'from the other options. No issue number should be specified, and the '
5271 'branch must have an issue number associated with it')
5272 group.add_option('--reapply', action='store_true', dest='reapply',
5273 help='Reset the branch and reapply the issue.\n'
5274 'CAUTION: This will undo any local changes in this '
5275 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005276
5277 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005278 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005279 parser.add_option_group(group)
5280
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005281 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005282 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005283 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00005284 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005285 auth_config = auth.extract_auth_config_from_options(options)
5286
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005287 if options.reapply:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005288 if options.newbranch:
5289 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005290 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005291 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005292
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005293 cl = Changelist(auth_config=auth_config,
5294 codereview=options.forced_codereview)
5295 if not cl.GetIssue():
5296 parser.error('current branch must have an associated issue')
5297
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005298 upstream = cl.GetUpstreamBranch()
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005299 if upstream is None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005300 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005301
5302 RunGit(['reset', '--hard', upstream])
5303 if options.pull:
5304 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00005305
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005306 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
5307 options.directory)
5308
5309 if len(args) != 1 or not args[0]:
5310 parser.error('Must specify issue number or url')
5311
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005312 target_issue_arg = ParseIssueNumberArgument(args[0],
5313 options.forced_codereview)
5314 if not target_issue_arg.valid:
5315 parser.error('invalid codereview url or CL id')
5316
5317 cl_kwargs = {
5318 'auth_config': auth_config,
5319 'codereview_host': target_issue_arg.hostname,
5320 'codereview': options.forced_codereview,
5321 }
5322 detected_codereview_from_url = False
5323 if target_issue_arg.codereview and not options.forced_codereview:
5324 detected_codereview_from_url = True
5325 cl_kwargs['codereview'] = target_issue_arg.codereview
5326 cl_kwargs['issue'] = target_issue_arg.issue
5327
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005328 # We don't want uncommitted changes mixed up with the patch.
5329 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00005330 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005331
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005332 if options.newbranch:
5333 if options.force:
5334 RunGit(['branch', '-D', options.newbranch],
5335 stderr=subprocess2.PIPE, error_ok=True)
5336 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07005337 elif not GetCurrentBranch():
5338 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005339
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005340 cl = Changelist(**cl_kwargs)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00005341
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005342 if cl.IsGerrit():
5343 if options.reject:
5344 parser.error('--reject is not supported with Gerrit codereview.')
5345 if options.nocommit:
5346 parser.error('--nocommit is not supported with Gerrit codereview.')
5347 if options.directory:
5348 parser.error('--directory is not supported with Gerrit codereview.')
5349
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005350 if detected_codereview_from_url:
5351 print('canonical issue/change URL: %s (type: %s)\n' %
5352 (cl.GetIssueURL(), target_issue_arg.codereview))
5353
5354 return cl.CMDPatchWithParsedIssue(target_issue_arg, options.reject,
Aaron Gable62619a32017-06-16 08:22:09 -07005355 options.nocommit, options.directory,
5356 options.force)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005357
5358
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005359def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005360 """Fetches the tree status and returns either 'open', 'closed',
5361 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00005362 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005363 if url:
5364 status = urllib2.urlopen(url).read().lower()
5365 if status.find('closed') != -1 or status == '0':
5366 return 'closed'
5367 elif status.find('open') != -1 or status == '1':
5368 return 'open'
5369 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005370 return 'unset'
5371
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005372
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005373def GetTreeStatusReason():
5374 """Fetches the tree status from a json url and returns the message
5375 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00005376 url = settings.GetTreeStatusUrl()
5377 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005378 connection = urllib2.urlopen(json_url)
5379 status = json.loads(connection.read())
5380 connection.close()
5381 return status['message']
5382
dpranke@chromium.org970c5222011-03-12 00:32:24 +00005383
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005384def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005385 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005386 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005387 status = GetTreeStatus()
5388 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07005389 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005390 return 2
5391
vapiera7fbd5a2016-06-16 09:17:49 -07005392 print('The tree is %s' % status)
5393 print()
5394 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005395 if status != 'open':
5396 return 1
5397 return 0
5398
5399
maruel@chromium.org15192402012-09-06 12:38:29 +00005400def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07005401 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07005402 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00005403 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005404 '-b', '--bot', action='append',
5405 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
5406 'times to specify multiple builders. ex: '
5407 '"-b win_rel -b win_layout". See '
5408 'the try server waterfall for the builders name and the tests '
5409 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00005410 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07005411 '-B', '--bucket', default='',
5412 help=('Buildbucket bucket to send the try requests.'))
5413 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005414 '-m', '--master', default='',
5415 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005416 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005417 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07005418 help='Revision to use for the try job; default: the revision will '
5419 'be determined by the try recipe that builder runs, which usually '
5420 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00005421 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005422 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07005423 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07005424 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00005425 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005426 '--project',
5427 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07005428 'in recipe to determine to which repository or directory to '
5429 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00005430 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005431 '-p', '--property', dest='properties', action='append', default=[],
5432 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07005433 'key2=value2 etc. The value will be treated as '
5434 'json if decodable, or as string otherwise. '
5435 'NOTE: using this may make your try job not usable for CQ, '
5436 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00005437 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005438 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5439 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00005440 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005441 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00005442 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005443 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00005444
machenbach@chromium.org45453142015-09-15 08:45:22 +00005445 # Make sure that all properties are prop=value pairs.
5446 bad_params = [x for x in options.properties if '=' not in x]
5447 if bad_params:
5448 parser.error('Got properties with missing "=": %s' % bad_params)
5449
maruel@chromium.org15192402012-09-06 12:38:29 +00005450 if args:
5451 parser.error('Unknown arguments: %s' % args)
5452
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005453 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00005454 if not cl.GetIssue():
5455 parser.error('Need to upload first')
5456
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01005457 if cl.IsGerrit():
5458 # HACK: warm up Gerrit change detail cache to save on RPCs.
5459 cl._codereview_impl._GetChangeDetail(['DETAILED_ACCOUNTS', 'ALL_REVISIONS'])
5460
tandriie113dfd2016-10-11 10:20:12 -07005461 error_message = cl.CannotTriggerTryJobReason()
5462 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07005463 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00005464
borenet6c0efe62016-10-19 08:13:29 -07005465 if options.bucket and options.master:
5466 parser.error('Only one of --bucket and --master may be used.')
5467
qyearsley1fdfcb62016-10-24 13:22:03 -07005468 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00005469
qyearsleydd49f942016-10-28 11:57:22 -07005470 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
5471 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07005472 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07005473 if options.verbose:
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07005474 print('git cl try with no bots now defaults to CQ dry run.')
5475 print('Scheduling CQ dry run on: %s' % cl.GetIssueURL())
5476 return cl.SetCQState(_CQState.DRY_RUN)
stip@chromium.org43064fd2013-12-18 20:07:44 +00005477
borenet6c0efe62016-10-19 08:13:29 -07005478 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005479 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07005480 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07005481 'of bot requires an initial job from a parent (usually a builder). '
5482 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07005483 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00005484 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00005485
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00005486 patchset = cl.GetMostRecentPatchset()
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005487 # TODO(tandrii): Checking local patchset against remote patchset is only
5488 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5489 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandriide281ae2016-10-12 06:02:30 -07005490 print('Warning: Codereview server has newer patchsets (%s) than most '
5491 'recent upload from local checkout (%s). Did a previous upload '
5492 'fail?\n'
5493 'By default, git cl try uses the latest patchset from '
5494 'codereview, continuing to use patchset %s.\n' %
5495 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07005496
tandrii568043b2016-10-11 07:49:18 -07005497 try:
borenet6c0efe62016-10-19 08:13:29 -07005498 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
5499 patchset)
tandrii568043b2016-10-11 07:49:18 -07005500 except BuildbucketResponseException as ex:
5501 print('ERROR: %s' % ex)
5502 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00005503 return 0
5504
5505
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005506def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07005507 """Prints info about try jobs associated with current CL."""
5508 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005509 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005510 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005511 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005512 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00005513 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005514 '--color', action='store_true', default=setup_color.IS_TTY,
5515 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005516 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07005517 '--buildbucket-host', default='cr-buildbucket.appspot.com',
5518 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07005519 group.add_option(
Stefan Zager1306bd02017-06-22 19:26:46 -07005520 '--json', help=('Path of JSON output file to write try job results to,'
5521 'or "-" for stdout.'))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005522 parser.add_option_group(group)
5523 auth.add_auth_options(parser)
5524 options, args = parser.parse_args(args)
5525 if args:
5526 parser.error('Unrecognized args: %s' % ' '.join(args))
5527
5528 auth_config = auth.extract_auth_config_from_options(options)
5529 cl = Changelist(auth_config=auth_config)
5530 if not cl.GetIssue():
5531 parser.error('Need to upload first')
5532
tandrii221ab252016-10-06 08:12:04 -07005533 patchset = options.patchset
5534 if not patchset:
5535 patchset = cl.GetMostRecentPatchset()
5536 if not patchset:
5537 parser.error('Codereview doesn\'t know about issue %s. '
5538 'No access to issue or wrong issue number?\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01005539 'Either upload first, or pass --patchset explicitly' %
tandrii221ab252016-10-06 08:12:04 -07005540 cl.GetIssue())
5541
Ravi Mistryfda50ca2016-11-14 10:19:18 -05005542 # TODO(tandrii): Checking local patchset against remote patchset is only
5543 # supported for Rietveld. Extend it to Gerrit or remove it completely.
5544 if not cl.IsGerrit() and patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07005545 print('Warning: Codereview server has newer patchsets (%s) than most '
5546 'recent upload from local checkout (%s). Did a previous upload '
5547 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07005548 'By default, git cl try-results uses the latest patchset from '
5549 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07005550 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005551 try:
tandrii221ab252016-10-06 08:12:04 -07005552 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005553 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07005554 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005555 return 1
qyearsley53f48a12016-09-01 10:45:13 -07005556 if options.json:
5557 write_try_results_json(options.json, jobs)
5558 else:
5559 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00005560 return 0
5561
5562
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005563@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005564def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005565 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00005566 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005567 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005568 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005569
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005570 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005571 if args:
5572 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005573 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07005574 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005575 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07005576 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00005577
5578 # Clear configured merge-base, if there is one.
5579 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00005580 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005581 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005582 return 0
5583
5584
thestig@chromium.org00858c82013-12-02 23:08:03 +00005585def CMDweb(parser, args):
5586 """Opens the current CL in the web browser."""
5587 _, args = parser.parse_args(args)
5588 if args:
5589 parser.error('Unrecognized args: %s' % ' '.join(args))
5590
5591 issue_url = Changelist().GetIssueURL()
5592 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07005593 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00005594 return 1
5595
5596 webbrowser.open(issue_url)
5597 return 0
5598
5599
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005600def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005601 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005602 parser.add_option('-d', '--dry-run', action='store_true',
5603 help='trigger in dry run mode')
5604 parser.add_option('-c', '--clear', action='store_true',
5605 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005606 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07005607 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005608 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005609 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005610 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005611 if args:
5612 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005613 if options.dry_run and options.clear:
5614 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5615
iannuccie53c9352016-08-17 14:40:40 -07005616 cl = Changelist(auth_config=auth_config, issue=options.issue,
5617 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005618 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005619 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005620 elif options.dry_run:
5621 state = _CQState.DRY_RUN
5622 else:
5623 state = _CQState.COMMIT
5624 if not cl.GetIssue():
5625 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005626 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005627 return 0
5628
5629
groby@chromium.org411034a2013-02-26 15:12:01 +00005630def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005631 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005632 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005633 auth.add_auth_options(parser)
5634 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005635 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005636 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005637 if args:
5638 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005639 cl = Changelist(auth_config=auth_config, issue=options.issue,
5640 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005641 # Ensure there actually is an issue to close.
5642 cl.GetDescription()
5643 cl.CloseIssue()
5644 return 0
5645
5646
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005647def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005648 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005649 parser.add_option(
5650 '--stat',
5651 action='store_true',
5652 dest='stat',
5653 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005654 auth.add_auth_options(parser)
5655 options, args = parser.parse_args(args)
5656 auth_config = auth.extract_auth_config_from_options(options)
5657 if args:
5658 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005659
5660 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005661 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005662 # Staged changes would be committed along with the patch from last
5663 # upload, hence counted toward the "last upload" side in the final
5664 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005665 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005666 return 1
5667
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005668 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005669 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005670 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005671 if not issue:
5672 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005673 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005674 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005675
5676 # Create a new branch based on the merge-base
5677 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005678 # Clear cached branch in cl object, to avoid overwriting original CL branch
5679 # properties.
5680 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005681 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005682 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005683 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005684 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005685 return rtn
5686
wychen@chromium.org06928532015-02-03 02:11:29 +00005687 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005688 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005689 cmd = ['git', 'diff']
5690 if options.stat:
5691 cmd.append('--stat')
5692 cmd.extend([TMP_BRANCH, branch, '--'])
5693 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005694 finally:
5695 RunGit(['checkout', '-q', branch])
5696 RunGit(['branch', '-D', TMP_BRANCH])
5697
5698 return 0
5699
5700
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005701def CMDowners(parser, args):
Quinten Yearsley0c62da92017-05-31 13:39:42 -07005702 """Interactively finds potential owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005703 parser.add_option(
5704 '--no-color',
5705 action='store_true',
5706 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005707 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005708 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005709 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005710
5711 author = RunGit(['config', 'user.email']).strip() or None
5712
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005713 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005714
5715 if args:
5716 if len(args) > 1:
5717 parser.error('Unknown args')
5718 base_branch = args[0]
5719 else:
5720 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005721 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005722
5723 change = cl.GetChange(base_branch, None)
5724 return owners_finder.OwnersFinder(
5725 [f.LocalPath() for f in
5726 cl.GetChange(base_branch, None).AffectedFiles()],
Jochen Eisinger72606f82017-04-04 10:44:18 +02005727 change.RepositoryRoot(),
Jochen Eisinger72606f82017-04-04 10:44:18 +02005728 author, fopen=file, os_path=os.path,
Jochen Eisingerd0573ec2017-04-13 10:55:06 +02005729 disable_color=options.no_color,
5730 override_files=change.OriginalOwnersFiles()).run()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005731
5732
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005733def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005734 """Generates a diff command."""
5735 # Generate diff for the current branch's changes.
5736 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005737 upstream_commit, '--']
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005738
5739 if args:
5740 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005741 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005742 diff_cmd.append(arg)
5743 else:
5744 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005745
5746 return diff_cmd
5747
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005748
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005749def MatchingFileType(file_name, extensions):
5750 """Returns true if the file name ends with one of the given extensions."""
5751 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005752
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005753
enne@chromium.org555cfe42014-01-29 18:21:39 +00005754@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005755def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005756 """Runs auto-formatting tools (clang-format etc.) on the diff."""
Christopher Lamc5ba6922017-01-24 11:19:14 +11005757 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005758 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005759 parser.add_option('--full', action='store_true',
5760 help='Reformat the full content of all touched files')
5761 parser.add_option('--dry-run', action='store_true',
5762 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005763 parser.add_option('--python', action='store_true',
5764 help='Format python code with yapf (experimental).')
Christopher Lamc5ba6922017-01-24 11:19:14 +11005765 parser.add_option('--js', action='store_true',
5766 help='Format javascript code with clang-format.')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005767 parser.add_option('--diff', action='store_true',
5768 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005769 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005770
Daniel Chengc55eecf2016-12-30 03:11:02 -08005771 # Normalize any remaining args against the current path, so paths relative to
5772 # the current directory are still resolved as expected.
5773 args = [os.path.join(os.getcwd(), arg) for arg in args]
5774
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005775 # git diff generates paths against the root of the repository. Change
5776 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005777 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005778 if rel_base_path:
5779 os.chdir(rel_base_path)
5780
digit@chromium.org29e47272013-05-17 17:01:46 +00005781 # Grab the merge-base commit, i.e. the upstream commit of the current
5782 # branch when it was created or the last time it was rebased. This is
5783 # to cover the case where the user may have called "git fetch origin",
5784 # moving the origin branch to a newer commit, but hasn't rebased yet.
5785 upstream_commit = None
5786 cl = Changelist()
5787 upstream_branch = cl.GetUpstreamBranch()
5788 if upstream_branch:
5789 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5790 upstream_commit = upstream_commit.strip()
5791
5792 if not upstream_commit:
5793 DieWithError('Could not find base commit for this branch. '
5794 'Are you in detached state?')
5795
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005796 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5797 diff_output = RunGit(changed_files_cmd)
5798 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005799 # Filter out files deleted by this CL
5800 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005801
Christopher Lamc5ba6922017-01-24 11:19:14 +11005802 if opts.js:
5803 CLANG_EXTS.append('.js')
5804
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005805 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5806 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5807 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005808 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005809
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005810 top_dir = os.path.normpath(
5811 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5812
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005813 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5814 # formatted. This is used to block during the presubmit.
5815 return_value = 0
5816
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005817 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005818 # Locate the clang-format binary in the checkout
5819 try:
5820 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005821 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005822 DieWithError(e)
5823
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005824 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005825 cmd = [clang_format_tool]
5826 if not opts.dry_run and not opts.diff:
5827 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005828 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005829 if opts.diff:
5830 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005831 else:
5832 env = os.environ.copy()
5833 env['PATH'] = str(os.path.dirname(clang_format_tool))
5834 try:
5835 script = clang_format.FindClangFormatScriptInChromiumTree(
5836 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005837 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005838 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005839
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005840 cmd = [sys.executable, script, '-p0']
5841 if not opts.dry_run and not opts.diff:
5842 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005843
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005844 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5845 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005846
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005847 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5848 if opts.diff:
5849 sys.stdout.write(stdout)
5850 if opts.dry_run and len(stdout) > 0:
5851 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005852
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005853 # Similar code to above, but using yapf on .py files rather than clang-format
5854 # on C/C++ files
5855 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005856 yapf_tool = gclient_utils.FindExecutable('yapf')
5857 if yapf_tool is None:
5858 DieWithError('yapf not found in PATH')
5859
5860 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005861 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005862 cmd = [yapf_tool]
5863 if not opts.dry_run and not opts.diff:
5864 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005865 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005866 if opts.diff:
5867 sys.stdout.write(stdout)
5868 else:
5869 # TODO(sbc): yapf --lines mode still has some issues.
5870 # https://github.com/google/yapf/issues/154
5871 DieWithError('--python currently only works with --full')
5872
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005873 # Dart's formatter does not have the nice property of only operating on
5874 # modified chunks, so hard code full.
5875 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005876 try:
5877 command = [dart_format.FindDartFmtToolInChromiumTree()]
5878 if not opts.dry_run and not opts.diff:
5879 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005880 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005881
ppi@chromium.org6593d932016-03-03 15:41:15 +00005882 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005883 if opts.dry_run and stdout:
5884 return_value = 2
5885 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005886 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5887 'found in this checkout. Files in other languages are still '
5888 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005889
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005890 # Format GN build files. Always run on full build files for canonical form.
5891 if gn_diff_files:
Andrii Shyshkalov18975322017-01-25 16:44:13 +01005892 cmd = ['gn', 'format']
brettw4b8ed592016-08-05 16:19:12 -07005893 if opts.dry_run or opts.diff:
5894 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005895 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005896 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5897 shell=sys.platform == 'win32',
5898 cwd=top_dir)
5899 if opts.dry_run and gn_ret == 2:
5900 return_value = 2 # Not formatted.
5901 elif opts.diff and gn_ret == 2:
5902 # TODO this should compute and print the actual diff.
5903 print("This change has GN build file diff for " + gn_diff_file)
5904 elif gn_ret != 0:
5905 # For non-dry run cases (and non-2 return values for dry-run), a
5906 # nonzero error code indicates a failure, probably because the file
5907 # doesn't parse.
5908 DieWithError("gn format failed on " + gn_diff_file +
5909 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005910
Steven Holte2e664bf2017-04-21 13:10:47 -07005911 for xml_dir in GetDirtyMetricsDirs(diff_files):
5912 tool_dir = os.path.join(top_dir, xml_dir)
5913 cmd = [os.path.join(tool_dir, 'pretty_print.py'), '--non-interactive']
5914 if opts.dry_run or opts.diff:
5915 cmd.append('--diff')
5916 stdout = RunCommand(cmd, cwd=top_dir)
5917 if opts.diff:
5918 sys.stdout.write(stdout)
5919 if opts.dry_run and stdout:
5920 return_value = 2 # Not formatted.
Alexei Svitkinef3cac412017-02-06 11:08:50 -05005921
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005922 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005923
Steven Holte2e664bf2017-04-21 13:10:47 -07005924def GetDirtyMetricsDirs(diff_files):
5925 xml_diff_files = [x for x in diff_files if MatchingFileType(x, ['.xml'])]
5926 metrics_xml_dirs = [
5927 os.path.join('tools', 'metrics', 'actions'),
5928 os.path.join('tools', 'metrics', 'histograms'),
5929 os.path.join('tools', 'metrics', 'rappor'),
5930 os.path.join('tools', 'metrics', 'ukm')]
5931 for xml_dir in metrics_xml_dirs:
5932 if any(file.startswith(xml_dir) for file in xml_diff_files):
5933 yield xml_dir
5934
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005935
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005936@subcommand.usage('<codereview url or issue id>')
5937def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005938 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005939 _, args = parser.parse_args(args)
5940
5941 if len(args) != 1:
5942 parser.print_help()
5943 return 1
5944
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005945 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005946 if not issue_arg.valid:
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02005947 parser.error('invalid codereview url or CL id')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02005948
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005949 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005950
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005951 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005952 output = RunGit(['config', '--local', '--get-regexp',
5953 r'branch\..*\.%s' % issueprefix],
5954 error_ok=True)
5955 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005956 if issue == target_issue:
5957 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005958
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005959 branches = []
5960 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005961 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005962 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005963 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005964 return 1
5965 if len(branches) == 1:
5966 RunGit(['checkout', branches[0]])
5967 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005968 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005969 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005970 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005971 which = raw_input('Choose by index: ')
5972 try:
5973 RunGit(['checkout', branches[int(which)]])
5974 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005975 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005976 return 1
5977
5978 return 0
5979
5980
maruel@chromium.org29404b52014-09-08 22:58:00 +00005981def CMDlol(parser, args):
5982 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005983 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005984 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5985 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5986 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005987 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005988 return 0
5989
5990
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005991class OptionParser(optparse.OptionParser):
5992 """Creates the option parse and add --verbose support."""
5993 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005994 optparse.OptionParser.__init__(
5995 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005996 self.add_option(
5997 '-v', '--verbose', action='count', default=0,
5998 help='Use 2 times for more debugging info')
5999
6000 def parse_args(self, args=None, values=None):
6001 options, args = optparse.OptionParser.parse_args(self, args, values)
6002 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
Andrii Shyshkalov5b04a572017-01-23 17:44:41 +01006003 logging.basicConfig(
6004 level=levels[min(options.verbose, len(levels) - 1)],
6005 format='[%(levelname).1s%(asctime)s %(process)d %(thread)d '
6006 '%(filename)s] %(message)s')
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006007 return options, args
6008
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00006009
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006010def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006011 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07006012 print('\nYour python version %s is unsupported, please upgrade.\n' %
6013 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00006014 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006015
maruel@chromium.orgddd59412011-11-30 14:20:38 +00006016 # Reload settings.
6017 global settings
6018 settings = Settings()
6019
maruel@chromium.org39c0b222013-08-17 16:57:01 +00006020 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006021 dispatcher = subcommand.CommandDispatcher(__name__)
6022 try:
6023 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00006024 except auth.AuthenticationError as e:
6025 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07006026 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00006027 if e.code != 500:
6028 raise
6029 DieWithError(
6030 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
6031 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00006032 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006033
6034
6035if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00006036 # These affect sys.stdout so do it outside of main() to simplify mocks in
6037 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00006038 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00006039 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00006040 try:
6041 sys.exit(main(sys.argv[1:]))
6042 except KeyboardInterrupt:
6043 sys.stderr.write('interrupted\n')
6044 sys.exit(1)