blob: 1b016d46137da6b67efc7bdfdf52dac0ea0e9c8c [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
sheyang@google.com6ebaf782015-05-12 19:17:54 +000016import httplib
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000017import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000018import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000019import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import optparse
21import os
22import re
ukai@chromium.org78c4b982012-02-14 02:20:26 +000023import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000025import textwrap
sheyang@google.com6ebaf782015-05-12 19:17:54 +000026import time
27import traceback
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000028import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000030import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000032import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000033import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034
35try:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000036 import readline # pylint: disable=F0401,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037except ImportError:
38 pass
39
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000040from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000041from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000042from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000043import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000044import clang_format
tandrii@chromium.org71184c02016-01-13 15:18:44 +000045import commit_queue
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000046import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000047import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000048import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000049import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000050import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000051import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000052import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000053import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000054import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000057import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000059import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000060import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import watchlists
62
tandrii7400cf02016-06-21 08:48:07 -070063__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064
tandrii9d2c7a32016-06-22 03:42:45 -070065COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070066DEFAULT_SERVER = 'https://codereview.chromium.org'
maruel@chromium.org0ba7f962011-01-11 22:13:58 +000067POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000068DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +000069GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
rmistry@google.comc68112d2015-03-03 12:48:06 +000070REFS_THAT_ALIAS_TO_OTHER_REFS = {
71 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
72 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
73}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074
thestig@chromium.org44202a22014-03-11 19:22:18 +000075# Valid extensions for files we want to lint.
76DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
77DEFAULT_LINT_IGNORE_REGEX = r"$^"
78
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000079# Shortcut since it quickly becomes redundant.
80Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000081
maruel@chromium.orgddd59412011-11-30 14:20:38 +000082# Initialized in main()
83settings = None
84
85
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000086def DieWithError(message):
vapiera7fbd5a2016-06-16 09:17:49 -070087 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000088 sys.exit(1)
89
90
thestig@chromium.org8b0553c2014-02-11 00:33:37 +000091def GetNoGitPagerEnv():
92 env = os.environ.copy()
93 # 'cat' is a magical git string that disables pagers on all platforms.
94 env['GIT_PAGER'] = 'cat'
95 return env
96
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +000097
bsep@chromium.org627d9002016-04-29 00:00:52 +000098def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000099 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000100 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000101 except subprocess2.CalledProcessError as e:
102 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000103 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000104 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000105 'Command "%s" failed.\n%s' % (
106 ' '.join(args), error_message or e.stdout or ''))
107 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000108
109
110def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000111 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000112 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113
114
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000115def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000116 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700117 if suppress_stderr:
118 stderr = subprocess2.VOID
119 else:
120 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000121 try:
tandrii5d48c322016-08-18 16:19:37 -0700122 (out, _), code = subprocess2.communicate(['git'] + args,
123 env=GetNoGitPagerEnv(),
124 stdout=subprocess2.PIPE,
125 stderr=stderr)
126 return code, out
127 except subprocess2.CalledProcessError as e:
128 logging.debug('Failed running %s', args)
129 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000130
131
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000132def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000133 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000134 return RunGitWithCode(args, suppress_stderr=True)[1]
135
136
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000137def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000138 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000139 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000140 return (version.startswith(prefix) and
141 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000142
143
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000144def BranchExists(branch):
145 """Return True if specified branch exists."""
146 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
147 suppress_stderr=True)
148 return not code
149
150
maruel@chromium.org90541732011-04-01 17:54:18 +0000151def ask_for_data(prompt):
152 try:
153 return raw_input(prompt)
154 except KeyboardInterrupt:
155 # Hide the exception.
156 sys.exit(1)
157
158
tandrii5d48c322016-08-18 16:19:37 -0700159def _git_branch_config_key(branch, key):
160 """Helper method to return Git config key for a branch."""
161 assert branch, 'branch name is required to set git config for it'
162 return 'branch.%s.%s' % (branch, key)
163
164
165def _git_get_branch_config_value(key, default=None, value_type=str,
166 branch=False):
167 """Returns git config value of given or current branch if any.
168
169 Returns default in all other cases.
170 """
171 assert value_type in (int, str, bool)
172 if branch is False: # Distinguishing default arg value from None.
173 branch = GetCurrentBranch()
174
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000175 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700176 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000177
tandrii5d48c322016-08-18 16:19:37 -0700178 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700179 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700180 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700181 # git config also has --int, but apparently git config suffers from integer
182 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700183 args.append(_git_branch_config_key(branch, key))
184 code, out = RunGitWithCode(args)
185 if code == 0:
186 value = out.strip()
187 if value_type == int:
188 return int(value)
189 if value_type == bool:
190 return bool(value.lower() == 'true')
191 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000192 return default
193
194
tandrii5d48c322016-08-18 16:19:37 -0700195def _git_set_branch_config_value(key, value, branch=None, **kwargs):
196 """Sets the value or unsets if it's None of a git branch config.
197
198 Valid, though not necessarily existing, branch must be provided,
199 otherwise currently checked out branch is used.
200 """
201 if not branch:
202 branch = GetCurrentBranch()
203 assert branch, 'a branch name OR currently checked out branch is required'
204 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700205 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700206 if value is None:
207 args.append('--unset')
208 elif isinstance(value, bool):
209 args.append('--bool')
210 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700211 else:
tandrii33a46ff2016-08-23 05:53:40 -0700212 # git config also has --int, but apparently git config suffers from integer
213 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700214 value = str(value)
215 args.append(_git_branch_config_key(branch, key))
216 if value is not None:
217 args.append(value)
218 RunGit(args, **kwargs)
219
220
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000221def add_git_similarity(parser):
222 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700223 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000224 help='Sets the percentage that a pair of files need to match in order to'
225 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000226 parser.add_option(
227 '--find-copies', action='store_true',
228 help='Allows git to look for copies.')
229 parser.add_option(
230 '--no-find-copies', action='store_false', dest='find_copies',
231 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000232
233 old_parser_args = parser.parse_args
234 def Parse(args):
235 options, args = old_parser_args(args)
236
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000237 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700238 options.similarity = _git_get_branch_config_value(
239 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000240 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000241 print('Note: Saving similarity of %d%% in git config.'
242 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700243 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000244
iannucci@chromium.org79540052012-10-19 23:15:26 +0000245 options.similarity = max(0, min(options.similarity, 100))
246
247 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700248 options.find_copies = _git_get_branch_config_value(
249 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000250 else:
tandrii5d48c322016-08-18 16:19:37 -0700251 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000252
253 print('Using %d%% similarity for rename/copy detection. '
254 'Override with --similarity.' % options.similarity)
255
256 return options, args
257 parser.parse_args = Parse
258
259
machenbach@chromium.org45453142015-09-15 08:45:22 +0000260def _get_properties_from_options(options):
261 properties = dict(x.split('=', 1) for x in options.properties)
262 for key, val in properties.iteritems():
263 try:
264 properties[key] = json.loads(val)
265 except ValueError:
266 pass # If a value couldn't be evaluated, treat it as a string.
267 return properties
268
269
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000270def _prefix_master(master):
271 """Convert user-specified master name to full master name.
272
273 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
274 name, while the developers always use shortened master name
275 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
276 function does the conversion for buildbucket migration.
277 """
278 prefix = 'master.'
279 if master.startswith(prefix):
280 return master
281 return '%s%s' % (prefix, master)
282
283
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000284def _buildbucket_retry(operation_name, http, *args, **kwargs):
285 """Retries requests to buildbucket service and returns parsed json content."""
286 try_count = 0
287 while True:
288 response, content = http.request(*args, **kwargs)
289 try:
290 content_json = json.loads(content)
291 except ValueError:
292 content_json = None
293
294 # Buildbucket could return an error even if status==200.
295 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000296 error = content_json.get('error')
297 if error.get('code') == 403:
298 raise BuildbucketResponseException(
299 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000300 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000301 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000302 raise BuildbucketResponseException(msg)
303
304 if response.status == 200:
305 if not content_json:
306 raise BuildbucketResponseException(
307 'Buildbucket returns invalid json content: %s.\n'
308 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
309 content)
310 return content_json
311 if response.status < 500 or try_count >= 2:
312 raise httplib2.HttpLib2Error(content)
313
314 # status >= 500 means transient failures.
315 logging.debug('Transient errors when %s. Will retry.', operation_name)
316 time.sleep(0.5 + 1.5*try_count)
317 try_count += 1
318 assert False, 'unreachable'
319
320
machenbach@chromium.org45453142015-09-15 08:45:22 +0000321def trigger_try_jobs(auth_config, changelist, options, masters, category):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000322 rietveld_url = settings.GetDefaultServerUrl()
323 rietveld_host = urlparse.urlparse(rietveld_url).hostname
324 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
325 http = authenticator.authorize(httplib2.Http())
326 http.force_exception_to_status_code = True
327 issue_props = changelist.GetIssueProperties()
328 issue = changelist.GetIssue()
329 patchset = changelist.GetMostRecentPatchset()
machenbach@chromium.org45453142015-09-15 08:45:22 +0000330 properties = _get_properties_from_options(options)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000331
332 buildbucket_put_url = (
333 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000334 hostname=options.buildbucket_host))
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000335 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
336 hostname=rietveld_host,
337 issue=issue,
338 patch=patchset)
339
340 batch_req_body = {'builds': []}
341 print_text = []
342 print_text.append('Tried jobs on:')
343 for master, builders_and_tests in sorted(masters.iteritems()):
344 print_text.append('Master: %s' % master)
345 bucket = _prefix_master(master)
346 for builder, tests in sorted(builders_and_tests.iteritems()):
347 print_text.append(' %s: %s' % (builder, tests))
348 parameters = {
349 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000350 'changes': [{
351 'author': {'email': issue_props['owner_email']},
352 'revision': options.revision,
353 }],
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000354 'properties': {
355 'category': category,
356 'issue': issue,
357 'master': master,
358 'patch_project': issue_props['project'],
359 'patch_storage': 'rietveld',
360 'patchset': patchset,
361 'reason': options.name,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000362 'rietveld': rietveld_url,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000363 },
364 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000365 if 'presubmit' in builder.lower():
366 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000367 if tests:
368 parameters['properties']['testfilter'] = tests
machenbach@chromium.org45453142015-09-15 08:45:22 +0000369 if properties:
370 parameters['properties'].update(properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000371 if options.clobber:
372 parameters['properties']['clobber'] = True
373 batch_req_body['builds'].append(
374 {
375 'bucket': bucket,
376 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000377 'client_operation_id': str(uuid.uuid4()),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000378 'tags': ['builder:%s' % builder,
379 'buildset:%s' % buildset,
380 'master:%s' % master,
381 'user_agent:git_cl_try']
382 }
383 )
384
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000385 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700386 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000387 http,
388 buildbucket_put_url,
389 'PUT',
390 body=json.dumps(batch_req_body),
391 headers={'Content-Type': 'application/json'}
392 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000393 print_text.append('To see results here, run: git cl try-results')
394 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700395 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000396
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000397
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000398def fetch_try_jobs(auth_config, changelist, options):
qyearsleyeab3c042016-08-24 09:18:28 -0700399 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000400
qyearsley53f48a12016-09-01 10:45:13 -0700401 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000402 """
403 rietveld_url = settings.GetDefaultServerUrl()
404 rietveld_host = urlparse.urlparse(rietveld_url).hostname
405 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
406 if authenticator.has_cached_credentials():
407 http = authenticator.authorize(httplib2.Http())
408 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700409 print('Warning: Some results might be missing because %s' %
410 # Get the message on how to login.
411 (auth.LoginRequiredError(rietveld_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000412 http = httplib2.Http()
413
414 http.force_exception_to_status_code = True
415
416 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
417 hostname=rietveld_host,
418 issue=changelist.GetIssue(),
419 patch=options.patchset)
420 params = {'tag': 'buildset:%s' % buildset}
421
422 builds = {}
423 while True:
424 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
425 hostname=options.buildbucket_host,
426 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700427 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000428 for build in content.get('builds', []):
429 builds[build['id']] = build
430 if 'next_cursor' in content:
431 params['start_cursor'] = content['next_cursor']
432 else:
433 break
434 return builds
435
436
qyearsleyeab3c042016-08-24 09:18:28 -0700437def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000438 """Prints nicely result of fetch_try_jobs."""
439 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700440 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000441 return
442
443 # Make a copy, because we'll be modifying builds dictionary.
444 builds = builds.copy()
445 builder_names_cache = {}
446
447 def get_builder(b):
448 try:
449 return builder_names_cache[b['id']]
450 except KeyError:
451 try:
452 parameters = json.loads(b['parameters_json'])
453 name = parameters['builder_name']
454 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700455 print('WARNING: failed to get builder name for build %s: %s' % (
456 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000457 name = None
458 builder_names_cache[b['id']] = name
459 return name
460
461 def get_bucket(b):
462 bucket = b['bucket']
463 if bucket.startswith('master.'):
464 return bucket[len('master.'):]
465 return bucket
466
467 if options.print_master:
468 name_fmt = '%%-%ds %%-%ds' % (
469 max(len(str(get_bucket(b))) for b in builds.itervalues()),
470 max(len(str(get_builder(b))) for b in builds.itervalues()))
471 def get_name(b):
472 return name_fmt % (get_bucket(b), get_builder(b))
473 else:
474 name_fmt = '%%-%ds' % (
475 max(len(str(get_builder(b))) for b in builds.itervalues()))
476 def get_name(b):
477 return name_fmt % get_builder(b)
478
479 def sort_key(b):
480 return b['status'], b.get('result'), get_name(b), b.get('url')
481
482 def pop(title, f, color=None, **kwargs):
483 """Pop matching builds from `builds` dict and print them."""
484
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000485 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000486 colorize = str
487 else:
488 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
489
490 result = []
491 for b in builds.values():
492 if all(b.get(k) == v for k, v in kwargs.iteritems()):
493 builds.pop(b['id'])
494 result.append(b)
495 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700496 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000497 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700498 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000499
500 total = len(builds)
501 pop(status='COMPLETED', result='SUCCESS',
502 title='Successes:', color=Fore.GREEN,
503 f=lambda b: (get_name(b), b.get('url')))
504 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
505 title='Infra Failures:', color=Fore.MAGENTA,
506 f=lambda b: (get_name(b), b.get('url')))
507 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
508 title='Failures:', color=Fore.RED,
509 f=lambda b: (get_name(b), b.get('url')))
510 pop(status='COMPLETED', result='CANCELED',
511 title='Canceled:', color=Fore.MAGENTA,
512 f=lambda b: (get_name(b),))
513 pop(status='COMPLETED', result='FAILURE',
514 failure_reason='INVALID_BUILD_DEFINITION',
515 title='Wrong master/builder name:', color=Fore.MAGENTA,
516 f=lambda b: (get_name(b),))
517 pop(status='COMPLETED', result='FAILURE',
518 title='Other failures:',
519 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
520 pop(status='COMPLETED',
521 title='Other finished:',
522 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
523 pop(status='STARTED',
524 title='Started:', color=Fore.YELLOW,
525 f=lambda b: (get_name(b), b.get('url')))
526 pop(status='SCHEDULED',
527 title='Scheduled:',
528 f=lambda b: (get_name(b), 'id=%s' % b['id']))
529 # The last section is just in case buildbucket API changes OR there is a bug.
530 pop(title='Other:',
531 f=lambda b: (get_name(b), 'id=%s' % b['id']))
532 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700533 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000534
535
qyearsley53f48a12016-09-01 10:45:13 -0700536def write_try_results_json(output_file, builds):
537 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
538
539 The input |builds| dict is assumed to be generated by Buildbucket.
540 Buildbucket documentation: http://goo.gl/G0s101
541 """
542
543 def convert_build_dict(build):
544 return {
545 'buildbucket_id': build.get('id'),
546 'status': build.get('status'),
547 'result': build.get('result'),
548 'bucket': build.get('bucket'),
549 'builder_name': json.loads(
550 build.get('parameters_json', '{}')).get('builder_name'),
551 'failure_reason': build.get('failure_reason'),
552 'url': build.get('url'),
553 }
554
555 converted = []
556 for _, build in sorted(builds.items()):
557 converted.append(convert_build_dict(build))
558 write_json(output_file, converted)
559
560
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000561def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
562 """Return the corresponding git ref if |base_url| together with |glob_spec|
563 matches the full |url|.
564
565 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
566 """
567 fetch_suburl, as_ref = glob_spec.split(':')
568 if allow_wildcards:
569 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
570 if glob_match:
571 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
572 # "branches/{472,597,648}/src:refs/remotes/svn/*".
573 branch_re = re.escape(base_url)
574 if glob_match.group(1):
575 branch_re += '/' + re.escape(glob_match.group(1))
576 wildcard = glob_match.group(2)
577 if wildcard == '*':
578 branch_re += '([^/]*)'
579 else:
580 # Escape and replace surrounding braces with parentheses and commas
581 # with pipe symbols.
582 wildcard = re.escape(wildcard)
583 wildcard = re.sub('^\\\\{', '(', wildcard)
584 wildcard = re.sub('\\\\,', '|', wildcard)
585 wildcard = re.sub('\\\\}$', ')', wildcard)
586 branch_re += wildcard
587 if glob_match.group(3):
588 branch_re += re.escape(glob_match.group(3))
589 match = re.match(branch_re, url)
590 if match:
591 return re.sub('\*$', match.group(1), as_ref)
592
593 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
594 if fetch_suburl:
595 full_url = base_url + '/' + fetch_suburl
596 else:
597 full_url = base_url
598 if full_url == url:
599 return as_ref
600 return None
601
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000602
iannucci@chromium.org79540052012-10-19 23:15:26 +0000603def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000604 """Prints statistics about the change to the user."""
605 # --no-ext-diff is broken in some versions of Git, so try to work around
606 # this by overriding the environment (but there is still a problem if the
607 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000608 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000609 if 'GIT_EXTERNAL_DIFF' in env:
610 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000611
612 if find_copies:
613 similarity_options = ['--find-copies-harder', '-l100000',
614 '-C%s' % similarity]
615 else:
616 similarity_options = ['-M%s' % similarity]
617
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000618 try:
619 stdout = sys.stdout.fileno()
620 except AttributeError:
621 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000622 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000623 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000624 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000625 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000626
627
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000628class BuildbucketResponseException(Exception):
629 pass
630
631
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000632class Settings(object):
633 def __init__(self):
634 self.default_server = None
635 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000636 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000637 self.is_git_svn = None
638 self.svn_branch = None
639 self.tree_status_url = None
640 self.viewvc_url = None
641 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000642 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000643 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000644 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000645 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000646 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000647 self.force_https_commit_url = None
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000648 self.pending_ref_prefix = None
tandriif46c20f2016-09-14 06:17:05 -0700649 self.git_number_footer = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000650
651 def LazyUpdateIfNeeded(self):
652 """Updates the settings from a codereview.settings file, if available."""
653 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000654 # The only value that actually changes the behavior is
655 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000656 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000657 error_ok=True
658 ).strip().lower()
659
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000660 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000661 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000662 LoadCodereviewSettingsFromFile(cr_settings_file)
663 self.updated = True
664
665 def GetDefaultServerUrl(self, error_ok=False):
666 if not self.default_server:
667 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000668 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000669 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000670 if error_ok:
671 return self.default_server
672 if not self.default_server:
673 error_message = ('Could not find settings file. You must configure '
674 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000675 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000676 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000677 return self.default_server
678
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000679 @staticmethod
680 def GetRelativeRoot():
681 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000682
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000683 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000684 if self.root is None:
685 self.root = os.path.abspath(self.GetRelativeRoot())
686 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000687
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000688 def GetGitMirror(self, remote='origin'):
689 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000690 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000691 if not os.path.isdir(local_url):
692 return None
693 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
694 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
695 # Use the /dev/null print_func to avoid terminal spew in WaitForRealCommit.
696 mirror = git_cache.Mirror(remote_url, print_func = lambda *args: None)
697 if mirror.exists():
698 return mirror
699 return None
700
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000701 def GetIsGitSvn(self):
702 """Return true if this repo looks like it's using git-svn."""
703 if self.is_git_svn is None:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000704 if self.GetPendingRefPrefix():
705 # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what.
706 self.is_git_svn = False
707 else:
708 # If you have any "svn-remote.*" config keys, we think you're using svn.
709 self.is_git_svn = RunGitWithCode(
710 ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000711 return self.is_git_svn
712
713 def GetSVNBranch(self):
714 if self.svn_branch is None:
715 if not self.GetIsGitSvn():
716 DieWithError('Repo doesn\'t appear to be a git-svn repo.')
717
718 # Try to figure out which remote branch we're based on.
719 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000720 # 1) iterate through our branch history and find the svn URL.
721 # 2) find the svn-remote that fetches from the URL.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000722
723 # regexp matching the git-svn line that contains the URL.
724 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
725
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000726 # We don't want to go through all of history, so read a line from the
727 # pipe at a time.
728 # The -100 is an arbitrary limit so we don't search forever.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000729 cmd = ['git', 'log', '-100', '--pretty=medium']
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000730 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE,
731 env=GetNoGitPagerEnv())
maruel@chromium.org740f9d72011-06-10 18:33:10 +0000732 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000733 for line in proc.stdout:
734 match = git_svn_re.match(line)
735 if match:
736 url = match.group(1)
737 proc.stdout.close() # Cut pipe.
738 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000739
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000740 if url:
741 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
742 remotes = RunGit(['config', '--get-regexp',
743 r'^svn-remote\..*\.url']).splitlines()
744 for remote in remotes:
745 match = svn_remote_re.match(remote)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000746 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000747 remote = match.group(1)
748 base_url = match.group(2)
szager@chromium.org4ac25532013-12-16 22:07:02 +0000749 rewrite_root = RunGit(
750 ['config', 'svn-remote.%s.rewriteRoot' % remote],
751 error_ok=True).strip()
752 if rewrite_root:
753 base_url = rewrite_root
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000754 fetch_spec = RunGit(
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000755 ['config', 'svn-remote.%s.fetch' % remote],
756 error_ok=True).strip()
757 if fetch_spec:
758 self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
759 if self.svn_branch:
760 break
761 branch_spec = RunGit(
762 ['config', 'svn-remote.%s.branches' % remote],
763 error_ok=True).strip()
764 if branch_spec:
765 self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
766 if self.svn_branch:
767 break
768 tag_spec = RunGit(
769 ['config', 'svn-remote.%s.tags' % remote],
770 error_ok=True).strip()
771 if tag_spec:
772 self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
773 if self.svn_branch:
774 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775
776 if not self.svn_branch:
777 DieWithError('Can\'t guess svn branch -- try specifying it on the '
778 'command line')
779
780 return self.svn_branch
781
782 def GetTreeStatusUrl(self, error_ok=False):
783 if not self.tree_status_url:
784 error_message = ('You must configure your tree status URL by running '
785 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000786 self.tree_status_url = self._GetRietveldConfig(
787 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000788 return self.tree_status_url
789
790 def GetViewVCUrl(self):
791 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000792 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000793 return self.viewvc_url
794
rmistry@google.com90752582014-01-14 21:04:50 +0000795 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000796 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000797
rmistry@google.com78948ed2015-07-08 23:09:57 +0000798 def GetIsSkipDependencyUpload(self, branch_name):
799 """Returns true if specified branch should skip dep uploads."""
800 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
801 error_ok=True)
802
rmistry@google.com5626a922015-02-26 14:03:30 +0000803 def GetRunPostUploadHook(self):
804 run_post_upload_hook = self._GetRietveldConfig(
805 'run-post-upload-hook', error_ok=True)
806 return run_post_upload_hook == "True"
807
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000808 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000809 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000810
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000811 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000812 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000813
ukai@chromium.orge8077812012-02-03 03:41:46 +0000814 def GetIsGerrit(self):
815 """Return true if this repo is assosiated with gerrit code review system."""
816 if self.is_gerrit is None:
817 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
818 return self.is_gerrit
819
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000820 def GetSquashGerritUploads(self):
821 """Return true if uploads to Gerrit should be squashed by default."""
822 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700823 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
824 if self.squash_gerrit_uploads is None:
825 # Default is squash now (http://crbug.com/611892#c23).
826 self.squash_gerrit_uploads = not (
827 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
828 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000829 return self.squash_gerrit_uploads
830
tandriia60502f2016-06-20 02:01:53 -0700831 def GetSquashGerritUploadsOverride(self):
832 """Return True or False if codereview.settings should be overridden.
833
834 Returns None if no override has been defined.
835 """
836 # See also http://crbug.com/611892#c23
837 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
838 error_ok=True).strip()
839 if result == 'true':
840 return True
841 if result == 'false':
842 return False
843 return None
844
tandrii@chromium.org28253532016-04-14 13:46:56 +0000845 def GetGerritSkipEnsureAuthenticated(self):
846 """Return True if EnsureAuthenticated should not be done for Gerrit
847 uploads."""
848 if self.gerrit_skip_ensure_authenticated is None:
849 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000850 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000851 error_ok=True).strip() == 'true')
852 return self.gerrit_skip_ensure_authenticated
853
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000854 def GetGitEditor(self):
855 """Return the editor specified in the git config, or None if none is."""
856 if self.git_editor is None:
857 self.git_editor = self._GetConfig('core.editor', error_ok=True)
858 return self.git_editor or None
859
thestig@chromium.org44202a22014-03-11 19:22:18 +0000860 def GetLintRegex(self):
861 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
862 DEFAULT_LINT_REGEX)
863
864 def GetLintIgnoreRegex(self):
865 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
866 DEFAULT_LINT_IGNORE_REGEX)
867
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000868 def GetProject(self):
869 if not self.project:
870 self.project = self._GetRietveldConfig('project', error_ok=True)
871 return self.project
872
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000873 def GetForceHttpsCommitUrl(self):
874 if not self.force_https_commit_url:
875 self.force_https_commit_url = self._GetRietveldConfig(
876 'force-https-commit-url', error_ok=True)
877 return self.force_https_commit_url
878
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000879 def GetPendingRefPrefix(self):
880 if not self.pending_ref_prefix:
881 self.pending_ref_prefix = self._GetRietveldConfig(
882 'pending-ref-prefix', error_ok=True)
883 return self.pending_ref_prefix
884
tandriif46c20f2016-09-14 06:17:05 -0700885 def GetHasGitNumberFooter(self):
886 # TODO(tandrii): this has to be removed after Rietveld is read-only.
887 # see also bugs http://crbug.com/642493 and http://crbug.com/600469.
888 if not self.git_number_footer:
889 self.git_number_footer = self._GetRietveldConfig(
890 'git-number-footer', error_ok=True)
891 return self.git_number_footer
892
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000893 def _GetRietveldConfig(self, param, **kwargs):
894 return self._GetConfig('rietveld.' + param, **kwargs)
895
rmistry@google.com78948ed2015-07-08 23:09:57 +0000896 def _GetBranchConfig(self, branch_name, param, **kwargs):
897 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
898
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000899 def _GetConfig(self, param, **kwargs):
900 self.LazyUpdateIfNeeded()
901 return RunGit(['config', param], **kwargs).strip()
902
903
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000904def ShortBranchName(branch):
905 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000906 return branch.replace('refs/heads/', '', 1)
907
908
909def GetCurrentBranchRef():
910 """Returns branch ref (e.g., refs/heads/master) or None."""
911 return RunGit(['symbolic-ref', 'HEAD'],
912 stderr=subprocess2.VOID, error_ok=True).strip() or None
913
914
915def GetCurrentBranch():
916 """Returns current branch or None.
917
918 For refs/heads/* branches, returns just last part. For others, full ref.
919 """
920 branchref = GetCurrentBranchRef()
921 if branchref:
922 return ShortBranchName(branchref)
923 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000924
925
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000926class _CQState(object):
927 """Enum for states of CL with respect to Commit Queue."""
928 NONE = 'none'
929 DRY_RUN = 'dry_run'
930 COMMIT = 'commit'
931
932 ALL_STATES = [NONE, DRY_RUN, COMMIT]
933
934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000935class _ParsedIssueNumberArgument(object):
936 def __init__(self, issue=None, patchset=None, hostname=None):
937 self.issue = issue
938 self.patchset = patchset
939 self.hostname = hostname
940
941 @property
942 def valid(self):
943 return self.issue is not None
944
945
946class _RietveldParsedIssueNumberArgument(_ParsedIssueNumberArgument):
947 def __init__(self, *args, **kwargs):
948 self.patch_url = kwargs.pop('patch_url', None)
949 super(_RietveldParsedIssueNumberArgument, self).__init__(*args, **kwargs)
950
951
952def ParseIssueNumberArgument(arg):
953 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
954 fail_result = _ParsedIssueNumberArgument()
955
956 if arg.isdigit():
957 return _ParsedIssueNumberArgument(issue=int(arg))
958 if not arg.startswith('http'):
959 return fail_result
960 url = gclient_utils.UpgradeToHttps(arg)
961 try:
962 parsed_url = urlparse.urlparse(url)
963 except ValueError:
964 return fail_result
965 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
966 tmp = cls.ParseIssueURL(parsed_url)
967 if tmp is not None:
968 return tmp
969 return fail_result
970
971
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000972class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000973 """Changelist works with one changelist in local branch.
974
975 Supports two codereview backends: Rietveld or Gerrit, selected at object
976 creation.
977
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000978 Notes:
979 * Not safe for concurrent multi-{thread,process} use.
980 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -0700981 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000982 """
983
984 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
985 """Create a new ChangeList instance.
986
987 If issue is given, the codereview must be given too.
988
989 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
990 Otherwise, it's decided based on current configuration of the local branch,
991 with default being 'rietveld' for backwards compatibility.
992 See _load_codereview_impl for more details.
993
994 **kwargs will be passed directly to codereview implementation.
995 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000996 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000997 global settings
998 if not settings:
999 # Happens when git_cl.py is used as a utility library.
1000 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001001
1002 if issue:
1003 assert codereview, 'codereview must be known, if issue is known'
1004
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001005 self.branchref = branchref
1006 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001007 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008 self.branch = ShortBranchName(self.branchref)
1009 else:
1010 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001011 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001012 self.lookedup_issue = False
1013 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 self.has_description = False
1015 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001016 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001017 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001018 self.cc = None
1019 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001020 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001021
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001022 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001023 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001024 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001025 assert self._codereview_impl
1026 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001027
1028 def _load_codereview_impl(self, codereview=None, **kwargs):
1029 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001030 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1031 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1032 self._codereview = codereview
1033 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001034 return
1035
1036 # Automatic selection based on issue number set for a current branch.
1037 # Rietveld takes precedence over Gerrit.
1038 assert not self.issue
1039 # Whether we find issue or not, we are doing the lookup.
1040 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001041 if self.GetBranch():
1042 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1043 issue = _git_get_branch_config_value(
1044 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1045 if issue:
1046 self._codereview = codereview
1047 self._codereview_impl = cls(self, **kwargs)
1048 self.issue = int(issue)
1049 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001050
1051 # No issue is set for this branch, so decide based on repo-wide settings.
1052 return self._load_codereview_impl(
1053 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1054 **kwargs)
1055
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001056 def IsGerrit(self):
1057 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001058
1059 def GetCCList(self):
1060 """Return the users cc'd on this CL.
1061
agable92bec4f2016-08-24 09:27:27 -07001062 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001063 """
1064 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001065 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001066 more_cc = ','.join(self.watchers)
1067 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1068 return self.cc
1069
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001070 def GetCCListWithoutDefault(self):
1071 """Return the users cc'd on this CL excluding default ones."""
1072 if self.cc is None:
1073 self.cc = ','.join(self.watchers)
1074 return self.cc
1075
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001076 def SetWatchers(self, watchers):
1077 """Set the list of email addresses that should be cc'd based on the changed
1078 files in this CL.
1079 """
1080 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001081
1082 def GetBranch(self):
1083 """Returns the short branch name, e.g. 'master'."""
1084 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001085 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001086 if not branchref:
1087 return None
1088 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001089 self.branch = ShortBranchName(self.branchref)
1090 return self.branch
1091
1092 def GetBranchRef(self):
1093 """Returns the full branch name, e.g. 'refs/heads/master'."""
1094 self.GetBranch() # Poke the lazy loader.
1095 return self.branchref
1096
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001097 def ClearBranch(self):
1098 """Clears cached branch data of this object."""
1099 self.branch = self.branchref = None
1100
tandrii5d48c322016-08-18 16:19:37 -07001101 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1102 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1103 kwargs['branch'] = self.GetBranch()
1104 return _git_get_branch_config_value(key, default, **kwargs)
1105
1106 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1107 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1108 assert self.GetBranch(), (
1109 'this CL must have an associated branch to %sset %s%s' %
1110 ('un' if value is None else '',
1111 key,
1112 '' if value is None else ' to %r' % value))
1113 kwargs['branch'] = self.GetBranch()
1114 return _git_set_branch_config_value(key, value, **kwargs)
1115
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 @staticmethod
1117 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001118 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001119 e.g. 'origin', 'refs/heads/master'
1120 """
1121 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001122 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1123
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001124 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001125 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001127 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1128 error_ok=True).strip()
1129 if upstream_branch:
1130 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001132 # Fall back on trying a git-svn upstream branch.
1133 if settings.GetIsGitSvn():
1134 upstream_branch = settings.GetSVNBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001135 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001136 # Else, try to guess the origin remote.
1137 remote_branches = RunGit(['branch', '-r']).split()
1138 if 'origin/master' in remote_branches:
1139 # Fall back on origin/master if it exits.
1140 remote = 'origin'
1141 upstream_branch = 'refs/heads/master'
1142 elif 'origin/trunk' in remote_branches:
1143 # Fall back on origin/trunk if it exists. Generally a shared
1144 # git-svn clone
1145 remote = 'origin'
1146 upstream_branch = 'refs/heads/trunk'
1147 else:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001148 DieWithError(
1149 'Unable to determine default branch to diff against.\n'
1150 'Either pass complete "git diff"-style arguments, like\n'
1151 ' git cl upload origin/master\n'
1152 'or verify this branch is set up to track another \n'
1153 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001154
1155 return remote, upstream_branch
1156
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001157 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001158 upstream_branch = self.GetUpstreamBranch()
1159 if not BranchExists(upstream_branch):
1160 DieWithError('The upstream for the current branch (%s) does not exist '
1161 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001162 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001163 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001164
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001165 def GetUpstreamBranch(self):
1166 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001167 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001168 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001169 upstream_branch = upstream_branch.replace('refs/heads/',
1170 'refs/remotes/%s/' % remote)
1171 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1172 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001173 self.upstream_branch = upstream_branch
1174 return self.upstream_branch
1175
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001176 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001177 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001178 remote, branch = None, self.GetBranch()
1179 seen_branches = set()
1180 while branch not in seen_branches:
1181 seen_branches.add(branch)
1182 remote, branch = self.FetchUpstreamTuple(branch)
1183 branch = ShortBranchName(branch)
1184 if remote != '.' or branch.startswith('refs/remotes'):
1185 break
1186 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001187 remotes = RunGit(['remote'], error_ok=True).split()
1188 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001190 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001191 remote = 'origin'
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001192 logging.warning('Could not determine which remote this change is '
1193 'associated with, so defaulting to "%s". This may '
1194 'not be what you want. You may prevent this message '
1195 'by running "git svn info" as documented here: %s',
1196 self._remote,
1197 GIT_INSTRUCTIONS_URL)
1198 else:
1199 logging.warn('Could not determine which remote this change is '
1200 'associated with. You may prevent this message by '
1201 'running "git svn info" as documented here: %s',
1202 GIT_INSTRUCTIONS_URL)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001203 branch = 'HEAD'
1204 if branch.startswith('refs/remotes'):
1205 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001206 elif branch.startswith('refs/branch-heads/'):
1207 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001208 else:
1209 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001210 return self._remote
1211
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001212 def GitSanityChecks(self, upstream_git_obj):
1213 """Checks git repo status and ensures diff is from local commits."""
1214
sbc@chromium.org79706062015-01-14 21:18:12 +00001215 if upstream_git_obj is None:
1216 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001217 print('ERROR: unable to determine current branch (detached HEAD?)',
1218 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001219 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001220 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001221 return False
1222
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001223 # Verify the commit we're diffing against is in our current branch.
1224 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1225 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1226 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001227 print('ERROR: %s is not in the current branch. You may need to rebase '
1228 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001229 return False
1230
1231 # List the commits inside the diff, and verify they are all local.
1232 commits_in_diff = RunGit(
1233 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1234 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1235 remote_branch = remote_branch.strip()
1236 if code != 0:
1237 _, remote_branch = self.GetRemoteBranch()
1238
1239 commits_in_remote = RunGit(
1240 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1241
1242 common_commits = set(commits_in_diff) & set(commits_in_remote)
1243 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001244 print('ERROR: Your diff contains %d commits already in %s.\n'
1245 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1246 'the diff. If you are using a custom git flow, you can override'
1247 ' the reference used for this check with "git config '
1248 'gitcl.remotebranch <git-ref>".' % (
1249 len(common_commits), remote_branch, upstream_git_obj),
1250 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001251 return False
1252 return True
1253
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001254 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001255 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001256
1257 Returns None if it is not set.
1258 """
tandrii5d48c322016-08-18 16:19:37 -07001259 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001260
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00001261 def GetGitSvnRemoteUrl(self):
1262 """Return the configured git-svn remote URL parsed from git svn info.
1263
1264 Returns None if it is not set.
1265 """
1266 # URL is dependent on the current directory.
1267 data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
1268 if data:
1269 keys = dict(line.split(': ', 1) for line in data.splitlines()
1270 if ': ' in line)
1271 return keys.get('URL', None)
1272 return None
1273
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001274 def GetRemoteUrl(self):
1275 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1276
1277 Returns None if there is no remote.
1278 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001279 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001280 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1281
1282 # If URL is pointing to a local directory, it is probably a git cache.
1283 if os.path.isdir(url):
1284 url = RunGit(['config', 'remote.%s.url' % remote],
1285 error_ok=True,
1286 cwd=url).strip()
1287 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001289 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001290 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001291 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001292 self.issue = self._GitGetBranchConfigValue(
1293 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001294 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001295 return self.issue
1296
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001297 def GetIssueURL(self):
1298 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001299 issue = self.GetIssue()
1300 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001301 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001302 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001303
1304 def GetDescription(self, pretty=False):
1305 if not self.has_description:
1306 if self.GetIssue():
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001307 self.description = self._codereview_impl.FetchDescription()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001308 self.has_description = True
1309 if pretty:
1310 wrapper = textwrap.TextWrapper()
1311 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1312 return wrapper.fill(self.description)
1313 return self.description
1314
1315 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001316 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001317 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001318 self.patchset = self._GitGetBranchConfigValue(
1319 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001320 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001321 return self.patchset
1322
1323 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001324 """Set this branch's patchset. If patchset=0, clears the patchset."""
1325 assert self.GetBranch()
1326 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001327 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001328 else:
1329 self.patchset = int(patchset)
1330 self._GitSetBranchConfigValue(
1331 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001332
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001333 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001334 """Set this branch's issue. If issue isn't given, clears the issue."""
1335 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001336 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001337 issue = int(issue)
1338 self._GitSetBranchConfigValue(
1339 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001340 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001341 codereview_server = self._codereview_impl.GetCodereviewServer()
1342 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001343 self._GitSetBranchConfigValue(
1344 self._codereview_impl.CodereviewServerConfigKey(),
1345 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001346 else:
tandrii5d48c322016-08-18 16:19:37 -07001347 # Reset all of these just to be clean.
1348 reset_suffixes = [
1349 'last-upload-hash',
1350 self._codereview_impl.IssueConfigKey(),
1351 self._codereview_impl.PatchsetConfigKey(),
1352 self._codereview_impl.CodereviewServerConfigKey(),
1353 ] + self._PostUnsetIssueProperties()
1354 for prop in reset_suffixes:
1355 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001356 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001357 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001358
dnjba1b0f32016-09-02 12:37:42 -07001359 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001360 if not self.GitSanityChecks(upstream_branch):
1361 DieWithError('\nGit sanity check failure')
1362
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001363 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001364 if not root:
1365 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001366 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001367
1368 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001369 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001370 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001371 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001372 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001373 except subprocess2.CalledProcessError:
1374 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001375 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001376 'This branch probably doesn\'t exist anymore. To reset the\n'
1377 'tracking branch, please run\n'
1378 ' git branch --set-upstream %s trunk\n'
1379 'replacing trunk with origin/master or the relevant branch') %
1380 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001381
maruel@chromium.org52424302012-08-29 15:14:30 +00001382 issue = self.GetIssue()
1383 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001384 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001385 description = self.GetDescription()
1386 else:
1387 # If the change was never uploaded, use the log messages of all commits
1388 # up to the branch point, as git cl upload will prefill the description
1389 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001390 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1391 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001392
1393 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001394 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001395 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001396 name,
1397 description,
1398 absroot,
1399 files,
1400 issue,
1401 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001402 author,
1403 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001404
dsansomee2d6fd92016-09-08 00:10:47 -07001405 def UpdateDescription(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001406 self.description = description
dsansomee2d6fd92016-09-08 00:10:47 -07001407 return self._codereview_impl.UpdateDescriptionRemote(
1408 description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001409
1410 def RunHook(self, committing, may_prompt, verbose, change):
1411 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1412 try:
1413 return presubmit_support.DoPresubmitChecks(change, committing,
1414 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1415 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001416 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1417 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001418 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001419 DieWithError(
1420 ('%s\nMaybe your depot_tools is out of date?\n'
1421 'If all fails, contact maruel@') % e)
1422
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001423 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1424 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001425 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1426 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001427 else:
1428 # Assume url.
1429 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1430 urlparse.urlparse(issue_arg))
1431 if not parsed_issue_arg or not parsed_issue_arg.valid:
1432 DieWithError('Failed to parse issue argument "%s". '
1433 'Must be an issue number or a valid URL.' % issue_arg)
1434 return self._codereview_impl.CMDPatchWithParsedIssue(
1435 parsed_issue_arg, reject, nocommit, directory)
1436
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001437 def CMDUpload(self, options, git_diff_args, orig_args):
1438 """Uploads a change to codereview."""
1439 if git_diff_args:
1440 # TODO(ukai): is it ok for gerrit case?
1441 base_branch = git_diff_args[0]
1442 else:
1443 if self.GetBranch() is None:
1444 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1445
1446 # Default to diffing against common ancestor of upstream branch
1447 base_branch = self.GetCommonAncestorWithUpstream()
1448 git_diff_args = [base_branch, 'HEAD']
1449
1450 # Make sure authenticated to codereview before running potentially expensive
1451 # hooks. It is a fast, best efforts check. Codereview still can reject the
1452 # authentication during the actual upload.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001453 self._codereview_impl.EnsureAuthenticated(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001454
1455 # Apply watchlists on upload.
1456 change = self.GetChange(base_branch, None)
1457 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1458 files = [f.LocalPath() for f in change.AffectedFiles()]
1459 if not options.bypass_watchlists:
1460 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1461
1462 if not options.bypass_hooks:
1463 if options.reviewers or options.tbr_owners:
1464 # Set the reviewer list now so that presubmit checks can access it.
1465 change_description = ChangeDescription(change.FullDescriptionText())
1466 change_description.update_reviewers(options.reviewers,
1467 options.tbr_owners,
1468 change)
1469 change.SetDescriptionText(change_description.description)
1470 hook_results = self.RunHook(committing=False,
1471 may_prompt=not options.force,
1472 verbose=options.verbose,
1473 change=change)
1474 if not hook_results.should_continue():
1475 return 1
1476 if not options.reviewers and hook_results.reviewers:
1477 options.reviewers = hook_results.reviewers.split(',')
1478
1479 if self.GetIssue():
1480 latest_patchset = self.GetMostRecentPatchset()
1481 local_patchset = self.GetPatchset()
1482 if (latest_patchset and local_patchset and
1483 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001484 print('The last upload made from this repository was patchset #%d but '
1485 'the most recent patchset on the server is #%d.'
1486 % (local_patchset, latest_patchset))
1487 print('Uploading will still work, but if you\'ve uploaded to this '
1488 'issue from another machine or branch the patch you\'re '
1489 'uploading now might not include those changes.')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001490 ask_for_data('About to upload; enter to confirm.')
1491
1492 print_stats(options.similarity, options.find_copies, git_diff_args)
1493 ret = self.CMDUploadChange(options, git_diff_args, change)
1494 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001495 if options.use_commit_queue:
1496 self.SetCQState(_CQState.COMMIT)
1497 elif options.cq_dry_run:
1498 self.SetCQState(_CQState.DRY_RUN)
1499
tandrii5d48c322016-08-18 16:19:37 -07001500 _git_set_branch_config_value('last-upload-hash',
1501 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001502 # Run post upload hooks, if specified.
1503 if settings.GetRunPostUploadHook():
1504 presubmit_support.DoPostUploadExecuter(
1505 change,
1506 self,
1507 settings.GetRoot(),
1508 options.verbose,
1509 sys.stdout)
1510
1511 # Upload all dependencies if specified.
1512 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001513 print()
1514 print('--dependencies has been specified.')
1515 print('All dependent local branches will be re-uploaded.')
1516 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001517 # Remove the dependencies flag from args so that we do not end up in a
1518 # loop.
1519 orig_args.remove('--dependencies')
1520 ret = upload_branch_deps(self, orig_args)
1521 return ret
1522
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001523 def SetCQState(self, new_state):
1524 """Update the CQ state for latest patchset.
1525
1526 Issue must have been already uploaded and known.
1527 """
1528 assert new_state in _CQState.ALL_STATES
1529 assert self.GetIssue()
1530 return self._codereview_impl.SetCQState(new_state)
1531
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001532 # Forward methods to codereview specific implementation.
1533
1534 def CloseIssue(self):
1535 return self._codereview_impl.CloseIssue()
1536
1537 def GetStatus(self):
1538 return self._codereview_impl.GetStatus()
1539
1540 def GetCodereviewServer(self):
1541 return self._codereview_impl.GetCodereviewServer()
1542
1543 def GetApprovingReviewers(self):
1544 return self._codereview_impl.GetApprovingReviewers()
1545
1546 def GetMostRecentPatchset(self):
1547 return self._codereview_impl.GetMostRecentPatchset()
1548
1549 def __getattr__(self, attr):
1550 # This is because lots of untested code accesses Rietveld-specific stuff
1551 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001552 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001553 # Note that child method defines __getattr__ as well, and forwards it here,
1554 # because _RietveldChangelistImpl is not cleaned up yet, and given
1555 # deprecation of Rietveld, it should probably be just removed.
1556 # Until that time, avoid infinite recursion by bypassing __getattr__
1557 # of implementation class.
1558 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001559
1560
1561class _ChangelistCodereviewBase(object):
1562 """Abstract base class encapsulating codereview specifics of a changelist."""
1563 def __init__(self, changelist):
1564 self._changelist = changelist # instance of Changelist
1565
1566 def __getattr__(self, attr):
1567 # Forward methods to changelist.
1568 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1569 # _RietveldChangelistImpl to avoid this hack?
1570 return getattr(self._changelist, attr)
1571
1572 def GetStatus(self):
1573 """Apply a rough heuristic to give a simple summary of an issue's review
1574 or CQ status, assuming adherence to a common workflow.
1575
1576 Returns None if no issue for this branch, or specific string keywords.
1577 """
1578 raise NotImplementedError()
1579
1580 def GetCodereviewServer(self):
1581 """Returns server URL without end slash, like "https://codereview.com"."""
1582 raise NotImplementedError()
1583
1584 def FetchDescription(self):
1585 """Fetches and returns description from the codereview server."""
1586 raise NotImplementedError()
1587
tandrii5d48c322016-08-18 16:19:37 -07001588 @classmethod
1589 def IssueConfigKey(cls):
1590 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001591 raise NotImplementedError()
1592
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001593 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001594 def PatchsetConfigKey(cls):
1595 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001596 raise NotImplementedError()
1597
tandrii5d48c322016-08-18 16:19:37 -07001598 @classmethod
1599 def CodereviewServerConfigKey(cls):
1600 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001601 raise NotImplementedError()
1602
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001603 def _PostUnsetIssueProperties(self):
1604 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001605 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001606
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001607 def GetRieveldObjForPresubmit(self):
1608 # This is an unfortunate Rietveld-embeddedness in presubmit.
1609 # For non-Rietveld codereviews, this probably should return a dummy object.
1610 raise NotImplementedError()
1611
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001612 def GetGerritObjForPresubmit(self):
1613 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1614 return None
1615
dsansomee2d6fd92016-09-08 00:10:47 -07001616 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001617 """Update the description on codereview site."""
1618 raise NotImplementedError()
1619
1620 def CloseIssue(self):
1621 """Closes the issue."""
1622 raise NotImplementedError()
1623
1624 def GetApprovingReviewers(self):
1625 """Returns a list of reviewers approving the change.
1626
1627 Note: not necessarily committers.
1628 """
1629 raise NotImplementedError()
1630
1631 def GetMostRecentPatchset(self):
1632 """Returns the most recent patchset number from the codereview site."""
1633 raise NotImplementedError()
1634
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001635 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1636 directory):
1637 """Fetches and applies the issue.
1638
1639 Arguments:
1640 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1641 reject: if True, reject the failed patch instead of switching to 3-way
1642 merge. Rietveld only.
1643 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1644 only.
1645 directory: switch to directory before applying the patch. Rietveld only.
1646 """
1647 raise NotImplementedError()
1648
1649 @staticmethod
1650 def ParseIssueURL(parsed_url):
1651 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1652 failed."""
1653 raise NotImplementedError()
1654
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001655 def EnsureAuthenticated(self, force):
1656 """Best effort check that user is authenticated with codereview server.
1657
1658 Arguments:
1659 force: whether to skip confirmation questions.
1660 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001661 raise NotImplementedError()
1662
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001663 def CMDUploadChange(self, options, args, change):
1664 """Uploads a change to codereview."""
1665 raise NotImplementedError()
1666
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001667 def SetCQState(self, new_state):
1668 """Update the CQ state for latest patchset.
1669
1670 Issue must have been already uploaded and known.
1671 """
1672 raise NotImplementedError()
1673
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001674
1675class _RietveldChangelistImpl(_ChangelistCodereviewBase):
1676 def __init__(self, changelist, auth_config=None, rietveld_server=None):
1677 super(_RietveldChangelistImpl, self).__init__(changelist)
1678 assert settings, 'must be initialized in _ChangelistCodereviewBase'
martiniss6eda05f2016-06-30 10:18:35 -07001679 if not rietveld_server:
1680 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001681
1682 self._rietveld_server = rietveld_server
1683 self._auth_config = auth_config
1684 self._props = None
1685 self._rpc_server = None
1686
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001687 def GetCodereviewServer(self):
1688 if not self._rietveld_server:
1689 # If we're on a branch then get the server potentially associated
1690 # with that branch.
1691 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001692 self._rietveld_server = gclient_utils.UpgradeToHttps(
1693 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001694 if not self._rietveld_server:
1695 self._rietveld_server = settings.GetDefaultServerUrl()
1696 return self._rietveld_server
1697
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001698 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001699 """Best effort check that user is authenticated with Rietveld server."""
1700 if self._auth_config.use_oauth2:
1701 authenticator = auth.get_authenticator_for_host(
1702 self.GetCodereviewServer(), self._auth_config)
1703 if not authenticator.has_cached_credentials():
1704 raise auth.LoginRequiredError(self.GetCodereviewServer())
1705
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001706 def FetchDescription(self):
1707 issue = self.GetIssue()
1708 assert issue
1709 try:
1710 return self.RpcServer().get_description(issue).strip()
1711 except urllib2.HTTPError as e:
1712 if e.code == 404:
1713 DieWithError(
1714 ('\nWhile fetching the description for issue %d, received a '
1715 '404 (not found)\n'
1716 'error. It is likely that you deleted this '
1717 'issue on the server. If this is the\n'
1718 'case, please run\n\n'
1719 ' git cl issue 0\n\n'
1720 'to clear the association with the deleted issue. Then run '
1721 'this command again.') % issue)
1722 else:
1723 DieWithError(
1724 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1725 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001726 print('Warning: Failed to retrieve CL description due to network '
1727 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001728 return ''
1729
1730 def GetMostRecentPatchset(self):
1731 return self.GetIssueProperties()['patchsets'][-1]
1732
1733 def GetPatchSetDiff(self, issue, patchset):
1734 return self.RpcServer().get(
1735 '/download/issue%s_%s.diff' % (issue, patchset))
1736
1737 def GetIssueProperties(self):
1738 if self._props is None:
1739 issue = self.GetIssue()
1740 if not issue:
1741 self._props = {}
1742 else:
1743 self._props = self.RpcServer().get_issue_properties(issue, True)
1744 return self._props
1745
1746 def GetApprovingReviewers(self):
1747 return get_approving_reviewers(self.GetIssueProperties())
1748
1749 def AddComment(self, message):
1750 return self.RpcServer().add_comment(self.GetIssue(), message)
1751
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001752 def GetStatus(self):
1753 """Apply a rough heuristic to give a simple summary of an issue's review
1754 or CQ status, assuming adherence to a common workflow.
1755
1756 Returns None if no issue for this branch, or one of the following keywords:
1757 * 'error' - error from review tool (including deleted issues)
1758 * 'unsent' - not sent for review
1759 * 'waiting' - waiting for review
1760 * 'reply' - waiting for owner to reply to review
1761 * 'lgtm' - LGTM from at least one approved reviewer
1762 * 'commit' - in the commit queue
1763 * 'closed' - closed
1764 """
1765 if not self.GetIssue():
1766 return None
1767
1768 try:
1769 props = self.GetIssueProperties()
1770 except urllib2.HTTPError:
1771 return 'error'
1772
1773 if props.get('closed'):
1774 # Issue is closed.
1775 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001776 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001777 # Issue is in the commit queue.
1778 return 'commit'
1779
1780 try:
1781 reviewers = self.GetApprovingReviewers()
1782 except urllib2.HTTPError:
1783 return 'error'
1784
1785 if reviewers:
1786 # Was LGTM'ed.
1787 return 'lgtm'
1788
1789 messages = props.get('messages') or []
1790
tandrii9d2c7a32016-06-22 03:42:45 -07001791 # Skip CQ messages that don't require owner's action.
1792 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
1793 if 'Dry run:' in messages[-1]['text']:
1794 messages.pop()
1795 elif 'The CQ bit was unchecked' in messages[-1]['text']:
1796 # This message always follows prior messages from CQ,
1797 # so skip this too.
1798 messages.pop()
1799 else:
1800 # This is probably a CQ messages warranting user attention.
1801 break
1802
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001803 if not messages:
1804 # No message was sent.
1805 return 'unsent'
1806 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07001807 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001808 return 'reply'
1809 return 'waiting'
1810
dsansomee2d6fd92016-09-08 00:10:47 -07001811 def UpdateDescriptionRemote(self, description, force=False):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001812 return self.RpcServer().update_description(
1813 self.GetIssue(), self.description)
1814
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001815 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001816 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001817
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001818 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07001819 return self.SetFlags({flag: value})
1820
1821 def SetFlags(self, flags):
1822 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07001823 """
phajdan.jr68598232016-08-10 03:28:28 -07001824 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001825 try:
tandrii4b233bd2016-07-06 03:50:29 -07001826 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07001827 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07001828 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001829 if e.code == 404:
1830 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
1831 if e.code == 403:
1832 DieWithError(
1833 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07001834 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001835 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001836
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00001837 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001838 """Returns an upload.RpcServer() to access this review's rietveld instance.
1839 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001840 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00001841 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001842 self.GetCodereviewServer(),
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001843 self._auth_config or auth.make_auth_config())
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001844 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001845
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001846 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001847 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001848 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001849
tandrii5d48c322016-08-18 16:19:37 -07001850 @classmethod
1851 def PatchsetConfigKey(cls):
1852 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001853
tandrii5d48c322016-08-18 16:19:37 -07001854 @classmethod
1855 def CodereviewServerConfigKey(cls):
1856 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001857
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001858 def GetRieveldObjForPresubmit(self):
1859 return self.RpcServer()
1860
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001861 def SetCQState(self, new_state):
1862 props = self.GetIssueProperties()
1863 if props.get('private'):
1864 DieWithError('Cannot set-commit on private issue')
1865
1866 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07001867 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001868 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07001869 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001870 else:
tandrii4b233bd2016-07-06 03:50:29 -07001871 assert new_state == _CQState.DRY_RUN
1872 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001873
1874
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001875 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1876 directory):
1877 # TODO(maruel): Use apply_issue.py
1878
1879 # PatchIssue should never be called with a dirty tree. It is up to the
1880 # caller to check this, but just in case we assert here since the
1881 # consequences of the caller not checking this could be dire.
1882 assert(not git_common.is_dirty_git_tree('apply'))
1883 assert(parsed_issue_arg.valid)
1884 self._changelist.issue = parsed_issue_arg.issue
1885 if parsed_issue_arg.hostname:
1886 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
1887
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001888 if (isinstance(parsed_issue_arg, _RietveldParsedIssueNumberArgument) and
1889 parsed_issue_arg.patch_url):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001890 assert parsed_issue_arg.patchset
1891 patchset = parsed_issue_arg.patchset
1892 patch_data = urllib2.urlopen(parsed_issue_arg.patch_url).read()
1893 else:
1894 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
1895 patch_data = self.GetPatchSetDiff(self.GetIssue(), patchset)
1896
1897 # Switch up to the top-level directory, if necessary, in preparation for
1898 # applying the patch.
1899 top = settings.GetRelativeRoot()
1900 if top:
1901 os.chdir(top)
1902
1903 # Git patches have a/ at the beginning of source paths. We strip that out
1904 # with a sed script rather than the -p flag to patch so we can feed either
1905 # Git or svn-style patches into the same apply command.
1906 # re.sub() should be used but flags=re.MULTILINE is only in python 2.7.
1907 try:
1908 patch_data = subprocess2.check_output(
1909 ['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'], stdin=patch_data)
1910 except subprocess2.CalledProcessError:
1911 DieWithError('Git patch mungling failed.')
1912 logging.info(patch_data)
1913
1914 # We use "git apply" to apply the patch instead of "patch" so that we can
1915 # pick up file adds.
1916 # The --index flag means: also insert into the index (so we catch adds).
1917 cmd = ['git', 'apply', '--index', '-p0']
1918 if directory:
1919 cmd.extend(('--directory', directory))
1920 if reject:
1921 cmd.append('--reject')
1922 elif IsGitVersionAtLeast('1.7.12'):
1923 cmd.append('--3way')
1924 try:
1925 subprocess2.check_call(cmd, env=GetNoGitPagerEnv(),
1926 stdin=patch_data, stdout=subprocess2.VOID)
1927 except subprocess2.CalledProcessError:
vapiera7fbd5a2016-06-16 09:17:49 -07001928 print('Failed to apply the patch')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001929 return 1
1930
1931 # If we had an issue, commit the current state and register the issue.
1932 if not nocommit:
1933 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
1934 'patch from issue %(i)s at patchset '
1935 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
1936 % {'i': self.GetIssue(), 'p': patchset})])
1937 self.SetIssue(self.GetIssue())
1938 self.SetPatchset(patchset)
vapiera7fbd5a2016-06-16 09:17:49 -07001939 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001940 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001941 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001942 return 0
1943
1944 @staticmethod
1945 def ParseIssueURL(parsed_url):
1946 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
1947 return None
wychen3c1c1722016-08-04 11:46:36 -07001948 # Rietveld patch: https://domain/<number>/#ps<patchset>
1949 match = re.match(r'/(\d+)/$', parsed_url.path)
1950 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
1951 if match and match2:
1952 return _RietveldParsedIssueNumberArgument(
1953 issue=int(match.group(1)),
1954 patchset=int(match2.group(1)),
1955 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001956 # Typical url: https://domain/<issue_number>[/[other]]
1957 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
1958 if match:
1959 return _RietveldParsedIssueNumberArgument(
1960 issue=int(match.group(1)),
1961 hostname=parsed_url.netloc)
1962 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
1963 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
1964 if match:
1965 return _RietveldParsedIssueNumberArgument(
1966 issue=int(match.group(1)),
1967 patchset=int(match.group(2)),
1968 hostname=parsed_url.netloc,
1969 patch_url=gclient_utils.UpgradeToHttps(parsed_url.geturl()))
1970 return None
1971
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001972 def CMDUploadChange(self, options, args, change):
1973 """Upload the patch to Rietveld."""
1974 upload_args = ['--assume_yes'] # Don't ask about untracked files.
1975 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001976 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
1977 if options.emulate_svn_auto_props:
1978 upload_args.append('--emulate_svn_auto_props')
1979
1980 change_desc = None
1981
1982 if options.email is not None:
1983 upload_args.extend(['--email', options.email])
1984
1985 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07001986 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001987 upload_args.extend(['--title', options.title])
1988 if options.message:
1989 upload_args.extend(['--message', options.message])
1990 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07001991 print('This branch is associated with issue %s. '
1992 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001993 else:
nodirca166002016-06-27 10:59:51 -07001994 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001995 upload_args.extend(['--title', options.title])
1996 message = (options.title or options.message or
1997 CreateDescriptionFromLog(args))
1998 change_desc = ChangeDescription(message)
1999 if options.reviewers or options.tbr_owners:
2000 change_desc.update_reviewers(options.reviewers,
2001 options.tbr_owners,
2002 change)
2003 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002004 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002005
2006 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002007 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002008 return 1
2009
2010 upload_args.extend(['--message', change_desc.description])
2011 if change_desc.get_reviewers():
2012 upload_args.append('--reviewers=%s' % ','.join(
2013 change_desc.get_reviewers()))
2014 if options.send_mail:
2015 if not change_desc.get_reviewers():
2016 DieWithError("Must specify reviewers to send email.")
2017 upload_args.append('--send_mail')
2018
2019 # We check this before applying rietveld.private assuming that in
2020 # rietveld.cc only addresses which we can send private CLs to are listed
2021 # if rietveld.private is set, and so we should ignore rietveld.cc only
2022 # when --private is specified explicitly on the command line.
2023 if options.private:
2024 logging.warn('rietveld.cc is ignored since private flag is specified. '
2025 'You need to review and add them manually if necessary.')
2026 cc = self.GetCCListWithoutDefault()
2027 else:
2028 cc = self.GetCCList()
2029 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
2030 if cc:
2031 upload_args.extend(['--cc', cc])
2032
2033 if options.private or settings.GetDefaultPrivateFlag() == "True":
2034 upload_args.append('--private')
2035
2036 upload_args.extend(['--git_similarity', str(options.similarity)])
2037 if not options.find_copies:
2038 upload_args.extend(['--git_no_find_copies'])
2039
2040 # Include the upstream repo's URL in the change -- this is useful for
2041 # projects that have their source spread across multiple repos.
2042 remote_url = self.GetGitBaseUrlFromConfig()
2043 if not remote_url:
2044 if settings.GetIsGitSvn():
2045 remote_url = self.GetGitSvnRemoteUrl()
2046 else:
2047 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2048 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2049 self.GetUpstreamBranch().split('/')[-1])
2050 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002051 remote, remote_branch = self.GetRemoteBranch()
2052 target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
2053 settings.GetPendingRefPrefix())
2054 if target_ref:
2055 upload_args.extend(['--target_ref', target_ref])
2056
2057 # Look for dependent patchsets. See crbug.com/480453 for more details.
2058 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2059 upstream_branch = ShortBranchName(upstream_branch)
2060 if remote is '.':
2061 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002062 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002063 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002064 print()
2065 print('Skipping dependency patchset upload because git config '
2066 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2067 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002068 else:
2069 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002070 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002071 auth_config=auth_config)
2072 branch_cl_issue_url = branch_cl.GetIssueURL()
2073 branch_cl_issue = branch_cl.GetIssue()
2074 branch_cl_patchset = branch_cl.GetPatchset()
2075 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2076 upload_args.extend(
2077 ['--depends_on_patchset', '%s:%s' % (
2078 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002079 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002080 '\n'
2081 'The current branch (%s) is tracking a local branch (%s) with '
2082 'an associated CL.\n'
2083 'Adding %s/#ps%s as a dependency patchset.\n'
2084 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2085 branch_cl_patchset))
2086
2087 project = settings.GetProject()
2088 if project:
2089 upload_args.extend(['--project', project])
2090
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002091 try:
2092 upload_args = ['upload'] + upload_args + args
2093 logging.info('upload.RealMain(%s)', upload_args)
2094 issue, patchset = upload.RealMain(upload_args)
2095 issue = int(issue)
2096 patchset = int(patchset)
2097 except KeyboardInterrupt:
2098 sys.exit(1)
2099 except:
2100 # If we got an exception after the user typed a description for their
2101 # change, back up the description before re-raising.
2102 if change_desc:
2103 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
2104 print('\nGot exception while uploading -- saving description to %s\n' %
2105 backup_path)
2106 backup_file = open(backup_path, 'w')
2107 backup_file.write(change_desc.description)
2108 backup_file.close()
2109 raise
2110
2111 if not self.GetIssue():
2112 self.SetIssue(issue)
2113 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002114 return 0
2115
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002116
2117class _GerritChangelistImpl(_ChangelistCodereviewBase):
2118 def __init__(self, changelist, auth_config=None):
2119 # auth_config is Rietveld thing, kept here to preserve interface only.
2120 super(_GerritChangelistImpl, self).__init__(changelist)
2121 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002122 # Lazily cached values.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002123 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002124 self._gerrit_host = None # e.g. chromium-review.googlesource.com
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002125
2126 def _GetGerritHost(self):
2127 # Lazy load of configs.
2128 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002129 if self._gerrit_host and '.' not in self._gerrit_host:
2130 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2131 # This happens for internal stuff http://crbug.com/614312.
2132 parsed = urlparse.urlparse(self.GetRemoteUrl())
2133 if parsed.scheme == 'sso':
2134 print('WARNING: using non https URLs for remote is likely broken\n'
2135 ' Your current remote is: %s' % self.GetRemoteUrl())
2136 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2137 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002138 return self._gerrit_host
2139
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002140 def _GetGitHost(self):
2141 """Returns git host to be used when uploading change to Gerrit."""
2142 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2143
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002144 def GetCodereviewServer(self):
2145 if not self._gerrit_server:
2146 # If we're on a branch then get the server potentially associated
2147 # with that branch.
2148 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002149 self._gerrit_server = self._GitGetBranchConfigValue(
2150 self.CodereviewServerConfigKey())
2151 if self._gerrit_server:
2152 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002153 if not self._gerrit_server:
2154 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2155 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002156 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002157 parts[0] = parts[0] + '-review'
2158 self._gerrit_host = '.'.join(parts)
2159 self._gerrit_server = 'https://%s' % self._gerrit_host
2160 return self._gerrit_server
2161
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002162 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002163 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002164 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002165
tandrii5d48c322016-08-18 16:19:37 -07002166 @classmethod
2167 def PatchsetConfigKey(cls):
2168 return 'gerritpatchset'
2169
2170 @classmethod
2171 def CodereviewServerConfigKey(cls):
2172 return 'gerritserver'
2173
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002174 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002175 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002176 if settings.GetGerritSkipEnsureAuthenticated():
2177 # For projects with unusual authentication schemes.
2178 # See http://crbug.com/603378.
2179 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002180 # Lazy-loader to identify Gerrit and Git hosts.
2181 if gerrit_util.GceAuthenticator.is_gce():
2182 return
2183 self.GetCodereviewServer()
2184 git_host = self._GetGitHost()
2185 assert self._gerrit_server and self._gerrit_host
2186 cookie_auth = gerrit_util.CookiesAuthenticator()
2187
2188 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2189 git_auth = cookie_auth.get_auth_header(git_host)
2190 if gerrit_auth and git_auth:
2191 if gerrit_auth == git_auth:
2192 return
2193 print((
2194 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2195 ' Check your %s or %s file for credentials of hosts:\n'
2196 ' %s\n'
2197 ' %s\n'
2198 ' %s') %
2199 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2200 git_host, self._gerrit_host,
2201 cookie_auth.get_new_password_message(git_host)))
2202 if not force:
2203 ask_for_data('If you know what you are doing, press Enter to continue, '
2204 'Ctrl+C to abort.')
2205 return
2206 else:
2207 missing = (
2208 [] if gerrit_auth else [self._gerrit_host] +
2209 [] if git_auth else [git_host])
2210 DieWithError('Credentials for the following hosts are required:\n'
2211 ' %s\n'
2212 'These are read from %s (or legacy %s)\n'
2213 '%s' % (
2214 '\n '.join(missing),
2215 cookie_auth.get_gitcookies_path(),
2216 cookie_auth.get_netrc_path(),
2217 cookie_auth.get_new_password_message(git_host)))
2218
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002219 def _PostUnsetIssueProperties(self):
2220 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002221 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002222
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002223 def GetRieveldObjForPresubmit(self):
2224 class ThisIsNotRietveldIssue(object):
2225 def __nonzero__(self):
2226 # This is a hack to make presubmit_support think that rietveld is not
2227 # defined, yet still ensure that calls directly result in a decent
2228 # exception message below.
2229 return False
2230
2231 def __getattr__(self, attr):
2232 print(
2233 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2234 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2235 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2236 'or use Rietveld for codereview.\n'
2237 'See also http://crbug.com/579160.' % attr)
2238 raise NotImplementedError()
2239 return ThisIsNotRietveldIssue()
2240
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002241 def GetGerritObjForPresubmit(self):
2242 return presubmit_support.GerritAccessor(self._GetGerritHost())
2243
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002244 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002245 """Apply a rough heuristic to give a simple summary of an issue's review
2246 or CQ status, assuming adherence to a common workflow.
2247
2248 Returns None if no issue for this branch, or one of the following keywords:
2249 * 'error' - error from review tool (including deleted issues)
2250 * 'unsent' - no reviewers added
2251 * 'waiting' - waiting for review
2252 * 'reply' - waiting for owner to reply to review
2253 * 'not lgtm' - Code-Review -2 from at least one approved reviewer
2254 * 'lgtm' - Code-Review +2 from at least one approved reviewer
2255 * 'commit' - in the commit queue
2256 * 'closed' - abandoned
2257 """
2258 if not self.GetIssue():
2259 return None
2260
2261 try:
2262 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
2263 except httplib.HTTPException:
2264 return 'error'
2265
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002266 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002267 return 'closed'
2268
2269 cq_label = data['labels'].get('Commit-Queue', {})
2270 if cq_label:
2271 # Vote value is a stringified integer, which we expect from 0 to 2.
2272 vote_value = cq_label.get('value', '0')
2273 vote_text = cq_label.get('values', {}).get(vote_value, '')
2274 if vote_text.lower() == 'commit':
2275 return 'commit'
2276
2277 lgtm_label = data['labels'].get('Code-Review', {})
2278 if lgtm_label:
2279 if 'rejected' in lgtm_label:
2280 return 'not lgtm'
2281 if 'approved' in lgtm_label:
2282 return 'lgtm'
2283
2284 if not data.get('reviewers', {}).get('REVIEWER', []):
2285 return 'unsent'
2286
2287 messages = data.get('messages', [])
2288 if messages:
2289 owner = data['owner'].get('_account_id')
2290 last_message_author = messages[-1].get('author', {}).get('_account_id')
2291 if owner != last_message_author:
2292 # Some reply from non-owner.
2293 return 'reply'
2294
2295 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002296
2297 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002298 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002299 return data['revisions'][data['current_revision']]['_number']
2300
2301 def FetchDescription(self):
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002302 data = self._GetChangeDetail(['CURRENT_REVISION'])
2303 current_rev = data['current_revision']
2304 url = data['revisions'][current_rev]['fetch']['http']['url']
2305 return gerrit_util.GetChangeDescriptionFromGitiles(url, current_rev)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002306
dsansomee2d6fd92016-09-08 00:10:47 -07002307 def UpdateDescriptionRemote(self, description, force=False):
2308 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2309 if not force:
2310 ask_for_data(
2311 'The description cannot be modified while the issue has a pending '
2312 'unpublished edit. Either publish the edit in the Gerrit web UI '
2313 'or delete it.\n\n'
2314 'Press Enter to delete the unpublished edit, Ctrl+C to abort.')
2315
2316 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2317 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002318 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
2319 description)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002320
2321 def CloseIssue(self):
2322 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2323
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002324 def GetApprovingReviewers(self):
2325 """Returns a list of reviewers approving the change.
2326
2327 Note: not necessarily committers.
2328 """
2329 raise NotImplementedError()
2330
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002331 def SubmitIssue(self, wait_for_merge=True):
2332 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2333 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002334
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002335 def _GetChangeDetail(self, options=None, issue=None):
2336 options = options or []
2337 issue = issue or self.GetIssue()
2338 assert issue, 'issue required to query Gerrit'
tandrii@chromium.org11a899e2016-04-13 12:45:44 +00002339 return gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2340 options)
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002341
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002342 def CMDLand(self, force, bypass_hooks, verbose):
2343 if git_common.is_dirty_git_tree('land'):
2344 return 1
tandriid60367b2016-06-22 05:25:12 -07002345 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2346 if u'Commit-Queue' in detail.get('labels', {}):
2347 if not force:
2348 ask_for_data('\nIt seems this repository has a Commit Queue, '
2349 'which can test and land changes for you. '
2350 'Are you sure you wish to bypass it?\n'
2351 'Press Enter to continue, Ctrl+C to abort.')
2352
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002353 differs = True
tandriic4344b52016-08-29 06:04:54 -07002354 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002355 # Note: git diff outputs nothing if there is no diff.
2356 if not last_upload or RunGit(['diff', last_upload]).strip():
2357 print('WARNING: some changes from local branch haven\'t been uploaded')
2358 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002359 if detail['current_revision'] == last_upload:
2360 differs = False
2361 else:
2362 print('WARNING: local branch contents differ from latest uploaded '
2363 'patchset')
2364 if differs:
2365 if not force:
2366 ask_for_data(
2367 'Do you want to submit latest Gerrit patchset and bypass hooks?')
2368 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2369 elif not bypass_hooks:
2370 hook_results = self.RunHook(
2371 committing=True,
2372 may_prompt=not force,
2373 verbose=verbose,
2374 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2375 if not hook_results.should_continue():
2376 return 1
2377
2378 self.SubmitIssue(wait_for_merge=True)
2379 print('Issue %s has been submitted.' % self.GetIssueURL())
2380 return 0
2381
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002382 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2383 directory):
2384 assert not reject
2385 assert not nocommit
2386 assert not directory
2387 assert parsed_issue_arg.valid
2388
2389 self._changelist.issue = parsed_issue_arg.issue
2390
2391 if parsed_issue_arg.hostname:
2392 self._gerrit_host = parsed_issue_arg.hostname
2393 self._gerrit_server = 'https://%s' % self._gerrit_host
2394
2395 detail = self._GetChangeDetail(['ALL_REVISIONS'])
2396
2397 if not parsed_issue_arg.patchset:
2398 # Use current revision by default.
2399 revision_info = detail['revisions'][detail['current_revision']]
2400 patchset = int(revision_info['_number'])
2401 else:
2402 patchset = parsed_issue_arg.patchset
2403 for revision_info in detail['revisions'].itervalues():
2404 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2405 break
2406 else:
2407 DieWithError('Couldn\'t find patchset %i in issue %i' %
2408 (parsed_issue_arg.patchset, self.GetIssue()))
2409
2410 fetch_info = revision_info['fetch']['http']
2411 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
2412 RunGit(['cherry-pick', 'FETCH_HEAD'])
2413 self.SetIssue(self.GetIssue())
2414 self.SetPatchset(patchset)
2415 print('Committed patch for issue %i pathset %i locally' %
2416 (self.GetIssue(), self.GetPatchset()))
2417 return 0
2418
2419 @staticmethod
2420 def ParseIssueURL(parsed_url):
2421 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2422 return None
2423 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2424 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2425 # Short urls like https://domain/<issue_number> can be used, but don't allow
2426 # specifying the patchset (you'd 404), but we allow that here.
2427 if parsed_url.path == '/':
2428 part = parsed_url.fragment
2429 else:
2430 part = parsed_url.path
2431 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2432 if match:
2433 return _ParsedIssueNumberArgument(
2434 issue=int(match.group(2)),
2435 patchset=int(match.group(4)) if match.group(4) else None,
2436 hostname=parsed_url.netloc)
2437 return None
2438
tandrii16e0b4e2016-06-07 10:34:28 -07002439 def _GerritCommitMsgHookCheck(self, offer_removal):
2440 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2441 if not os.path.exists(hook):
2442 return
2443 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2444 # custom developer made one.
2445 data = gclient_utils.FileRead(hook)
2446 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2447 return
2448 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002449 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002450 'and may interfere with it in subtle ways.\n'
2451 'We recommend you remove the commit-msg hook.')
2452 if offer_removal:
2453 reply = ask_for_data('Do you want to remove it now? [Yes/No]')
2454 if reply.lower().startswith('y'):
2455 gclient_utils.rm_file_or_tree(hook)
2456 print('Gerrit commit-msg hook removed.')
2457 else:
2458 print('OK, will keep Gerrit commit-msg hook in place.')
2459
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002460 def CMDUploadChange(self, options, args, change):
2461 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002462 if options.squash and options.no_squash:
2463 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002464
2465 if not options.squash and not options.no_squash:
2466 # Load default for user, repo, squash=true, in this order.
2467 options.squash = settings.GetSquashGerritUploads()
2468 elif options.no_squash:
2469 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002470
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002471 # We assume the remote called "origin" is the one we want.
2472 # It is probably not worthwhile to support different workflows.
2473 gerrit_remote = 'origin'
2474
2475 remote, remote_branch = self.GetRemoteBranch()
2476 branch = GetTargetRef(remote, remote_branch, options.target_branch,
2477 pending_prefix='')
2478
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002479 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002480 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002481 if self.GetIssue():
2482 # Try to get the message from a previous upload.
2483 message = self.GetDescription()
2484 if not message:
2485 DieWithError(
2486 'failed to fetch description from current Gerrit issue %d\n'
2487 '%s' % (self.GetIssue(), self.GetIssueURL()))
2488 change_id = self._GetChangeDetail()['change_id']
2489 while True:
2490 footer_change_ids = git_footers.get_footer_change_id(message)
2491 if footer_change_ids == [change_id]:
2492 break
2493 if not footer_change_ids:
2494 message = git_footers.add_footer_change_id(message, change_id)
2495 print('WARNING: appended missing Change-Id to issue description')
2496 continue
2497 # There is already a valid footer but with different or several ids.
2498 # Doing this automatically is non-trivial as we don't want to lose
2499 # existing other footers, yet we want to append just 1 desired
2500 # Change-Id. Thus, just create a new footer, but let user verify the
2501 # new description.
2502 message = '%s\n\nChange-Id: %s' % (message, change_id)
2503 print(
2504 'WARNING: issue %s has Change-Id footer(s):\n'
2505 ' %s\n'
2506 'but issue has Change-Id %s, according to Gerrit.\n'
2507 'Please, check the proposed correction to the description, '
2508 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2509 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2510 change_id))
2511 ask_for_data('Press enter to edit now, Ctrl+C to abort')
2512 if not options.force:
2513 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002514 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002515 message = change_desc.description
2516 if not message:
2517 DieWithError("Description is empty. Aborting...")
2518 # Continue the while loop.
2519 # Sanity check of this code - we should end up with proper message
2520 # footer.
2521 assert [change_id] == git_footers.get_footer_change_id(message)
2522 change_desc = ChangeDescription(message)
2523 else:
2524 change_desc = ChangeDescription(
2525 options.message or CreateDescriptionFromLog(args))
2526 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002527 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528 if not change_desc.description:
2529 DieWithError("Description is empty. Aborting...")
2530 message = change_desc.description
2531 change_ids = git_footers.get_footer_change_id(message)
2532 if len(change_ids) > 1:
2533 DieWithError('too many Change-Id footers, at most 1 allowed.')
2534 if not change_ids:
2535 # Generate the Change-Id automatically.
2536 message = git_footers.add_footer_change_id(
2537 message, GenerateGerritChangeId(message))
2538 change_desc.set_description(message)
2539 change_ids = git_footers.get_footer_change_id(message)
2540 assert len(change_ids) == 1
2541 change_id = change_ids[0]
2542
2543 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2544 if remote is '.':
2545 # If our upstream branch is local, we base our squashed commit on its
2546 # squashed version.
2547 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2548 # Check the squashed hash of the parent.
2549 parent = RunGit(['config',
2550 'branch.%s.gerritsquashhash' % upstream_branch_name],
2551 error_ok=True).strip()
2552 # Verify that the upstream branch has been uploaded too, otherwise
2553 # Gerrit will create additional CLs when uploading.
2554 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2555 RunGitSilent(['rev-parse', parent + ':'])):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002556 DieWithError(
2557 'Upload upstream branch %s first.\n'
tandrii2bdadf12016-07-12 12:27:54 -07002558 'Note: maybe you\'ve uploaded it with --no-squash. '
2559 'If so, then re-upload it with:\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002560 ' git cl upload --squash\n' % upstream_branch_name)
2561 else:
2562 parent = self.GetCommonAncestorWithUpstream()
2563
2564 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2565 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2566 '-m', message]).strip()
2567 else:
2568 change_desc = ChangeDescription(
2569 options.message or CreateDescriptionFromLog(args))
2570 if not change_desc.description:
2571 DieWithError("Description is empty. Aborting...")
2572
2573 if not git_footers.get_footer_change_id(change_desc.description):
2574 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002575 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2576 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002577 ref_to_push = 'HEAD'
2578 parent = '%s/%s' % (gerrit_remote, branch)
2579 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2580
2581 assert change_desc
2582 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2583 ref_to_push)]).splitlines()
2584 if len(commits) > 1:
2585 print('WARNING: This will upload %d commits. Run the following command '
2586 'to see which commits will be uploaded: ' % len(commits))
2587 print('git log %s..%s' % (parent, ref_to_push))
2588 print('You can also use `git squash-branch` to squash these into a '
2589 'single commit.')
2590 ask_for_data('About to upload; enter to confirm.')
2591
2592 if options.reviewers or options.tbr_owners:
2593 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2594 change)
2595
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002596 # Extra options that can be specified at push time. Doc:
2597 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2598 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002599 if change_desc.get_reviewers(tbr_only=True):
2600 print('Adding self-LGTM (Code-Review +1) because of TBRs')
2601 refspec_opts.append('l=Code-Review+1')
2602
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002603 if options.title:
tandriieefe8322016-08-17 10:12:24 -07002604 if not re.match(r'^[\w ]+$', options.title):
2605 options.title = re.sub(r'[^\w ]', '', options.title)
2606 print('WARNING: Patchset title may only contain alphanumeric chars '
2607 'and spaces. Cleaned up title:\n%s' % options.title)
2608 if not options.force:
2609 ask_for_data('Press enter to continue, Ctrl+C to abort')
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002610 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2611 # reverse on its side.
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002612 refspec_opts.append('m=' + options.title.replace(' ', '_'))
2613
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002614 if options.send_mail:
2615 if not change_desc.get_reviewers():
2616 DieWithError('Must specify reviewers to send email.')
2617 refspec_opts.append('notify=ALL')
2618 else:
2619 refspec_opts.append('notify=NONE')
2620
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002621 cc = self.GetCCList().split(',')
2622 if options.cc:
2623 cc.extend(options.cc)
2624 cc = filter(None, cc)
2625 if cc:
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00002626 refspec_opts.extend('cc=' + email.strip() for email in cc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002627
tandrii99a72f22016-08-17 14:33:24 -07002628 reviewers = change_desc.get_reviewers()
2629 if reviewers:
2630 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002631
agablec6787972016-09-09 16:13:34 -07002632 if options.private:
2633 refspec_opts.append('draft')
2634
rmistry9eadede2016-09-19 11:22:43 -07002635 if options.topic:
2636 # Documentation on Gerrit topics is here:
2637 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
2638 refspec_opts.append('topic=%s' % options.topic)
2639
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002640 refspec_suffix = ''
2641 if refspec_opts:
2642 refspec_suffix = '%' + ','.join(refspec_opts)
2643 assert ' ' not in refspec_suffix, (
2644 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002645 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002646
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002647 push_stdout = gclient_utils.CheckCallAndFilter(
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002648 ['git', 'push', gerrit_remote, refspec],
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002649 print_stdout=True,
2650 # Flush after every line: useful for seeing progress when running as
2651 # recipe.
2652 filter_fn=lambda _: sys.stdout.flush())
2653
2654 if options.squash:
2655 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2656 change_numbers = [m.group(1)
2657 for m in map(regex.match, push_stdout.splitlines())
2658 if m]
2659 if len(change_numbers) != 1:
2660 DieWithError(
2661 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
2662 'Change-Id: %s') % (len(change_numbers), change_id))
2663 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002664 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002665 return 0
2666
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002667 def _AddChangeIdToCommitMessage(self, options, args):
2668 """Re-commits using the current message, assumes the commit hook is in
2669 place.
2670 """
2671 log_desc = options.message or CreateDescriptionFromLog(args)
2672 git_command = ['commit', '--amend', '-m', log_desc]
2673 RunGit(git_command)
2674 new_log_desc = CreateDescriptionFromLog(args)
2675 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002676 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002677 return new_log_desc
2678 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002679 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002680
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002681 def SetCQState(self, new_state):
2682 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002683 vote_map = {
2684 _CQState.NONE: 0,
2685 _CQState.DRY_RUN: 1,
2686 _CQState.COMMIT : 2,
2687 }
2688 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2689 labels={'Commit-Queue': vote_map[new_state]})
2690
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002691
2692_CODEREVIEW_IMPLEMENTATIONS = {
2693 'rietveld': _RietveldChangelistImpl,
2694 'gerrit': _GerritChangelistImpl,
2695}
2696
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002697
iannuccie53c9352016-08-17 14:40:40 -07002698def _add_codereview_issue_select_options(parser, extra=""):
2699 _add_codereview_select_options(parser)
2700
2701 text = ('Operate on this issue number instead of the current branch\'s '
2702 'implicit issue.')
2703 if extra:
2704 text += ' '+extra
2705 parser.add_option('-i', '--issue', type=int, help=text)
2706
2707
2708def _process_codereview_issue_select_options(parser, options):
2709 _process_codereview_select_options(parser, options)
2710 if options.issue is not None and not options.forced_codereview:
2711 parser.error('--issue must be specified with either --rietveld or --gerrit')
2712
2713
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002714def _add_codereview_select_options(parser):
2715 """Appends --gerrit and --rietveld options to force specific codereview."""
2716 parser.codereview_group = optparse.OptionGroup(
2717 parser, 'EXPERIMENTAL! Codereview override options')
2718 parser.add_option_group(parser.codereview_group)
2719 parser.codereview_group.add_option(
2720 '--gerrit', action='store_true',
2721 help='Force the use of Gerrit for codereview')
2722 parser.codereview_group.add_option(
2723 '--rietveld', action='store_true',
2724 help='Force the use of Rietveld for codereview')
2725
2726
2727def _process_codereview_select_options(parser, options):
2728 if options.gerrit and options.rietveld:
2729 parser.error('Options --gerrit and --rietveld are mutually exclusive')
2730 options.forced_codereview = None
2731 if options.gerrit:
2732 options.forced_codereview = 'gerrit'
2733 elif options.rietveld:
2734 options.forced_codereview = 'rietveld'
2735
2736
tandriif9aefb72016-07-01 09:06:51 -07002737def _get_bug_line_values(default_project, bugs):
2738 """Given default_project and comma separated list of bugs, yields bug line
2739 values.
2740
2741 Each bug can be either:
2742 * a number, which is combined with default_project
2743 * string, which is left as is.
2744
2745 This function may produce more than one line, because bugdroid expects one
2746 project per line.
2747
2748 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2749 ['v8:123', 'chromium:789']
2750 """
2751 default_bugs = []
2752 others = []
2753 for bug in bugs.split(','):
2754 bug = bug.strip()
2755 if bug:
2756 try:
2757 default_bugs.append(int(bug))
2758 except ValueError:
2759 others.append(bug)
2760
2761 if default_bugs:
2762 default_bugs = ','.join(map(str, default_bugs))
2763 if default_project:
2764 yield '%s:%s' % (default_project, default_bugs)
2765 else:
2766 yield default_bugs
2767 for other in sorted(others):
2768 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2769 yield other
2770
2771
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002772class ChangeDescription(object):
2773 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002774 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
agable@chromium.org42c20792013-09-12 17:34:49 +00002775 BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002776
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002777 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002778 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002779
agable@chromium.org42c20792013-09-12 17:34:49 +00002780 @property # www.logilab.org/ticket/89786
2781 def description(self): # pylint: disable=E0202
2782 return '\n'.join(self._description_lines)
2783
2784 def set_description(self, desc):
2785 if isinstance(desc, basestring):
2786 lines = desc.splitlines()
2787 else:
2788 lines = [line.rstrip() for line in desc]
2789 while lines and not lines[0]:
2790 lines.pop(0)
2791 while lines and not lines[-1]:
2792 lines.pop(-1)
2793 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002794
piman@chromium.org336f9122014-09-04 02:16:55 +00002795 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002796 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002797 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00002798 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002799 return
agable@chromium.org42c20792013-09-12 17:34:49 +00002800 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002801
agable@chromium.org42c20792013-09-12 17:34:49 +00002802 # Get the set of R= and TBR= lines and remove them from the desciption.
2803 regexp = re.compile(self.R_LINE)
2804 matches = [regexp.match(line) for line in self._description_lines]
2805 new_desc = [l for i, l in enumerate(self._description_lines)
2806 if not matches[i]]
2807 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002808
agable@chromium.org42c20792013-09-12 17:34:49 +00002809 # Construct new unified R= and TBR= lines.
2810 r_names = []
2811 tbr_names = []
2812 for match in matches:
2813 if not match:
2814 continue
2815 people = cleanup_list([match.group(2).strip()])
2816 if match.group(1) == 'TBR':
2817 tbr_names.extend(people)
2818 else:
2819 r_names.extend(people)
2820 for name in r_names:
2821 if name not in reviewers:
2822 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00002823 if add_owners_tbr:
2824 owners_db = owners.Database(change.RepositoryRoot(),
dtu944b6052016-07-14 14:48:21 -07002825 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002826 all_reviewers = set(tbr_names + reviewers)
2827 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
2828 all_reviewers)
2829 tbr_names.extend(owners_db.reviewers_for(missing_files,
2830 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00002831 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
2832 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
2833
2834 # Put the new lines in the description where the old first R= line was.
2835 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2836 if 0 <= line_loc < len(self._description_lines):
2837 if new_tbr_line:
2838 self._description_lines.insert(line_loc, new_tbr_line)
2839 if new_r_line:
2840 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002841 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002842 if new_r_line:
2843 self.append_footer(new_r_line)
2844 if new_tbr_line:
2845 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002846
tandriif9aefb72016-07-01 09:06:51 -07002847 def prompt(self, bug=None):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002848 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002849 self.set_description([
2850 '# Enter a description of the change.',
2851 '# This will be displayed on the codereview site.',
2852 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002853 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002854 '--------------------',
2855 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002856
agable@chromium.org42c20792013-09-12 17:34:49 +00002857 regexp = re.compile(self.BUG_LINE)
2858 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07002859 prefix = settings.GetBugPrefix()
2860 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
2861 for value in values:
2862 # TODO(tandrii): change this to 'Bug: xxx' to be a proper Gerrit footer.
2863 self.append_footer('BUG=%s' % value)
2864
agable@chromium.org42c20792013-09-12 17:34:49 +00002865 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00002866 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002867 if not content:
2868 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002869 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002870
2871 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00002872 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
2873 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002874 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002875 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002876
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002877 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002878 """Adds a footer line to the description.
2879
2880 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2881 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2882 that Gerrit footers are always at the end.
2883 """
2884 parsed_footer_line = git_footers.parse_footer(line)
2885 if parsed_footer_line:
2886 # Line is a gerrit footer in the form: Footer-Key: any value.
2887 # Thus, must be appended observing Gerrit footer rules.
2888 self.set_description(
2889 git_footers.add_footer(self.description,
2890 key=parsed_footer_line[0],
2891 value=parsed_footer_line[1]))
2892 return
2893
2894 if not self._description_lines:
2895 self._description_lines.append(line)
2896 return
2897
2898 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2899 if gerrit_footers:
2900 # git_footers.split_footers ensures that there is an empty line before
2901 # actual (gerrit) footers, if any. We have to keep it that way.
2902 assert top_lines and top_lines[-1] == ''
2903 top_lines, separator = top_lines[:-1], top_lines[-1:]
2904 else:
2905 separator = [] # No need for separator if there are no gerrit_footers.
2906
2907 prev_line = top_lines[-1] if top_lines else ''
2908 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2909 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2910 top_lines.append('')
2911 top_lines.append(line)
2912 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002913
tandrii99a72f22016-08-17 14:33:24 -07002914 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002915 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002916 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07002917 reviewers = [match.group(2).strip()
2918 for match in matches
2919 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002920 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002921
2922
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002923def get_approving_reviewers(props):
2924 """Retrieves the reviewers that approved a CL from the issue properties with
2925 messages.
2926
2927 Note that the list may contain reviewers that are not committer, thus are not
2928 considered by the CQ.
2929 """
2930 return sorted(
2931 set(
2932 message['sender']
2933 for message in props['messages']
2934 if message['approval'] and message['sender'] in props['reviewers']
2935 )
2936 )
2937
2938
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002939def FindCodereviewSettingsFile(filename='codereview.settings'):
2940 """Finds the given file starting in the cwd and going up.
2941
2942 Only looks up to the top of the repository unless an
2943 'inherit-review-settings-ok' file exists in the root of the repository.
2944 """
2945 inherit_ok_file = 'inherit-review-settings-ok'
2946 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002947 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002948 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2949 root = '/'
2950 while True:
2951 if filename in os.listdir(cwd):
2952 if os.path.isfile(os.path.join(cwd, filename)):
2953 return open(os.path.join(cwd, filename))
2954 if cwd == root:
2955 break
2956 cwd = os.path.dirname(cwd)
2957
2958
2959def LoadCodereviewSettingsFromFile(fileobj):
2960 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002961 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002962
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002963 def SetProperty(name, setting, unset_error_ok=False):
2964 fullname = 'rietveld.' + name
2965 if setting in keyvals:
2966 RunGit(['config', fullname, keyvals[setting]])
2967 else:
2968 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2969
2970 SetProperty('server', 'CODE_REVIEW_SERVER')
2971 # Only server setting is required. Other settings can be absent.
2972 # In that case, we ignore errors raised during option deletion attempt.
2973 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00002974 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002975 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2976 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002977 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002978 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00002979 SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL',
2980 unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002981 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00002982 SetProperty('project', 'PROJECT', unset_error_ok=True)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002983 SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True)
tandriif46c20f2016-09-14 06:17:05 -07002984 SetProperty('git-number-footer', 'GIT_NUMBER_FOOTER', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002985 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2986 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002987
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002988 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002989 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002990
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002991 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07002992 RunGit(['config', 'gerrit.squash-uploads',
2993 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002994
tandrii@chromium.org28253532016-04-14 13:46:56 +00002995 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002996 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002997 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2998
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002999 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
3000 #should be of the form
3001 #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3002 #ORIGIN_URL_CONFIG: http://src.chromium.org/git
3003 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3004 keyvals['ORIGIN_URL_CONFIG']])
3005
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003006
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003007def urlretrieve(source, destination):
3008 """urllib is broken for SSL connections via a proxy therefore we
3009 can't use urllib.urlretrieve()."""
3010 with open(destination, 'w') as f:
3011 f.write(urllib2.urlopen(source).read())
3012
3013
ukai@chromium.org712d6102013-11-27 00:52:58 +00003014def hasSheBang(fname):
3015 """Checks fname is a #! script."""
3016 with open(fname) as f:
3017 return f.read(2).startswith('#!')
3018
3019
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003020# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3021def DownloadHooks(*args, **kwargs):
3022 pass
3023
3024
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003025def DownloadGerritHook(force):
3026 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003027
3028 Args:
3029 force: True to update hooks. False to install hooks if not present.
3030 """
3031 if not settings.GetIsGerrit():
3032 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003033 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003034 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3035 if not os.access(dst, os.X_OK):
3036 if os.path.exists(dst):
3037 if not force:
3038 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003039 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003040 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003041 if not hasSheBang(dst):
3042 DieWithError('Not a script: %s\n'
3043 'You need to download from\n%s\n'
3044 'into .git/hooks/commit-msg and '
3045 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003046 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3047 except Exception:
3048 if os.path.exists(dst):
3049 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003050 DieWithError('\nFailed to download hooks.\n'
3051 'You need to download from\n%s\n'
3052 'into .git/hooks/commit-msg and '
3053 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003054
3055
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003056
3057def GetRietveldCodereviewSettingsInteractively():
3058 """Prompt the user for settings."""
3059 server = settings.GetDefaultServerUrl(error_ok=True)
3060 prompt = 'Rietveld server (host[:port])'
3061 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3062 newserver = ask_for_data(prompt + ':')
3063 if not server and not newserver:
3064 newserver = DEFAULT_SERVER
3065 if newserver:
3066 newserver = gclient_utils.UpgradeToHttps(newserver)
3067 if newserver != server:
3068 RunGit(['config', 'rietveld.server', newserver])
3069
3070 def SetProperty(initial, caption, name, is_url):
3071 prompt = caption
3072 if initial:
3073 prompt += ' ("x" to clear) [%s]' % initial
3074 new_val = ask_for_data(prompt + ':')
3075 if new_val == 'x':
3076 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3077 elif new_val:
3078 if is_url:
3079 new_val = gclient_utils.UpgradeToHttps(new_val)
3080 if new_val != initial:
3081 RunGit(['config', 'rietveld.' + name, new_val])
3082
3083 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3084 SetProperty(settings.GetDefaultPrivateFlag(),
3085 'Private flag (rietveld only)', 'private', False)
3086 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3087 'tree-status-url', False)
3088 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3089 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3090 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3091 'run-post-upload-hook', False)
3092
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003093@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003094def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003095 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003096
tandrii5d0a0422016-09-14 06:24:35 -07003097 print('WARNING: git cl config works for Rietveld only')
3098 # TODO(tandrii): remove this once we switch to Gerrit.
3099 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003100 parser.add_option('--activate-update', action='store_true',
3101 help='activate auto-updating [rietveld] section in '
3102 '.git/config')
3103 parser.add_option('--deactivate-update', action='store_true',
3104 help='deactivate auto-updating [rietveld] section in '
3105 '.git/config')
3106 options, args = parser.parse_args(args)
3107
3108 if options.deactivate_update:
3109 RunGit(['config', 'rietveld.autoupdate', 'false'])
3110 return
3111
3112 if options.activate_update:
3113 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3114 return
3115
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003116 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003117 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003118 return 0
3119
3120 url = args[0]
3121 if not url.endswith('codereview.settings'):
3122 url = os.path.join(url, 'codereview.settings')
3123
3124 # Load code review settings and download hooks (if available).
3125 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3126 return 0
3127
3128
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003129def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003130 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003131 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3132 branch = ShortBranchName(branchref)
3133 _, args = parser.parse_args(args)
3134 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003135 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003136 return RunGit(['config', 'branch.%s.base-url' % branch],
3137 error_ok=False).strip()
3138 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003139 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003140 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3141 error_ok=False).strip()
3142
3143
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003144def color_for_status(status):
3145 """Maps a Changelist status to color, for CMDstatus and other tools."""
3146 return {
3147 'unsent': Fore.RED,
3148 'waiting': Fore.BLUE,
3149 'reply': Fore.YELLOW,
3150 'lgtm': Fore.GREEN,
3151 'commit': Fore.MAGENTA,
3152 'closed': Fore.CYAN,
3153 'error': Fore.WHITE,
3154 }.get(status, Fore.WHITE)
3155
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003156
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003157def get_cl_statuses(changes, fine_grained, max_processes=None):
3158 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003159
3160 If fine_grained is true, this will fetch CL statuses from the server.
3161 Otherwise, simply indicate if there's a matching url for the given branches.
3162
3163 If max_processes is specified, it is used as the maximum number of processes
3164 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3165 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003166
3167 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003168 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003169 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003170 upload.verbosity = 0
3171
3172 if fine_grained:
3173 # Process one branch synchronously to work through authentication, then
3174 # spawn processes to process all the other branches in parallel.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003175 if changes:
tandriiea9514a2016-08-17 12:32:37 -07003176 def fetch(cl):
3177 try:
3178 return (cl, cl.GetStatus())
3179 except:
3180 # See http://crbug.com/629863.
3181 logging.exception('failed to fetch status for %s:', cl)
3182 raise
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003183 yield fetch(changes[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003184
tandriiea9514a2016-08-17 12:32:37 -07003185 changes_to_fetch = changes[1:]
3186 if not changes_to_fetch:
kmarshall3bff56b2016-06-06 18:31:47 -07003187 # Exit early if there was only one branch to fetch.
3188 return
3189
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003190 pool = ThreadPool(
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003191 min(max_processes, len(changes_to_fetch))
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003192 if max_processes is not None
dsinclair99d30172016-08-09 10:48:58 -07003193 else max(len(changes_to_fetch), 1))
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003194
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003195 fetched_cls = set()
3196 it = pool.imap_unordered(fetch, changes_to_fetch).__iter__()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003197 while True:
3198 try:
3199 row = it.next(timeout=5)
3200 except multiprocessing.TimeoutError:
3201 break
3202
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003203 fetched_cls.add(row[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003204 yield row
3205
3206 # Add any branches that failed to fetch.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003207 for cl in set(changes_to_fetch) - fetched_cls:
3208 yield (cl, 'error')
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003209
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003210 else:
3211 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003212 for cl in changes:
3213 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003214
rmistry@google.com2dd99862015-06-22 12:22:18 +00003215
3216def upload_branch_deps(cl, args):
3217 """Uploads CLs of local branches that are dependents of the current branch.
3218
3219 If the local branch dependency tree looks like:
3220 test1 -> test2.1 -> test3.1
3221 -> test3.2
3222 -> test2.2 -> test3.3
3223
3224 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3225 run on the dependent branches in this order:
3226 test2.1, test3.1, test3.2, test2.2, test3.3
3227
3228 Note: This function does not rebase your local dependent branches. Use it when
3229 you make a change to the parent branch that will not conflict with its
3230 dependent branches, and you would like their dependencies updated in
3231 Rietveld.
3232 """
3233 if git_common.is_dirty_git_tree('upload-branch-deps'):
3234 return 1
3235
3236 root_branch = cl.GetBranch()
3237 if root_branch is None:
3238 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3239 'Get on a branch!')
3240 if not cl.GetIssue() or not cl.GetPatchset():
3241 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3242 'patchset dependencies without an uploaded CL.')
3243
3244 branches = RunGit(['for-each-ref',
3245 '--format=%(refname:short) %(upstream:short)',
3246 'refs/heads'])
3247 if not branches:
3248 print('No local branches found.')
3249 return 0
3250
3251 # Create a dictionary of all local branches to the branches that are dependent
3252 # on it.
3253 tracked_to_dependents = collections.defaultdict(list)
3254 for b in branches.splitlines():
3255 tokens = b.split()
3256 if len(tokens) == 2:
3257 branch_name, tracked = tokens
3258 tracked_to_dependents[tracked].append(branch_name)
3259
vapiera7fbd5a2016-06-16 09:17:49 -07003260 print()
3261 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003262 dependents = []
3263 def traverse_dependents_preorder(branch, padding=''):
3264 dependents_to_process = tracked_to_dependents.get(branch, [])
3265 padding += ' '
3266 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003267 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003268 dependents.append(dependent)
3269 traverse_dependents_preorder(dependent, padding)
3270 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003271 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003272
3273 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003274 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003275 return 0
3276
vapiera7fbd5a2016-06-16 09:17:49 -07003277 print('This command will checkout all dependent branches and run '
3278 '"git cl upload".')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003279 ask_for_data('[Press enter to continue or ctrl-C to quit]')
3280
andybons@chromium.org962f9462016-02-03 20:00:42 +00003281 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003282 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003283 args.extend(['-t', 'Updated patchset dependency'])
3284
rmistry@google.com2dd99862015-06-22 12:22:18 +00003285 # Record all dependents that failed to upload.
3286 failures = {}
3287 # Go through all dependents, checkout the branch and upload.
3288 try:
3289 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003290 print()
3291 print('--------------------------------------')
3292 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003293 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003294 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003295 try:
3296 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003297 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003298 failures[dependent_branch] = 1
3299 except: # pylint: disable=W0702
3300 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003301 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003302 finally:
3303 # Swap back to the original root branch.
3304 RunGit(['checkout', '-q', root_branch])
3305
vapiera7fbd5a2016-06-16 09:17:49 -07003306 print()
3307 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003308 for dependent_branch in dependents:
3309 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003310 print(' %s : %s' % (dependent_branch, upload_status))
3311 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003312
3313 return 0
3314
3315
kmarshall3bff56b2016-06-06 18:31:47 -07003316def CMDarchive(parser, args):
3317 """Archives and deletes branches associated with closed changelists."""
3318 parser.add_option(
3319 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003320 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003321 parser.add_option(
3322 '-f', '--force', action='store_true',
3323 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003324 parser.add_option(
3325 '-d', '--dry-run', action='store_true',
3326 help='Skip the branch tagging and removal steps.')
3327 parser.add_option(
3328 '-t', '--notags', action='store_true',
3329 help='Do not tag archived branches. '
3330 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003331
3332 auth.add_auth_options(parser)
3333 options, args = parser.parse_args(args)
3334 if args:
3335 parser.error('Unsupported args: %s' % ' '.join(args))
3336 auth_config = auth.extract_auth_config_from_options(options)
3337
3338 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3339 if not branches:
3340 return 0
3341
vapiera7fbd5a2016-06-16 09:17:49 -07003342 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07003343 changes = [Changelist(branchref=b, auth_config=auth_config)
3344 for b in branches.splitlines()]
3345 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3346 statuses = get_cl_statuses(changes,
3347 fine_grained=True,
3348 max_processes=options.maxjobs)
3349 proposal = [(cl.GetBranch(),
3350 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3351 for cl, status in statuses
3352 if status == 'closed']
3353 proposal.sort()
3354
3355 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003356 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003357 return 0
3358
3359 current_branch = GetCurrentBranch()
3360
vapiera7fbd5a2016-06-16 09:17:49 -07003361 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003362 if options.notags:
3363 for next_item in proposal:
3364 print(' ' + next_item[0])
3365 else:
3366 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3367 for next_item in proposal:
3368 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003369
kmarshall9249e012016-08-23 12:02:16 -07003370 # Quit now on precondition failure or if instructed by the user, either
3371 # via an interactive prompt or by command line flags.
3372 if options.dry_run:
3373 print('\nNo changes were made (dry run).\n')
3374 return 0
3375 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003376 print('You are currently on a branch \'%s\' which is associated with a '
3377 'closed codereview issue, so archive cannot proceed. Please '
3378 'checkout another branch and run this command again.' %
3379 current_branch)
3380 return 1
kmarshall9249e012016-08-23 12:02:16 -07003381 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003382 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3383 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003384 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003385 return 1
3386
3387 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003388 if not options.notags:
3389 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003390 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003391
vapiera7fbd5a2016-06-16 09:17:49 -07003392 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003393
3394 return 0
3395
3396
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003397def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003398 """Show status of changelists.
3399
3400 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003401 - Red not sent for review or broken
3402 - Blue waiting for review
3403 - Yellow waiting for you to reply to review
3404 - Green LGTM'ed
3405 - Magenta in the commit queue
3406 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003407
3408 Also see 'git cl comments'.
3409 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003410 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003411 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003412 parser.add_option('-f', '--fast', action='store_true',
3413 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003414 parser.add_option(
3415 '-j', '--maxjobs', action='store', type=int,
3416 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003417
3418 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07003419 _add_codereview_issue_select_options(
3420 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003421 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07003422 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003423 if args:
3424 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003425 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003426
iannuccie53c9352016-08-17 14:40:40 -07003427 if options.issue is not None and not options.field:
3428 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07003429
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003430 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07003431 cl = Changelist(auth_config=auth_config, issue=options.issue,
3432 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003433 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003434 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003435 elif options.field == 'id':
3436 issueid = cl.GetIssue()
3437 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003438 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003439 elif options.field == 'patch':
3440 patchset = cl.GetPatchset()
3441 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003442 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003443 elif options.field == 'status':
3444 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003445 elif options.field == 'url':
3446 url = cl.GetIssueURL()
3447 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003448 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003449 return 0
3450
3451 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3452 if not branches:
3453 print('No local branch found.')
3454 return 0
3455
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003456 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003457 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003458 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003459 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003460 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003461 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003462 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003463
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003464 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003465 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
3466 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3467 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003468 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003469 c, status = output.next()
3470 branch_statuses[c.GetBranch()] = status
3471 status = branch_statuses.pop(branch)
3472 url = cl.GetIssueURL()
3473 if url and (not status or status == 'error'):
3474 # The issue probably doesn't exist anymore.
3475 url += ' (broken)'
3476
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003477 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003478 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003479 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003480 color = ''
3481 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003482 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07003483 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003484 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07003485 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003486
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003487 cl = Changelist(auth_config=auth_config)
vapiera7fbd5a2016-06-16 09:17:49 -07003488 print()
3489 print('Current branch:',)
3490 print(cl.GetBranch())
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003491 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003492 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003493 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003494 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003495 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003496 print('Issue description:')
3497 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003498 return 0
3499
3500
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003501def colorize_CMDstatus_doc():
3502 """To be called once in main() to add colors to git cl status help."""
3503 colors = [i for i in dir(Fore) if i[0].isupper()]
3504
3505 def colorize_line(line):
3506 for color in colors:
3507 if color in line.upper():
3508 # Extract whitespaces first and the leading '-'.
3509 indent = len(line) - len(line.lstrip(' ')) + 1
3510 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3511 return line
3512
3513 lines = CMDstatus.__doc__.splitlines()
3514 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3515
3516
phajdan.jre328cf92016-08-22 04:12:17 -07003517def write_json(path, contents):
3518 with open(path, 'w') as f:
3519 json.dump(contents, f)
3520
3521
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003522@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003523def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003524 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003525
3526 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003527 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003528 parser.add_option('-r', '--reverse', action='store_true',
3529 help='Lookup the branch(es) for the specified issues. If '
3530 'no issues are specified, all branches with mapped '
3531 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07003532 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003533 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003534 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003535 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003536
dnj@chromium.org406c4402015-03-03 17:22:28 +00003537 if options.reverse:
3538 branches = RunGit(['for-each-ref', 'refs/heads',
3539 '--format=%(refname:short)']).splitlines()
3540
3541 # Reverse issue lookup.
3542 issue_branch_map = {}
3543 for branch in branches:
3544 cl = Changelist(branchref=branch)
3545 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
3546 if not args:
3547 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003548 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003549 for issue in args:
3550 if not issue:
3551 continue
phajdan.jre328cf92016-08-22 04:12:17 -07003552 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07003553 print('Branch for issue number %s: %s' % (
3554 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003555 if options.json:
3556 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003557 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003558 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003559 if len(args) > 0:
3560 try:
3561 issue = int(args[0])
3562 except ValueError:
3563 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003564 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003565 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07003566 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07003567 if options.json:
3568 write_json(options.json, {
3569 'issue': cl.GetIssue(),
3570 'issue_url': cl.GetIssueURL(),
3571 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003572 return 0
3573
3574
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003575def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003576 """Shows or posts review comments for any changelist."""
3577 parser.add_option('-a', '--add-comment', dest='comment',
3578 help='comment to add to an issue')
3579 parser.add_option('-i', dest='issue',
3580 help="review issue id (defaults to current issue)")
smut@google.comc85ac942015-09-15 16:34:43 +00003581 parser.add_option('-j', '--json-file',
3582 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003583 auth.add_auth_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003584 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003585 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003586
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003587 issue = None
3588 if options.issue:
3589 try:
3590 issue = int(options.issue)
3591 except ValueError:
3592 DieWithError('A review issue id is expected to be a number')
3593
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00003594 cl = Changelist(issue=issue, codereview='rietveld', auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003595
3596 if options.comment:
3597 cl.AddComment(options.comment)
3598 return 0
3599
3600 data = cl.GetIssueProperties()
smut@google.comc85ac942015-09-15 16:34:43 +00003601 summary = []
maruel@chromium.org5cab2d32014-11-11 18:32:41 +00003602 for message in sorted(data.get('messages', []), key=lambda x: x['date']):
smut@google.comc85ac942015-09-15 16:34:43 +00003603 summary.append({
3604 'date': message['date'],
3605 'lgtm': False,
3606 'message': message['text'],
3607 'not_lgtm': False,
3608 'sender': message['sender'],
3609 })
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003610 if message['disapproval']:
3611 color = Fore.RED
smut@google.comc85ac942015-09-15 16:34:43 +00003612 summary[-1]['not lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003613 elif message['approval']:
3614 color = Fore.GREEN
smut@google.comc85ac942015-09-15 16:34:43 +00003615 summary[-1]['lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003616 elif message['sender'] == data['owner_email']:
3617 color = Fore.MAGENTA
3618 else:
3619 color = Fore.BLUE
vapiera7fbd5a2016-06-16 09:17:49 -07003620 print('\n%s%s %s%s' % (
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003621 color, message['date'].split('.', 1)[0], message['sender'],
vapiera7fbd5a2016-06-16 09:17:49 -07003622 Fore.RESET))
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003623 if message['text'].strip():
vapiera7fbd5a2016-06-16 09:17:49 -07003624 print('\n'.join(' ' + l for l in message['text'].splitlines()))
smut@google.comc85ac942015-09-15 16:34:43 +00003625 if options.json_file:
3626 with open(options.json_file, 'wb') as f:
3627 json.dump(summary, f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003628 return 0
3629
3630
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003631@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003632def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003633 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003634 parser.add_option('-d', '--display', action='store_true',
3635 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003636 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003637 help='New description to set for this issue (- for stdin, '
3638 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003639 parser.add_option('-f', '--force', action='store_true',
3640 help='Delete any unpublished Gerrit edits for this issue '
3641 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003642
3643 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003644 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003645 options, args = parser.parse_args(args)
3646 _process_codereview_select_options(parser, options)
3647
3648 target_issue = None
3649 if len(args) > 0:
martiniss6eda05f2016-06-30 10:18:35 -07003650 target_issue = ParseIssueNumberArgument(args[0])
3651 if not target_issue.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003652 parser.print_help()
3653 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003654
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003655 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003656
martiniss6eda05f2016-06-30 10:18:35 -07003657 kwargs = {
3658 'auth_config': auth_config,
3659 'codereview': options.forced_codereview,
3660 }
3661 if target_issue:
3662 kwargs['issue'] = target_issue.issue
3663 if options.forced_codereview == 'rietveld':
3664 kwargs['rietveld_server'] = target_issue.hostname
3665
3666 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003667
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003668 if not cl.GetIssue():
3669 DieWithError('This branch has no associated changelist.')
3670 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003671
smut@google.com34fb6b12015-07-13 20:03:26 +00003672 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003673 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003674 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003675
3676 if options.new_description:
3677 text = options.new_description
3678 if text == '-':
3679 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003680 elif text == '+':
3681 base_branch = cl.GetCommonAncestorWithUpstream()
3682 change = cl.GetChange(base_branch, None, local_description=True)
3683 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003684
3685 description.set_description(text)
3686 else:
3687 description.prompt()
3688
wychen@chromium.org063e4e52015-04-03 06:51:44 +00003689 if cl.GetDescription() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003690 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003691 return 0
3692
3693
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003694def CreateDescriptionFromLog(args):
3695 """Pulls out the commit log to use as a base for the CL description."""
3696 log_args = []
3697 if len(args) == 1 and not args[0].endswith('.'):
3698 log_args = [args[0] + '..']
3699 elif len(args) == 1 and args[0].endswith('...'):
3700 log_args = [args[0][:-1]]
3701 elif len(args) == 2:
3702 log_args = [args[0] + '..' + args[1]]
3703 else:
3704 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00003705 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003706
3707
thestig@chromium.org44202a22014-03-11 19:22:18 +00003708def CMDlint(parser, args):
3709 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003710 parser.add_option('--filter', action='append', metavar='-x,+y',
3711 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003712 auth.add_auth_options(parser)
3713 options, args = parser.parse_args(args)
3714 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003715
3716 # Access to a protected member _XX of a client class
3717 # pylint: disable=W0212
3718 try:
3719 import cpplint
3720 import cpplint_chromium
3721 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003722 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003723 return 1
3724
3725 # Change the current working directory before calling lint so that it
3726 # shows the correct base.
3727 previous_cwd = os.getcwd()
3728 os.chdir(settings.GetRoot())
3729 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003730 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003731 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
3732 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003733 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003734 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003735 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003736
3737 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003738 command = args + files
3739 if options.filter:
3740 command = ['--filter=' + ','.join(options.filter)] + command
3741 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003742
3743 white_regex = re.compile(settings.GetLintRegex())
3744 black_regex = re.compile(settings.GetLintIgnoreRegex())
3745 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3746 for filename in filenames:
3747 if white_regex.match(filename):
3748 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003749 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003750 else:
3751 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3752 extra_check_functions)
3753 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003754 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003755 finally:
3756 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003757 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003758 if cpplint._cpplint_state.error_count != 0:
3759 return 1
3760 return 0
3761
3762
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003763def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003764 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003765 parser.add_option('-u', '--upload', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003766 help='Run upload hook instead of the push/dcommit hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003767 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003768 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003769 auth.add_auth_options(parser)
3770 options, args = parser.parse_args(args)
3771 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003772
sbc@chromium.org71437c02015-04-09 19:29:40 +00003773 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003774 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003775 return 1
3776
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003777 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003778 if args:
3779 base_branch = args[0]
3780 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003781 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003782 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003783
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003784 cl.RunHook(
3785 committing=not options.upload,
3786 may_prompt=False,
3787 verbose=options.verbose,
3788 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003789 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003790
3791
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003792def GenerateGerritChangeId(message):
3793 """Returns Ixxxxxx...xxx change id.
3794
3795 Works the same way as
3796 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3797 but can be called on demand on all platforms.
3798
3799 The basic idea is to generate git hash of a state of the tree, original commit
3800 message, author/committer info and timestamps.
3801 """
3802 lines = []
3803 tree_hash = RunGitSilent(['write-tree'])
3804 lines.append('tree %s' % tree_hash.strip())
3805 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3806 if code == 0:
3807 lines.append('parent %s' % parent.strip())
3808 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3809 lines.append('author %s' % author.strip())
3810 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3811 lines.append('committer %s' % committer.strip())
3812 lines.append('')
3813 # Note: Gerrit's commit-hook actually cleans message of some lines and
3814 # whitespace. This code is not doing this, but it clearly won't decrease
3815 # entropy.
3816 lines.append(message)
3817 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
3818 stdin='\n'.join(lines))
3819 return 'I%s' % change_hash.strip()
3820
3821
wittman@chromium.org455dc922015-01-26 20:15:50 +00003822def GetTargetRef(remote, remote_branch, target_branch, pending_prefix):
3823 """Computes the remote branch ref to use for the CL.
3824
3825 Args:
3826 remote (str): The git remote for the CL.
3827 remote_branch (str): The git remote branch for the CL.
3828 target_branch (str): The target branch specified by the user.
3829 pending_prefix (str): The pending prefix from the settings.
3830 """
3831 if not (remote and remote_branch):
3832 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003833
wittman@chromium.org455dc922015-01-26 20:15:50 +00003834 if target_branch:
3835 # Cannonicalize branch references to the equivalent local full symbolic
3836 # refs, which are then translated into the remote full symbolic refs
3837 # below.
3838 if '/' not in target_branch:
3839 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3840 else:
3841 prefix_replacements = (
3842 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3843 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3844 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3845 )
3846 match = None
3847 for regex, replacement in prefix_replacements:
3848 match = re.search(regex, target_branch)
3849 if match:
3850 remote_branch = target_branch.replace(match.group(0), replacement)
3851 break
3852 if not match:
3853 # This is a branch path but not one we recognize; use as-is.
3854 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003855 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3856 # Handle the refs that need to land in different refs.
3857 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003858
wittman@chromium.org455dc922015-01-26 20:15:50 +00003859 # Create the true path to the remote branch.
3860 # Does the following translation:
3861 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3862 # * refs/remotes/origin/master -> refs/heads/master
3863 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3864 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3865 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3866 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3867 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3868 'refs/heads/')
3869 elif remote_branch.startswith('refs/remotes/branch-heads'):
3870 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
3871 # If a pending prefix exists then replace refs/ with it.
3872 if pending_prefix:
3873 remote_branch = remote_branch.replace('refs/', pending_prefix)
3874 return remote_branch
3875
3876
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003877def cleanup_list(l):
3878 """Fixes a list so that comma separated items are put as individual items.
3879
3880 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3881 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3882 """
3883 items = sum((i.split(',') for i in l), [])
3884 stripped_items = (i.strip() for i in items)
3885 return sorted(filter(None, stripped_items))
3886
3887
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003888@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003889def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003890 """Uploads the current changelist to codereview.
3891
3892 Can skip dependency patchset uploads for a branch by running:
3893 git config branch.branch_name.skip-deps-uploads True
3894 To unset run:
3895 git config --unset branch.branch_name.skip-deps-uploads
3896 Can also set the above globally by using the --global flag.
3897 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003898 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3899 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003900 parser.add_option('--bypass-watchlists', action='store_true',
3901 dest='bypass_watchlists',
3902 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003903 parser.add_option('-f', action='store_true', dest='force',
3904 help="force yes to questions (don't prompt)")
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00003905 parser.add_option('-m', dest='message', help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003906 parser.add_option('-b', '--bug',
3907 help='pre-populate the bug number(s) for this issue. '
3908 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07003909 parser.add_option('--message-file', dest='message_file',
3910 help='file which contains message for patchset')
andybons@chromium.org962f9462016-02-03 20:00:42 +00003911 parser.add_option('-t', dest='title',
3912 help='title for patchset (Rietveld only)')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003913 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003914 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003915 help='reviewer email addresses')
3916 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003917 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003918 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00003919 parser.add_option('-s', '--send-mail', action='store_true',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003920 help='send email to reviewer immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003921 parser.add_option('--emulate_svn_auto_props',
3922 '--emulate-svn-auto-props',
3923 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00003924 dest="emulate_svn_auto_props",
3925 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00003926 parser.add_option('-c', '--use-commit-queue', action='store_true',
3927 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003928 parser.add_option('--private', action='store_true',
3929 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00003930 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003931 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00003932 metavar='TARGET',
3933 help='Apply CL to remote ref TARGET. ' +
3934 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003935 parser.add_option('--squash', action='store_true',
3936 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003937 parser.add_option('--no-squash', action='store_true',
3938 help='Don\'t squash multiple commits into one ' +
3939 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07003940 parser.add_option('--topic', default=None,
3941 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00003942 parser.add_option('--email', default=None,
3943 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00003944 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
3945 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00003946 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
3947 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00003948 help='Send the patchset to do a CQ dry run right after '
3949 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003950 parser.add_option('--dependencies', action='store_true',
3951 help='Uploads CLs of all the local branches that depend on '
3952 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00003953
rmistry@google.com2dd99862015-06-22 12:22:18 +00003954 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00003955 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003956 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003957 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003958 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003959 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003960 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003961
sbc@chromium.org71437c02015-04-09 19:29:40 +00003962 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00003963 return 1
3964
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003965 options.reviewers = cleanup_list(options.reviewers)
3966 options.cc = cleanup_list(options.cc)
3967
tandriib80458a2016-06-23 12:20:07 -07003968 if options.message_file:
3969 if options.message:
3970 parser.error('only one of --message and --message-file allowed.')
3971 options.message = gclient_utils.FileRead(options.message_file)
3972 options.message_file = None
3973
tandrii4d0545a2016-07-06 03:56:49 -07003974 if options.cq_dry_run and options.use_commit_queue:
3975 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
3976
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00003977 # For sanity of test expectations, do this otherwise lazy-loading *now*.
3978 settings.GetIsGerrit()
3979
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003980 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00003981 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003982
3983
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003984def IsSubmoduleMergeCommit(ref):
3985 # When submodules are added to the repo, we expect there to be a single
3986 # non-git-svn merge commit at remote HEAD with a signature comment.
3987 pattern = '^SVN changes up to revision [0-9]*$'
szager@chromium.orge84b7542012-06-15 21:26:58 +00003988 cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003989 return RunGit(cmd) != ''
3990
3991
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003992def SendUpstream(parser, args, cmd):
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00003993 """Common code for CMDland and CmdDCommit
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003994
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003995 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
3996 upstream and closes the issue automatically and atomically.
3997
3998 Otherwise (in case of Rietveld):
3999 Squashes branch into a single commit.
4000 Updates changelog with metadata (e.g. pointer to review).
4001 Pushes/dcommits the code upstream.
4002 Updates review and closes.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004003 """
4004 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4005 help='bypass upload presubmit hook')
4006 parser.add_option('-m', dest='message',
4007 help="override review description")
4008 parser.add_option('-f', action='store_true', dest='force',
4009 help="force yes to questions (don't prompt)")
4010 parser.add_option('-c', dest='contributor',
4011 help="external contributor for patch (appended to " +
4012 "description and used as author for git). Should be " +
4013 "formatted as 'First Last <email@example.com>'")
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004014 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004015 auth.add_auth_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004016 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004017 auth_config = auth.extract_auth_config_from_options(options)
4018
4019 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004020
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00004021 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4022 if cl.IsGerrit():
4023 if options.message:
4024 # This could be implemented, but it requires sending a new patch to
4025 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4026 # Besides, Gerrit has the ability to change the commit message on submit
4027 # automatically, thus there is no need to support this option (so far?).
4028 parser.error('-m MESSAGE option is not supported for Gerrit.')
4029 if options.contributor:
4030 parser.error(
4031 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4032 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4033 'the contributor\'s "name <email>". If you can\'t upload such a '
4034 'commit for review, contact your repository admin and request'
4035 '"Forge-Author" permission.')
tandrii73449b02016-09-14 06:27:24 -07004036 if not cl.GetIssue():
4037 DieWithError('You must upload the issue first to Gerrit.\n'
4038 ' If you would rather have `git cl land` upload '
4039 'automatically for you, see http://crbug.com/642759')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00004040 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4041 options.verbose)
4042
iannucci@chromium.org5724c962014-04-11 09:32:56 +00004043 current = cl.GetBranch()
4044 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4045 if not settings.GetIsGitSvn() and remote == '.':
vapiera7fbd5a2016-06-16 09:17:49 -07004046 print()
4047 print('Attempting to push branch %r into another local branch!' % current)
4048 print()
4049 print('Either reparent this branch on top of origin/master:')
4050 print(' git reparent-branch --root')
4051 print()
4052 print('OR run `git rebase-update` if you think the parent branch is ')
4053 print('already committed.')
4054 print()
4055 print(' Current parent: %r' % upstream_branch)
iannucci@chromium.org5724c962014-04-11 09:32:56 +00004056 return 1
4057
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004058 if not args or cmd == 'land':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004059 # Default to merging against our best guess of the upstream branch.
4060 args = [cl.GetUpstreamBranch()]
4061
maruel@chromium.org13f623c2011-07-22 16:02:23 +00004062 if options.contributor:
4063 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
vapiera7fbd5a2016-06-16 09:17:49 -07004064 print("Please provide contibutor as 'First Last <email@example.com>'")
maruel@chromium.org13f623c2011-07-22 16:02:23 +00004065 return 1
4066
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004067 base_branch = args[0]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004068 base_has_submodules = IsSubmoduleMergeCommit(base_branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004069
sbc@chromium.org71437c02015-04-09 19:29:40 +00004070 if git_common.is_dirty_git_tree(cmd):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004071 return 1
4072
4073 # This rev-list syntax means "show all commits not in my branch that
4074 # are in base_branch".
4075 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4076 base_branch]).splitlines()
4077 if upstream_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07004078 print('Base branch "%s" has %d commits '
4079 'not in this branch.' % (base_branch, len(upstream_commits)))
4080 print('Run "git merge %s" before attempting to %s.' % (base_branch, cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004081 return 1
4082
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004083 # This is the revision `svn dcommit` will commit on top of.
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004084 svn_head = None
4085 if cmd == 'dcommit' or base_has_submodules:
4086 svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
4087 '--pretty=format:%H'])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004088
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004089 if cmd == 'dcommit':
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004090 # If the base_head is a submodule merge commit, the first parent of the
4091 # base_head should be a git-svn commit, which is what we're interested in.
4092 base_svn_head = base_branch
4093 if base_has_submodules:
4094 base_svn_head += '^1'
4095
4096 extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004097 if extra_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07004098 print('This branch has %d additional commits not upstreamed yet.'
4099 % len(extra_commits.splitlines()))
4100 print('Upstream "%s" or rebase this branch on top of the upstream trunk '
4101 'before attempting to %s.' % (base_branch, cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004102 return 1
4103
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004104 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004105 if not options.bypass_hooks:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00004106 author = None
4107 if options.contributor:
4108 author = re.search(r'\<(.*)\>', options.contributor).group(1)
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004109 hook_results = cl.RunHook(
4110 committing=True,
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004111 may_prompt=not options.force,
4112 verbose=options.verbose,
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004113 change=cl.GetChange(merge_base, author))
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004114 if not hook_results.should_continue():
4115 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004116
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004117 # Check the tree status if the tree status URL is set.
4118 status = GetTreeStatus()
4119 if 'closed' == status:
4120 print('The tree is closed. Please wait for it to reopen. Use '
4121 '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
4122 return 1
4123 elif 'unknown' == status:
4124 print('Unable to determine tree status. Please verify manually and '
4125 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
4126 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004127
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004128 change_desc = ChangeDescription(options.message)
4129 if not change_desc.description and cl.GetIssue():
4130 change_desc = ChangeDescription(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004131
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004132 if not change_desc.description:
erg@chromium.org1a173982012-08-29 20:43:05 +00004133 if not cl.GetIssue() and options.bypass_hooks:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004134 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
erg@chromium.org1a173982012-08-29 20:43:05 +00004135 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004136 print('No description set.')
4137 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
erg@chromium.org1a173982012-08-29 20:43:05 +00004138 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004139
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004140 # Keep a separate copy for the commit message, because the commit message
4141 # contains the link to the Rietveld issue, while the Rietveld message contains
4142 # the commit viewvc url.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00004143 # Keep a separate copy for the commit message.
4144 if cl.GetIssue():
maruel@chromium.orgcf087782013-07-23 13:08:48 +00004145 change_desc.update_reviewers(cl.GetApprovingReviewers())
maruel@chromium.orge52678e2013-04-26 18:34:44 +00004146
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004147 commit_desc = ChangeDescription(change_desc.description)
maruel@chromium.orgcc73ad62011-07-06 17:39:26 +00004148 if cl.GetIssue():
smut@google.com4c61dcc2015-06-08 22:31:29 +00004149 # Xcode won't linkify this URL unless there is a non-whitespace character
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +00004150 # after it. Add a period on a new line to circumvent this. Also add a space
4151 # before the period to make sure that Gitiles continues to correctly resolve
4152 # the URL.
4153 commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004154 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004155 commit_desc.append_footer('Patch from %s.' % options.contributor)
4156
agable@chromium.orgeec3ea32013-08-15 20:31:39 +00004157 print('Description:')
4158 print(commit_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004159
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004160 branches = [merge_base, cl.GetBranchRef()]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004161 if not options.force:
iannucci@chromium.org79540052012-10-19 23:15:26 +00004162 print_stats(options.similarity, options.find_copies, branches)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004163
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004164 # We want to squash all this branch's commits into one commit with the proper
4165 # description. We do this by doing a "reset --soft" to the base branch (which
4166 # keeps the working copy the same), then dcommitting that. If origin/master
4167 # has a submodule merge commit, we'll also need to cherry-pick the squashed
4168 # commit onto a branch based on the git-svn head.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004169 MERGE_BRANCH = 'git-cl-commit'
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004170 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4171 # Delete the branches if they exist.
4172 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4173 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4174 result = RunGitWithCode(showref_cmd)
4175 if result[0] == 0:
4176 RunGit(['branch', '-D', branch])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004177
4178 # We might be in a directory that's present in this branch but not in the
4179 # trunk. Move up to the top of the tree so that git commands that expect a
4180 # valid CWD won't fail after we check out the merge branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004181 rel_base_path = settings.GetRelativeRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004182 if rel_base_path:
4183 os.chdir(rel_base_path)
4184
4185 # Stuff our change into the merge branch.
4186 # We wrap in a try...finally block so if anything goes wrong,
4187 # we clean up the branches.
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004188 retcode = -1
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004189 pushed_to_pending = False
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004190 pending_ref = None
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004191 revision = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004192 try:
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00004193 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004194 RunGit(['reset', '--soft', merge_base])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004195 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004196 RunGit(
4197 [
4198 'commit', '--author', options.contributor,
4199 '-m', commit_desc.description,
4200 ])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004201 else:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004202 RunGit(['commit', '-m', commit_desc.description])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004203 if base_has_submodules:
4204 cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip()
4205 RunGit(['branch', CHERRY_PICK_BRANCH, svn_head])
4206 RunGit(['checkout', CHERRY_PICK_BRANCH])
4207 RunGit(['cherry-pick', cherry_pick_commit])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004208 if cmd == 'land':
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004209 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004210 mirror = settings.GetGitMirror(remote)
4211 pushurl = mirror.url if mirror else remote
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004212 pending_prefix = settings.GetPendingRefPrefix()
4213 if not pending_prefix or branch.startswith(pending_prefix):
4214 # If not using refs/pending/heads/* at all, or target ref is already set
4215 # to pending, then push to the target ref directly.
4216 retcode, output = RunGitWithCode(
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004217 ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004218 pushed_to_pending = pending_prefix and branch.startswith(pending_prefix)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004219 else:
4220 # Cherry-pick the change on top of pending ref and then push it.
4221 assert branch.startswith('refs/'), branch
4222 assert pending_prefix[-1] == '/', pending_prefix
4223 pending_ref = pending_prefix + branch[len('refs/'):]
tandriibf429402016-09-14 07:09:12 -07004224 retcode, output = PushToGitPending(pushurl, pending_ref)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004225 pushed_to_pending = (retcode == 0)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004226 if retcode == 0:
4227 revision = RunGit(['rev-parse', 'HEAD']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004228 else:
4229 # dcommit the merge branch.
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00004230 cmd_args = [
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00004231 'svn', 'dcommit',
4232 '-C%s' % options.similarity,
4233 '--no-rebase', '--rmdir',
4234 ]
4235 if settings.GetForceHttpsCommitUrl():
4236 # Allow forcing https commit URLs for some projects that don't allow
4237 # committing to http URLs (like Google Code).
4238 remote_url = cl.GetGitSvnRemoteUrl()
4239 if urlparse.urlparse(remote_url).scheme == 'http':
4240 remote_url = remote_url.replace('http://', 'https://')
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00004241 cmd_args.append('--commit-url=%s' % remote_url)
4242 _, output = RunGitWithCode(cmd_args)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004243 if 'Committed r' in output:
4244 revision = re.match(
4245 '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
4246 logging.debug(output)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004247 finally:
4248 # And then swap back to the original branch and clean up.
4249 RunGit(['checkout', '-q', cl.GetBranch()])
4250 RunGit(['branch', '-D', MERGE_BRANCH])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004251 if base_has_submodules:
4252 RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004253
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004254 if not revision:
vapiera7fbd5a2016-06-16 09:17:49 -07004255 print('Failed to push. If this persists, please file a bug.')
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004256 return 1
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004257
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004258 killed = False
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004259 if pushed_to_pending:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004260 try:
4261 revision = WaitForRealCommit(remote, revision, base_branch, branch)
4262 # We set pushed_to_pending to False, since it made it all the way to the
4263 # real ref.
4264 pushed_to_pending = False
4265 except KeyboardInterrupt:
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004266 killed = True
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004267
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004268 if cl.GetIssue():
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004269 to_pending = ' to pending queue' if pushed_to_pending else ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004270 viewvc_url = settings.GetViewVCUrl()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004271 if not to_pending:
4272 if viewvc_url and revision:
4273 change_desc.append_footer(
4274 'Committed: %s%s' % (viewvc_url, revision))
4275 elif revision:
4276 change_desc.append_footer('Committed: %s' % (revision,))
vapiera7fbd5a2016-06-16 09:17:49 -07004277 print('Closing issue '
4278 '(you may be prompted for your codereview password)...')
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004279 cl.UpdateDescription(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004280 cl.CloseIssue()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004281 props = cl.GetIssueProperties()
sadrul@chromium.org34b5d822013-02-18 01:39:24 +00004282 patch_num = len(props['patchsets'])
rmistry@google.com52d224a2014-08-27 14:44:41 +00004283 comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
mark@chromium.org782570c2014-09-26 21:48:02 +00004284 patch_num, props['patchsets'][-1], to_pending, revision)
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004285 if options.bypass_hooks:
4286 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4287 else:
4288 comment += ' (presubmit successful).'
iannucci@chromium.orgb85a3162013-01-26 01:11:13 +00004289 cl.RpcServer().add_comment(cl.GetIssue(), comment)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004290
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004291 if pushed_to_pending:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004292 _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
vapiera7fbd5a2016-06-16 09:17:49 -07004293 print('The commit is in the pending queue (%s).' % pending_ref)
4294 print('It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
4295 'footer.' % branch)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004296
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004297 hook = POSTUPSTREAM_HOOK_PATTERN % cmd
4298 if os.path.isfile(hook):
4299 RunCommand([hook, merge_base], error_ok=True)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004300
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004301 return 1 if killed else 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004302
4303
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004304def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
vapiera7fbd5a2016-06-16 09:17:49 -07004305 print()
4306 print('Waiting for commit to be landed on %s...' % real_ref)
4307 print('(If you are impatient, you may Ctrl-C once without harm)')
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004308 target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
4309 current_rev = RunGit(['rev-parse', local_base_ref]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004310 mirror = settings.GetGitMirror(remote)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004311
4312 loop = 0
4313 while True:
4314 sys.stdout.write('fetching (%d)... \r' % loop)
4315 sys.stdout.flush()
4316 loop += 1
4317
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004318 if mirror:
4319 mirror.populate()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004320 RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID)
4321 to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
4322 commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)])
4323 for commit in commits.splitlines():
4324 if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree:
vapiera7fbd5a2016-06-16 09:17:49 -07004325 print('Found commit on %s' % real_ref)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004326 return commit
4327
4328 current_rev = to_rev
4329
4330
tandriibf429402016-09-14 07:09:12 -07004331def PushToGitPending(remote, pending_ref):
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004332 """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
4333
4334 Returns:
4335 (retcode of last operation, output log of last operation).
4336 """
4337 assert pending_ref.startswith('refs/'), pending_ref
4338 local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):]
4339 cherry = RunGit(['rev-parse', 'HEAD']).strip()
4340 code = 0
4341 out = ''
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004342 max_attempts = 3
4343 attempts_left = max_attempts
4344 while attempts_left:
4345 if attempts_left != max_attempts:
vapiera7fbd5a2016-06-16 09:17:49 -07004346 print('Retrying, %d attempts left...' % (attempts_left - 1,))
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004347 attempts_left -= 1
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004348
4349 # Fetch. Retry fetch errors.
vapiera7fbd5a2016-06-16 09:17:49 -07004350 print('Fetching pending ref %s...' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004351 code, out = RunGitWithCode(
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004352 ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004353 if code:
vapiera7fbd5a2016-06-16 09:17:49 -07004354 print('Fetch failed with exit code %d.' % code)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004355 if out.strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004356 print(out.strip())
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004357 continue
4358
4359 # Try to cherry pick. Abort on merge conflicts.
vapiera7fbd5a2016-06-16 09:17:49 -07004360 print('Cherry-picking commit on top of pending ref...')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004361 RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004362 code, out = RunGitWithCode(['cherry-pick', cherry])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004363 if code:
vapiera7fbd5a2016-06-16 09:17:49 -07004364 print('Your patch doesn\'t apply cleanly to ref \'%s\', '
4365 'the following files have merge conflicts:' % pending_ref)
4366 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
4367 print('Please rebase your patch and try again.')
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004368 RunGitWithCode(['cherry-pick', '--abort'])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004369 return code, out
4370
4371 # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
vapiera7fbd5a2016-06-16 09:17:49 -07004372 print('Pushing commit to %s... It can take a while.' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004373 code, out = RunGitWithCode(
4374 ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
4375 if code == 0:
4376 # Success.
vapiera7fbd5a2016-06-16 09:17:49 -07004377 print('Commit pushed to pending ref successfully!')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004378 return code, out
4379
vapiera7fbd5a2016-06-16 09:17:49 -07004380 print('Push failed with exit code %d.' % code)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004381 if out.strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004382 print(out.strip())
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004383 if IsFatalPushFailure(out):
vapiera7fbd5a2016-06-16 09:17:49 -07004384 print('Fatal push error. Make sure your .netrc credentials and git '
4385 'user.email are correct and you have push access to the repo.')
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004386 return code, out
4387
vapiera7fbd5a2016-06-16 09:17:49 -07004388 print('All attempts to push to pending ref failed.')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004389 return code, out
4390
4391
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004392def IsFatalPushFailure(push_stdout):
4393 """True if retrying push won't help."""
4394 return '(prohibited by Gerrit)' in push_stdout
4395
4396
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004397@subcommand.usage('[upstream branch to apply against]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004398def CMDdcommit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004399 """Commits the current changelist via git-svn."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004400 if not settings.GetIsGitSvn():
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004401 if git_footers.get_footer_svn_id():
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004402 # If it looks like previous commits were mirrored with git-svn.
4403 message = """This repository appears to be a git-svn mirror, but no
4404upstream SVN master is set. You probably need to run 'git auto-svn' once."""
4405 else:
4406 message = """This doesn't appear to be an SVN repository.
4407If your project has a true, writeable git repository, you probably want to run
4408'git cl land' instead.
4409If your project has a git mirror of an upstream SVN master, you probably need
4410to run 'git svn init'.
4411
4412Using the wrong command might cause your commit to appear to succeed, and the
4413review to be closed, without actually landing upstream. If you choose to
4414proceed, please verify that the commit lands upstream as expected."""
thakis@chromium.orgcde3bb62011-01-20 01:16:14 +00004415 print(message)
maruel@chromium.org90541732011-04-01 17:54:18 +00004416 ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
tandrii3bb82ff2016-06-17 07:36:36 -07004417 print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n'
4418 'Please let us know of this project you are committing to:'
4419 ' http://crbug.com/600451')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004420 return SendUpstream(parser, args, 'dcommit')
4421
4422
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004423@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004424def CMDland(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004425 """Commits the current changelist via git."""
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004426 if settings.GetIsGitSvn() or git_footers.get_footer_svn_id():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004427 print('This appears to be an SVN repository.')
4428 print('Are you sure you didn\'t mean \'git cl dcommit\'?')
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004429 print('(Ignore if this is the first commit after migrating from svn->git)')
maruel@chromium.org90541732011-04-01 17:54:18 +00004430 ask_for_data('[Press enter to push or ctrl-C to quit]')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004431 return SendUpstream(parser, args, 'land')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004432
4433
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004434@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004435def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004436 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004437 parser.add_option('-b', dest='newbranch',
4438 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004439 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004440 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004441 parser.add_option('-d', '--directory', action='store', metavar='DIR',
4442 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004443 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004444 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004445 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004446 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004447 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004448 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004449
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004450
4451 group = optparse.OptionGroup(
4452 parser,
4453 'Options for continuing work on the current issue uploaded from a '
4454 'different clone (e.g. different machine). Must be used independently '
4455 'from the other options. No issue number should be specified, and the '
4456 'branch must have an issue number associated with it')
4457 group.add_option('--reapply', action='store_true', dest='reapply',
4458 help='Reset the branch and reapply the issue.\n'
4459 'CAUTION: This will undo any local changes in this '
4460 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004461
4462 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004463 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004464 parser.add_option_group(group)
4465
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004466 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004467 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004468 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004469 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004470 auth_config = auth.extract_auth_config_from_options(options)
4471
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004472
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004473 if options.reapply :
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004474 if options.newbranch:
4475 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004476 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004477 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004478
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004479 cl = Changelist(auth_config=auth_config,
4480 codereview=options.forced_codereview)
4481 if not cl.GetIssue():
4482 parser.error('current branch must have an associated issue')
4483
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004484 upstream = cl.GetUpstreamBranch()
4485 if upstream == None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004486 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004487
4488 RunGit(['reset', '--hard', upstream])
4489 if options.pull:
4490 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004491
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004492 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4493 options.directory)
4494
4495 if len(args) != 1 or not args[0]:
4496 parser.error('Must specify issue number or url')
4497
4498 # We don't want uncommitted changes mixed up with the patch.
4499 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004500 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004501
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004502 if options.newbranch:
4503 if options.force:
4504 RunGit(['branch', '-D', options.newbranch],
4505 stderr=subprocess2.PIPE, error_ok=True)
4506 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07004507 elif not GetCurrentBranch():
4508 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004509
4510 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
4511
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004512 if cl.IsGerrit():
4513 if options.reject:
4514 parser.error('--reject is not supported with Gerrit codereview.')
4515 if options.nocommit:
4516 parser.error('--nocommit is not supported with Gerrit codereview.')
4517 if options.directory:
4518 parser.error('--directory is not supported with Gerrit codereview.')
4519
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004520 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004521 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004522
4523
4524def CMDrebase(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004525 """Rebases current branch on top of svn repo."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004526 # Provide a wrapper for git svn rebase to help avoid accidental
4527 # git svn dcommit.
4528 # It's the only command that doesn't use parser at all since we just defer
4529 # execution to git-svn.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00004530
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004531 return RunGitWithCode(['svn', 'rebase'] + args)[1]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004532
4533
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004534def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004535 """Fetches the tree status and returns either 'open', 'closed',
4536 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004537 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004538 if url:
4539 status = urllib2.urlopen(url).read().lower()
4540 if status.find('closed') != -1 or status == '0':
4541 return 'closed'
4542 elif status.find('open') != -1 or status == '1':
4543 return 'open'
4544 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004545 return 'unset'
4546
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004547
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004548def GetTreeStatusReason():
4549 """Fetches the tree status from a json url and returns the message
4550 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004551 url = settings.GetTreeStatusUrl()
4552 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004553 connection = urllib2.urlopen(json_url)
4554 status = json.loads(connection.read())
4555 connection.close()
4556 return status['message']
4557
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004558
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00004559def GetBuilderMaster(bot_list):
4560 """For a given builder, fetch the master from AE if available."""
4561 map_url = 'https://builders-map.appspot.com/'
4562 try:
4563 master_map = json.load(urllib2.urlopen(map_url))
4564 except urllib2.URLError as e:
4565 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
4566 (map_url, e))
4567 except ValueError as e:
4568 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
4569 if not master_map:
4570 return None, 'Failed to build master map.'
4571
4572 result_master = ''
4573 for bot in bot_list:
4574 builder = bot.split(':', 1)[0]
4575 master_list = master_map.get(builder, [])
4576 if not master_list:
4577 return None, ('No matching master for builder %s.' % builder)
4578 elif len(master_list) > 1:
4579 return None, ('The builder name %s exists in multiple masters %s.' %
4580 (builder, master_list))
4581 else:
4582 cur_master = master_list[0]
4583 if not result_master:
4584 result_master = cur_master
4585 elif result_master != cur_master:
4586 return None, 'The builders do not belong to the same master.'
4587 return result_master, None
4588
4589
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004590def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004591 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004592 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004593 status = GetTreeStatus()
4594 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004595 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004596 return 2
4597
vapiera7fbd5a2016-06-16 09:17:49 -07004598 print('The tree is %s' % status)
4599 print()
4600 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004601 if status != 'open':
4602 return 1
4603 return 0
4604
4605
maruel@chromium.org15192402012-09-06 12:38:29 +00004606def CMDtry(parser, args):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004607 """Triggers try jobs through BuildBucket."""
maruel@chromium.org15192402012-09-06 12:38:29 +00004608 group = optparse.OptionGroup(parser, "Try job options")
4609 group.add_option(
4610 "-b", "--bot", action="append",
4611 help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple "
4612 "times to specify multiple builders. ex: "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004613 "'-b win_rel -b win_layout'. See "
maruel@chromium.org15192402012-09-06 12:38:29 +00004614 "the try server waterfall for the builders name and the tests "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004615 "available."))
maruel@chromium.org15192402012-09-06 12:38:29 +00004616 group.add_option(
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004617 "-m", "--master", default='',
iannucci@chromium.org9e849272014-04-04 00:31:55 +00004618 help=("Specify a try master where to run the tries."))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004619 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00004620 "-r", "--revision",
4621 help="Revision to use for the try job; default: the "
4622 "revision will be determined by the try server; see "
4623 "its waterfall for more info")
4624 group.add_option(
4625 "-c", "--clobber", action="store_true", default=False,
4626 help="Force a clobber before building; e.g. don't do an "
4627 "incremental build")
4628 group.add_option(
4629 "--project",
4630 help="Override which project to use. Projects are defined "
4631 "server-side to define what default bot set to use")
4632 group.add_option(
machenbach@chromium.org45453142015-09-15 08:45:22 +00004633 "-p", "--property", dest="properties", action="append", default=[],
4634 help="Specify generic properties in the form -p key1=value1 -p "
4635 "key2=value2 etc (buildbucket only). The value will be treated as "
4636 "json if decodable, or as string otherwise.")
4637 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00004638 "-n", "--name", help="Try job name; default to current branch name")
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004639 group.add_option(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004640 "--use-rietveld", action="store_true", default=False,
4641 help="Use Rietveld to trigger try jobs.")
4642 group.add_option(
4643 "--buildbucket-host", default='cr-buildbucket.appspot.com',
4644 help="Host of buildbucket. The default host is %default.")
maruel@chromium.org15192402012-09-06 12:38:29 +00004645 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004646 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004647 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004648 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004649
machenbach@chromium.org45453142015-09-15 08:45:22 +00004650 if options.use_rietveld and options.properties:
4651 parser.error('Properties can only be specified with buildbucket')
4652
4653 # Make sure that all properties are prop=value pairs.
4654 bad_params = [x for x in options.properties if '=' not in x]
4655 if bad_params:
4656 parser.error('Got properties with missing "=": %s' % bad_params)
4657
maruel@chromium.org15192402012-09-06 12:38:29 +00004658 if args:
4659 parser.error('Unknown arguments: %s' % args)
4660
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004661 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00004662 if not cl.GetIssue():
4663 parser.error('Need to upload first')
4664
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004665 if cl.IsGerrit():
4666 parser.error(
4667 'Not yet supported for Gerrit (http://crbug.com/599931).\n'
4668 'If your project has Commit Queue, dry run is a workaround:\n'
4669 ' git cl set-commit --dry-run')
4670 # Code below assumes Rietveld issue.
4671 # TODO(tandrii): actually implement for Gerrit http://crbug.com/599931.
4672
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004673 props = cl.GetIssueProperties()
agable@chromium.org787e3062014-08-20 16:31:19 +00004674 if props.get('closed'):
qyearsleyeab3c042016-08-24 09:18:28 -07004675 parser.error('Cannot send try jobs for a closed CL')
agable@chromium.org787e3062014-08-20 16:31:19 +00004676
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004677 if props.get('private'):
qyearsleyeab3c042016-08-24 09:18:28 -07004678 parser.error('Cannot use try bots with private issue')
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004679
maruel@chromium.org15192402012-09-06 12:38:29 +00004680 if not options.name:
4681 options.name = cl.GetBranch()
4682
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004683 if options.bot and not options.master:
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00004684 options.master, err_msg = GetBuilderMaster(options.bot)
4685 if err_msg:
4686 parser.error('Tryserver master cannot be found because: %s\n'
4687 'Please manually specify the tryserver master'
4688 ', e.g. "-m tryserver.chromium.linux".' % err_msg)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004689
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004690 def GetMasterMap():
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004691 # Process --bot.
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004692 if not options.bot:
4693 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
maruel@chromium.org15192402012-09-06 12:38:29 +00004694
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004695 # Get try masters from PRESUBMIT.py files.
4696 masters = presubmit_support.DoGetTryMasters(
4697 change,
4698 change.LocalPaths(),
4699 settings.GetRoot(),
4700 None,
4701 None,
4702 options.verbose,
4703 sys.stdout)
4704 if masters:
4705 return masters
stip@chromium.org43064fd2013-12-18 20:07:44 +00004706
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004707 # Fall back to deprecated method: get try slaves from PRESUBMIT.py files.
4708 options.bot = presubmit_support.DoGetTrySlaves(
4709 change,
4710 change.LocalPaths(),
4711 settings.GetRoot(),
4712 None,
4713 None,
4714 options.verbose,
4715 sys.stdout)
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004716
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004717 if not options.bot:
tandrii9de9ec62016-07-13 03:01:59 -07004718 return {}
maruel@chromium.org15192402012-09-06 12:38:29 +00004719
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004720 builders_and_tests = {}
4721 # TODO(machenbach): The old style command-line options don't support
4722 # multiple try masters yet.
4723 old_style = filter(lambda x: isinstance(x, basestring), options.bot)
4724 new_style = filter(lambda x: isinstance(x, tuple), options.bot)
4725
4726 for bot in old_style:
4727 if ':' in bot:
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004728 parser.error('Specifying testfilter is no longer supported')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004729 elif ',' in bot:
4730 parser.error('Specify one bot per --bot flag')
4731 else:
tandrii@chromium.org3764fa22015-10-21 16:40:40 +00004732 builders_and_tests.setdefault(bot, [])
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004733
4734 for bot, tests in new_style:
4735 builders_and_tests.setdefault(bot, []).extend(tests)
4736
4737 # Return a master map with one master to be backwards compatible. The
4738 # master name defaults to an empty string, which will cause the master
4739 # not to be set on rietveld (deprecated).
4740 return {options.master: builders_and_tests}
4741
4742 masters = GetMasterMap()
tandrii9de9ec62016-07-13 03:01:59 -07004743 if not masters:
4744 # Default to triggering Dry Run (see http://crbug.com/625697).
4745 if options.verbose:
4746 print('git cl try with no bots now defaults to CQ Dry Run.')
4747 try:
4748 cl.SetCQState(_CQState.DRY_RUN)
4749 print('scheduled CQ Dry Run on %s' % cl.GetIssueURL())
4750 return 0
4751 except KeyboardInterrupt:
4752 raise
4753 except:
4754 print('WARNING: failed to trigger CQ Dry Run.\n'
4755 'Either:\n'
4756 ' * your project has no CQ\n'
4757 ' * you don\'t have permission to trigger Dry Run\n'
4758 ' * bug in this code (see stack trace below).\n'
4759 'Consider specifying which bots to trigger manually '
4760 'or asking your project owners for permissions '
4761 'or contacting Chrome Infrastructure team at '
4762 'https://www.chromium.org/infra\n\n')
4763 # Still raise exception so that stack trace is printed.
4764 raise
stip@chromium.org43064fd2013-12-18 20:07:44 +00004765
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004766 for builders in masters.itervalues():
4767 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004768 print('ERROR You are trying to send a job to a triggered bot. This type '
4769 'of bot requires an\ninitial job from a parent (usually a builder).'
4770 ' Instead send your job to the parent.\n'
4771 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004772 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004773
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004774 patchset = cl.GetMostRecentPatchset()
4775 if patchset and patchset != cl.GetPatchset():
4776 print(
4777 '\nWARNING Mismatch between local config and server. Did a previous '
4778 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
4779 'Continuing using\npatchset %s.\n' % patchset)
nodirabb9b222016-07-29 14:23:20 -07004780 if not options.use_rietveld:
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004781 try:
4782 trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
4783 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004784 print('ERROR: %s' % ex)
fischman@chromium.orgd246c972013-12-21 22:47:38 +00004785 return 1
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004786 except Exception as e:
4787 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
qyearsleyeab3c042016-08-24 09:18:28 -07004788 print('ERROR: Exception when trying to trigger try jobs: %s\n%s' %
vapiera7fbd5a2016-06-16 09:17:49 -07004789 (e, stacktrace))
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004790 return 1
4791 else:
4792 try:
4793 cl.RpcServer().trigger_distributed_try_jobs(
4794 cl.GetIssue(), patchset, options.name, options.clobber,
4795 options.revision, masters)
4796 except urllib2.HTTPError as e:
4797 if e.code == 404:
4798 print('404 from rietveld; '
4799 'did you mean to use "git try" instead of "git cl try"?')
4800 return 1
4801 print('Tried jobs on:')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004802
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004803 for (master, builders) in sorted(masters.iteritems()):
4804 if master:
vapiera7fbd5a2016-06-16 09:17:49 -07004805 print('Master: %s' % master)
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004806 length = max(len(builder) for builder in builders)
4807 for builder in sorted(builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004808 print(' %*s: %s' % (length, builder, ','.join(builders[builder])))
maruel@chromium.org15192402012-09-06 12:38:29 +00004809 return 0
4810
4811
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004812def CMDtry_results(parser, args):
4813 group = optparse.OptionGroup(parser, "Try job results options")
4814 group.add_option(
4815 "-p", "--patchset", type=int, help="patchset number if not current.")
4816 group.add_option(
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004817 "--print-master", action='store_true', help="print master name as well.")
4818 group.add_option(
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004819 "--color", action='store_true', default=setup_color.IS_TTY,
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004820 help="force color output, useful when piping output.")
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004821 group.add_option(
4822 "--buildbucket-host", default='cr-buildbucket.appspot.com',
4823 help="Host of buildbucket. The default host is %default.")
qyearsley53f48a12016-09-01 10:45:13 -07004824 group.add_option(
4825 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004826 parser.add_option_group(group)
4827 auth.add_auth_options(parser)
4828 options, args = parser.parse_args(args)
4829 if args:
4830 parser.error('Unrecognized args: %s' % ' '.join(args))
4831
4832 auth_config = auth.extract_auth_config_from_options(options)
4833 cl = Changelist(auth_config=auth_config)
4834 if not cl.GetIssue():
4835 parser.error('Need to upload first')
4836
4837 if not options.patchset:
4838 options.patchset = cl.GetMostRecentPatchset()
4839 if options.patchset and options.patchset != cl.GetPatchset():
4840 print(
4841 '\nWARNING Mismatch between local config and server. Did a previous '
4842 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
4843 'Continuing using\npatchset %s.\n' % options.patchset)
4844 try:
4845 jobs = fetch_try_jobs(auth_config, cl, options)
4846 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004847 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004848 return 1
4849 except Exception as e:
4850 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
qyearsleyeab3c042016-08-24 09:18:28 -07004851 print('ERROR: Exception when trying to fetch try jobs: %s\n%s' %
vapiera7fbd5a2016-06-16 09:17:49 -07004852 (e, stacktrace))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004853 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004854 if options.json:
4855 write_try_results_json(options.json, jobs)
4856 else:
4857 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004858 return 0
4859
4860
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004861@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004862def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004863 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004864 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004865 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004866 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004867
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004868 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004869 if args:
4870 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004871 branch = cl.GetBranch()
4872 RunGit(['branch', '--set-upstream', branch, args[0]])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004873 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004874 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004875
4876 # Clear configured merge-base, if there is one.
4877 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004878 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004879 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004880 return 0
4881
4882
thestig@chromium.org00858c82013-12-02 23:08:03 +00004883def CMDweb(parser, args):
4884 """Opens the current CL in the web browser."""
4885 _, args = parser.parse_args(args)
4886 if args:
4887 parser.error('Unrecognized args: %s' % ' '.join(args))
4888
4889 issue_url = Changelist().GetIssueURL()
4890 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004891 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004892 return 1
4893
4894 webbrowser.open(issue_url)
4895 return 0
4896
4897
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004898def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004899 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004900 parser.add_option('-d', '--dry-run', action='store_true',
4901 help='trigger in dry run mode')
4902 parser.add_option('-c', '--clear', action='store_true',
4903 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004904 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004905 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004906 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004907 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004908 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004909 if args:
4910 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004911 if options.dry_run and options.clear:
4912 parser.error('Make up your mind: both --dry-run and --clear not allowed')
4913
iannuccie53c9352016-08-17 14:40:40 -07004914 cl = Changelist(auth_config=auth_config, issue=options.issue,
4915 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004916 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004917 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004918 elif options.dry_run:
4919 state = _CQState.DRY_RUN
4920 else:
4921 state = _CQState.COMMIT
4922 if not cl.GetIssue():
4923 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07004924 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004925 return 0
4926
4927
groby@chromium.org411034a2013-02-26 15:12:01 +00004928def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004929 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07004930 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004931 auth.add_auth_options(parser)
4932 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07004933 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004934 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004935 if args:
4936 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07004937 cl = Changelist(auth_config=auth_config, issue=options.issue,
4938 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00004939 # Ensure there actually is an issue to close.
4940 cl.GetDescription()
4941 cl.CloseIssue()
4942 return 0
4943
4944
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004945def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004946 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07004947 parser.add_option(
4948 '--stat',
4949 action='store_true',
4950 dest='stat',
4951 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004952 auth.add_auth_options(parser)
4953 options, args = parser.parse_args(args)
4954 auth_config = auth.extract_auth_config_from_options(options)
4955 if args:
4956 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004957
4958 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004959 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004960 # Staged changes would be committed along with the patch from last
4961 # upload, hence counted toward the "last upload" side in the final
4962 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00004963 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004964 return 1
4965
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004966 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004967 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004968 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004969 if not issue:
4970 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004971 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004972 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004973
4974 # Create a new branch based on the merge-base
4975 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00004976 # Clear cached branch in cl object, to avoid overwriting original CL branch
4977 # properties.
4978 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004979 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004980 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004981 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00004982 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004983 return rtn
4984
wychen@chromium.org06928532015-02-03 02:11:29 +00004985 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004986 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07004987 cmd = ['git', 'diff']
4988 if options.stat:
4989 cmd.append('--stat')
4990 cmd.extend([TMP_BRANCH, branch, '--'])
4991 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004992 finally:
4993 RunGit(['checkout', '-q', branch])
4994 RunGit(['branch', '-D', TMP_BRANCH])
4995
4996 return 0
4997
4998
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004999def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005000 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005001 parser.add_option(
5002 '--no-color',
5003 action='store_true',
5004 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005005 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005006 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005007 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005008
5009 author = RunGit(['config', 'user.email']).strip() or None
5010
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005011 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005012
5013 if args:
5014 if len(args) > 1:
5015 parser.error('Unknown args')
5016 base_branch = args[0]
5017 else:
5018 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005019 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005020
5021 change = cl.GetChange(base_branch, None)
5022 return owners_finder.OwnersFinder(
5023 [f.LocalPath() for f in
5024 cl.GetChange(base_branch, None).AffectedFiles()],
5025 change.RepositoryRoot(), author,
dtu944b6052016-07-14 14:48:21 -07005026 fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005027 disable_color=options.no_color).run()
5028
5029
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005030def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005031 """Generates a diff command."""
5032 # Generate diff for the current branch's changes.
5033 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
5034 upstream_commit, '--' ]
5035
5036 if args:
5037 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005038 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005039 diff_cmd.append(arg)
5040 else:
5041 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005042
5043 return diff_cmd
5044
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005045def MatchingFileType(file_name, extensions):
5046 """Returns true if the file name ends with one of the given extensions."""
5047 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005048
enne@chromium.org555cfe42014-01-29 18:21:39 +00005049@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005050def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005051 """Runs auto-formatting tools (clang-format etc.) on the diff."""
zengsterbf470142016-07-07 16:43:00 -07005052 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005053 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005054 parser.add_option('--full', action='store_true',
5055 help='Reformat the full content of all touched files')
5056 parser.add_option('--dry-run', action='store_true',
5057 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005058 parser.add_option('--python', action='store_true',
5059 help='Format python code with yapf (experimental).')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005060 parser.add_option('--diff', action='store_true',
5061 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005062 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005063
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005064 # git diff generates paths against the root of the repository. Change
5065 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005066 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005067 if rel_base_path:
5068 os.chdir(rel_base_path)
5069
digit@chromium.org29e47272013-05-17 17:01:46 +00005070 # Grab the merge-base commit, i.e. the upstream commit of the current
5071 # branch when it was created or the last time it was rebased. This is
5072 # to cover the case where the user may have called "git fetch origin",
5073 # moving the origin branch to a newer commit, but hasn't rebased yet.
5074 upstream_commit = None
5075 cl = Changelist()
5076 upstream_branch = cl.GetUpstreamBranch()
5077 if upstream_branch:
5078 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5079 upstream_commit = upstream_commit.strip()
5080
5081 if not upstream_commit:
5082 DieWithError('Could not find base commit for this branch. '
5083 'Are you in detached state?')
5084
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005085 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5086 diff_output = RunGit(changed_files_cmd)
5087 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005088 # Filter out files deleted by this CL
5089 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005090
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005091 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5092 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5093 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005094 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005095
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005096 top_dir = os.path.normpath(
5097 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5098
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005099 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5100 # formatted. This is used to block during the presubmit.
5101 return_value = 0
5102
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005103 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005104 # Locate the clang-format binary in the checkout
5105 try:
5106 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005107 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005108 DieWithError(e)
5109
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005110 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005111 cmd = [clang_format_tool]
5112 if not opts.dry_run and not opts.diff:
5113 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005114 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005115 if opts.diff:
5116 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005117 else:
5118 env = os.environ.copy()
5119 env['PATH'] = str(os.path.dirname(clang_format_tool))
5120 try:
5121 script = clang_format.FindClangFormatScriptInChromiumTree(
5122 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005123 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005124 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005125
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005126 cmd = [sys.executable, script, '-p0']
5127 if not opts.dry_run and not opts.diff:
5128 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005129
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005130 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5131 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005132
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005133 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5134 if opts.diff:
5135 sys.stdout.write(stdout)
5136 if opts.dry_run and len(stdout) > 0:
5137 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005138
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005139 # Similar code to above, but using yapf on .py files rather than clang-format
5140 # on C/C++ files
5141 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005142 yapf_tool = gclient_utils.FindExecutable('yapf')
5143 if yapf_tool is None:
5144 DieWithError('yapf not found in PATH')
5145
5146 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005147 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005148 cmd = [yapf_tool]
5149 if not opts.dry_run and not opts.diff:
5150 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005151 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005152 if opts.diff:
5153 sys.stdout.write(stdout)
5154 else:
5155 # TODO(sbc): yapf --lines mode still has some issues.
5156 # https://github.com/google/yapf/issues/154
5157 DieWithError('--python currently only works with --full')
5158
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005159 # Dart's formatter does not have the nice property of only operating on
5160 # modified chunks, so hard code full.
5161 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005162 try:
5163 command = [dart_format.FindDartFmtToolInChromiumTree()]
5164 if not opts.dry_run and not opts.diff:
5165 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005166 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005167
ppi@chromium.org6593d932016-03-03 15:41:15 +00005168 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005169 if opts.dry_run and stdout:
5170 return_value = 2
5171 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005172 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5173 'found in this checkout. Files in other languages are still '
5174 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005175
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005176 # Format GN build files. Always run on full build files for canonical form.
5177 if gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005178 cmd = ['gn', 'format' ]
5179 if opts.dry_run or opts.diff:
5180 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005181 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005182 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5183 shell=sys.platform == 'win32',
5184 cwd=top_dir)
5185 if opts.dry_run and gn_ret == 2:
5186 return_value = 2 # Not formatted.
5187 elif opts.diff and gn_ret == 2:
5188 # TODO this should compute and print the actual diff.
5189 print("This change has GN build file diff for " + gn_diff_file)
5190 elif gn_ret != 0:
5191 # For non-dry run cases (and non-2 return values for dry-run), a
5192 # nonzero error code indicates a failure, probably because the file
5193 # doesn't parse.
5194 DieWithError("gn format failed on " + gn_diff_file +
5195 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005196
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005197 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005198
5199
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005200@subcommand.usage('<codereview url or issue id>')
5201def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005202 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005203 _, args = parser.parse_args(args)
5204
5205 if len(args) != 1:
5206 parser.print_help()
5207 return 1
5208
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005209 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005210 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005211 parser.print_help()
5212 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005213 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005214
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005215 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005216 output = RunGit(['config', '--local', '--get-regexp',
5217 r'branch\..*\.%s' % issueprefix],
5218 error_ok=True)
5219 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005220 if issue == target_issue:
5221 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005222
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005223 branches = []
5224 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005225 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005226 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005227 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005228 return 1
5229 if len(branches) == 1:
5230 RunGit(['checkout', branches[0]])
5231 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005232 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005233 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005234 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005235 which = raw_input('Choose by index: ')
5236 try:
5237 RunGit(['checkout', branches[int(which)]])
5238 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005239 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005240 return 1
5241
5242 return 0
5243
5244
maruel@chromium.org29404b52014-09-08 22:58:00 +00005245def CMDlol(parser, args):
5246 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005247 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005248 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5249 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5250 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005251 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005252 return 0
5253
5254
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005255class OptionParser(optparse.OptionParser):
5256 """Creates the option parse and add --verbose support."""
5257 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005258 optparse.OptionParser.__init__(
5259 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005260 self.add_option(
5261 '-v', '--verbose', action='count', default=0,
5262 help='Use 2 times for more debugging info')
5263
5264 def parse_args(self, args=None, values=None):
5265 options, args = optparse.OptionParser.parse_args(self, args, values)
5266 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
5267 logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
5268 return options, args
5269
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005270
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005271def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005272 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005273 print('\nYour python version %s is unsupported, please upgrade.\n' %
5274 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005275 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005276
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005277 # Reload settings.
5278 global settings
5279 settings = Settings()
5280
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005281 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005282 dispatcher = subcommand.CommandDispatcher(__name__)
5283 try:
5284 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005285 except auth.AuthenticationError as e:
5286 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005287 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005288 if e.code != 500:
5289 raise
5290 DieWithError(
5291 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5292 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005293 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005294
5295
5296if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005297 # These affect sys.stdout so do it outside of main() to simplify mocks in
5298 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005299 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005300 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005301 try:
5302 sys.exit(main(sys.argv[1:]))
5303 except KeyboardInterrupt:
5304 sys.stderr.write('interrupted\n')
5305 sys.exit(1)