blob: 05fb354d1ea11c47bdcf831eddf107324543854c [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
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000010from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000011from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +000014import glob
sheyang@google.com6ebaf782015-05-12 19:17:54 +000015import httplib
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000016import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000017import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000018import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000019import optparse
20import os
21import re
ukai@chromium.org78c4b982012-02-14 02:20:26 +000022import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import textwrap
sheyang@google.com6ebaf782015-05-12 19:17:54 +000025import time
26import traceback
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000027import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000029import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
34try:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000035 import readline # pylint: disable=F0401,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000036except ImportError:
37 pass
38
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000039from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000040from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000041from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000042import auth
hinoka@chromium.orgfeb9e2a2015-09-25 19:11:09 +000043from luci_hacks import trigger_luci_job as luci_trigger
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
maruel@chromium.org0633fb42013-08-16 20:06:14 +000063__version__ = '1.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +000065DEFAULT_SERVER = 'https://codereview.appspot.com'
maruel@chromium.org0ba7f962011-01-11 22:13:58 +000066POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000067DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +000068GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
rmistry@google.comc68112d2015-03-03 12:48:06 +000069REFS_THAT_ALIAS_TO_OTHER_REFS = {
70 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
71 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
72}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000073
thestig@chromium.org44202a22014-03-11 19:22:18 +000074# Valid extensions for files we want to lint.
75DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
76DEFAULT_LINT_IGNORE_REGEX = r"$^"
77
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000078# Shortcut since it quickly becomes redundant.
79Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000080
maruel@chromium.orgddd59412011-11-30 14:20:38 +000081# Initialized in main()
82settings = None
83
84
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000085def DieWithError(message):
dpranke@chromium.org970c5222011-03-12 00:32:24 +000086 print >> sys.stderr, message
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000087 sys.exit(1)
88
89
thestig@chromium.org8b0553c2014-02-11 00:33:37 +000090def GetNoGitPagerEnv():
91 env = os.environ.copy()
92 # 'cat' is a magical git string that disables pagers on all platforms.
93 env['GIT_PAGER'] = 'cat'
94 return env
95
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +000096
bsep@chromium.org627d9002016-04-29 00:00:52 +000097def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000098 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +000099 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000100 except subprocess2.CalledProcessError as e:
101 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000102 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000103 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000104 'Command "%s" failed.\n%s' % (
105 ' '.join(args), error_message or e.stdout or ''))
106 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000107
108
109def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000110 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000111 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000112
113
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000114def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000115 """Returns return code and stdout."""
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000116 try:
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000117 if suppress_stderr:
118 stderr = subprocess2.VOID
119 else:
120 stderr = sys.stderr
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000121 out, code = subprocess2.communicate(['git'] + args,
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000122 env=GetNoGitPagerEnv(),
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000123 stdout=subprocess2.PIPE,
124 stderr=stderr)
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000125 return code, out[0]
126 except ValueError:
127 # When the subprocess fails, it returns None. That triggers a ValueError
128 # when trying to unpack the return value into (out, code).
129 return 1, ''
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
iannucci@chromium.org79540052012-10-19 23:15:26 +0000159def git_set_branch_value(key, value):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000160 branch = GetCurrentBranch()
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000161 if not branch:
162 return
163
164 cmd = ['config']
165 if isinstance(value, int):
166 cmd.append('--int')
167 git_key = 'branch.%s.%s' % (branch, key)
168 RunGit(cmd + [git_key, str(value)])
iannucci@chromium.org79540052012-10-19 23:15:26 +0000169
170
171def git_get_branch_default(key, default):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000172 branch = GetCurrentBranch()
iannucci@chromium.org79540052012-10-19 23:15:26 +0000173 if branch:
174 git_key = 'branch.%s.%s' % (branch, key)
175 (_, stdout) = RunGitWithCode(['config', '--int', '--get', git_key])
176 try:
177 return int(stdout.strip())
178 except ValueError:
179 pass
180 return default
181
182
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000183def add_git_similarity(parser):
184 parser.add_option(
iannucci@chromium.org79540052012-10-19 23:15:26 +0000185 '--similarity', metavar='SIM', type='int', action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000186 help='Sets the percentage that a pair of files need to match in order to'
187 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000188 parser.add_option(
189 '--find-copies', action='store_true',
190 help='Allows git to look for copies.')
191 parser.add_option(
192 '--no-find-copies', action='store_false', dest='find_copies',
193 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000194
195 old_parser_args = parser.parse_args
196 def Parse(args):
197 options, args = old_parser_args(args)
198
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000199 if options.similarity is None:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000200 options.similarity = git_get_branch_default('git-cl-similarity', 50)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000201 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000202 print('Note: Saving similarity of %d%% in git config.'
203 % options.similarity)
204 git_set_branch_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000205
iannucci@chromium.org79540052012-10-19 23:15:26 +0000206 options.similarity = max(0, min(options.similarity, 100))
207
208 if options.find_copies is None:
209 options.find_copies = bool(
210 git_get_branch_default('git-find-copies', True))
211 else:
212 git_set_branch_value('git-find-copies', int(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000213
214 print('Using %d%% similarity for rename/copy detection. '
215 'Override with --similarity.' % options.similarity)
216
217 return options, args
218 parser.parse_args = Parse
219
220
machenbach@chromium.org45453142015-09-15 08:45:22 +0000221def _get_properties_from_options(options):
222 properties = dict(x.split('=', 1) for x in options.properties)
223 for key, val in properties.iteritems():
224 try:
225 properties[key] = json.loads(val)
226 except ValueError:
227 pass # If a value couldn't be evaluated, treat it as a string.
228 return properties
229
230
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000231def _prefix_master(master):
232 """Convert user-specified master name to full master name.
233
234 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
235 name, while the developers always use shortened master name
236 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
237 function does the conversion for buildbucket migration.
238 """
239 prefix = 'master.'
240 if master.startswith(prefix):
241 return master
242 return '%s%s' % (prefix, master)
243
244
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000245def _buildbucket_retry(operation_name, http, *args, **kwargs):
246 """Retries requests to buildbucket service and returns parsed json content."""
247 try_count = 0
248 while True:
249 response, content = http.request(*args, **kwargs)
250 try:
251 content_json = json.loads(content)
252 except ValueError:
253 content_json = None
254
255 # Buildbucket could return an error even if status==200.
256 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000257 error = content_json.get('error')
258 if error.get('code') == 403:
259 raise BuildbucketResponseException(
260 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000261 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000262 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000263 raise BuildbucketResponseException(msg)
264
265 if response.status == 200:
266 if not content_json:
267 raise BuildbucketResponseException(
268 'Buildbucket returns invalid json content: %s.\n'
269 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
270 content)
271 return content_json
272 if response.status < 500 or try_count >= 2:
273 raise httplib2.HttpLib2Error(content)
274
275 # status >= 500 means transient failures.
276 logging.debug('Transient errors when %s. Will retry.', operation_name)
277 time.sleep(0.5 + 1.5*try_count)
278 try_count += 1
279 assert False, 'unreachable'
280
281
hinoka@chromium.orgfeb9e2a2015-09-25 19:11:09 +0000282def trigger_luci_job(changelist, masters, options):
283 """Send a job to run on LUCI."""
284 issue_props = changelist.GetIssueProperties()
285 issue = changelist.GetIssue()
286 patchset = changelist.GetMostRecentPatchset()
287 for builders_and_tests in sorted(masters.itervalues()):
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000288 # TODO(hinoka et al): add support for other properties.
289 # Currently, this completely ignores testfilter and other properties.
290 for builder in sorted(builders_and_tests):
hinoka@chromium.orgfeb9e2a2015-09-25 19:11:09 +0000291 luci_trigger.trigger(
292 builder, 'HEAD', issue, patchset, issue_props['project'])
293
294
machenbach@chromium.org45453142015-09-15 08:45:22 +0000295def trigger_try_jobs(auth_config, changelist, options, masters, category):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000296 rietveld_url = settings.GetDefaultServerUrl()
297 rietveld_host = urlparse.urlparse(rietveld_url).hostname
298 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
299 http = authenticator.authorize(httplib2.Http())
300 http.force_exception_to_status_code = True
301 issue_props = changelist.GetIssueProperties()
302 issue = changelist.GetIssue()
303 patchset = changelist.GetMostRecentPatchset()
machenbach@chromium.org45453142015-09-15 08:45:22 +0000304 properties = _get_properties_from_options(options)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000305
306 buildbucket_put_url = (
307 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000308 hostname=options.buildbucket_host))
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000309 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
310 hostname=rietveld_host,
311 issue=issue,
312 patch=patchset)
313
314 batch_req_body = {'builds': []}
315 print_text = []
316 print_text.append('Tried jobs on:')
317 for master, builders_and_tests in sorted(masters.iteritems()):
318 print_text.append('Master: %s' % master)
319 bucket = _prefix_master(master)
320 for builder, tests in sorted(builders_and_tests.iteritems()):
321 print_text.append(' %s: %s' % (builder, tests))
322 parameters = {
323 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000324 'changes': [{
325 'author': {'email': issue_props['owner_email']},
326 'revision': options.revision,
327 }],
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000328 'properties': {
329 'category': category,
330 'issue': issue,
331 'master': master,
332 'patch_project': issue_props['project'],
333 'patch_storage': 'rietveld',
334 'patchset': patchset,
335 'reason': options.name,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000336 'rietveld': rietveld_url,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000337 },
338 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000339 if 'presubmit' in builder.lower():
340 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000341 if tests:
342 parameters['properties']['testfilter'] = tests
machenbach@chromium.org45453142015-09-15 08:45:22 +0000343 if properties:
344 parameters['properties'].update(properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000345 if options.clobber:
346 parameters['properties']['clobber'] = True
347 batch_req_body['builds'].append(
348 {
349 'bucket': bucket,
350 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000351 'client_operation_id': str(uuid.uuid4()),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000352 'tags': ['builder:%s' % builder,
353 'buildset:%s' % buildset,
354 'master:%s' % master,
355 'user_agent:git_cl_try']
356 }
357 )
358
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000359 _buildbucket_retry(
360 'triggering tryjobs',
361 http,
362 buildbucket_put_url,
363 'PUT',
364 body=json.dumps(batch_req_body),
365 headers={'Content-Type': 'application/json'}
366 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000367 print_text.append('To see results here, run: git cl try-results')
368 print_text.append('To see results in browser, run: git cl web')
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000369 print '\n'.join(print_text)
kjellander@chromium.org44424542015-06-02 18:35:29 +0000370
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000371
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000372def fetch_try_jobs(auth_config, changelist, options):
373 """Fetches tryjobs from buildbucket.
374
375 Returns a map from build id to build info as json dictionary.
376 """
377 rietveld_url = settings.GetDefaultServerUrl()
378 rietveld_host = urlparse.urlparse(rietveld_url).hostname
379 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
380 if authenticator.has_cached_credentials():
381 http = authenticator.authorize(httplib2.Http())
382 else:
383 print ('Warning: Some results might be missing because %s' %
384 # Get the message on how to login.
385 auth.LoginRequiredError(rietveld_host).message)
386 http = httplib2.Http()
387
388 http.force_exception_to_status_code = True
389
390 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
391 hostname=rietveld_host,
392 issue=changelist.GetIssue(),
393 patch=options.patchset)
394 params = {'tag': 'buildset:%s' % buildset}
395
396 builds = {}
397 while True:
398 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
399 hostname=options.buildbucket_host,
400 params=urllib.urlencode(params))
401 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
402 for build in content.get('builds', []):
403 builds[build['id']] = build
404 if 'next_cursor' in content:
405 params['start_cursor'] = content['next_cursor']
406 else:
407 break
408 return builds
409
410
411def print_tryjobs(options, builds):
412 """Prints nicely result of fetch_try_jobs."""
413 if not builds:
414 print 'No tryjobs scheduled'
415 return
416
417 # Make a copy, because we'll be modifying builds dictionary.
418 builds = builds.copy()
419 builder_names_cache = {}
420
421 def get_builder(b):
422 try:
423 return builder_names_cache[b['id']]
424 except KeyError:
425 try:
426 parameters = json.loads(b['parameters_json'])
427 name = parameters['builder_name']
428 except (ValueError, KeyError) as error:
429 print 'WARNING: failed to get builder name for build %s: %s' % (
430 b['id'], error)
431 name = None
432 builder_names_cache[b['id']] = name
433 return name
434
435 def get_bucket(b):
436 bucket = b['bucket']
437 if bucket.startswith('master.'):
438 return bucket[len('master.'):]
439 return bucket
440
441 if options.print_master:
442 name_fmt = '%%-%ds %%-%ds' % (
443 max(len(str(get_bucket(b))) for b in builds.itervalues()),
444 max(len(str(get_builder(b))) for b in builds.itervalues()))
445 def get_name(b):
446 return name_fmt % (get_bucket(b), get_builder(b))
447 else:
448 name_fmt = '%%-%ds' % (
449 max(len(str(get_builder(b))) for b in builds.itervalues()))
450 def get_name(b):
451 return name_fmt % get_builder(b)
452
453 def sort_key(b):
454 return b['status'], b.get('result'), get_name(b), b.get('url')
455
456 def pop(title, f, color=None, **kwargs):
457 """Pop matching builds from `builds` dict and print them."""
458
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000459 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000460 colorize = str
461 else:
462 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
463
464 result = []
465 for b in builds.values():
466 if all(b.get(k) == v for k, v in kwargs.iteritems()):
467 builds.pop(b['id'])
468 result.append(b)
469 if result:
470 print colorize(title)
471 for b in sorted(result, key=sort_key):
472 print ' ', colorize('\t'.join(map(str, f(b))))
473
474 total = len(builds)
475 pop(status='COMPLETED', result='SUCCESS',
476 title='Successes:', color=Fore.GREEN,
477 f=lambda b: (get_name(b), b.get('url')))
478 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
479 title='Infra Failures:', color=Fore.MAGENTA,
480 f=lambda b: (get_name(b), b.get('url')))
481 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
482 title='Failures:', color=Fore.RED,
483 f=lambda b: (get_name(b), b.get('url')))
484 pop(status='COMPLETED', result='CANCELED',
485 title='Canceled:', color=Fore.MAGENTA,
486 f=lambda b: (get_name(b),))
487 pop(status='COMPLETED', result='FAILURE',
488 failure_reason='INVALID_BUILD_DEFINITION',
489 title='Wrong master/builder name:', color=Fore.MAGENTA,
490 f=lambda b: (get_name(b),))
491 pop(status='COMPLETED', result='FAILURE',
492 title='Other failures:',
493 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
494 pop(status='COMPLETED',
495 title='Other finished:',
496 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
497 pop(status='STARTED',
498 title='Started:', color=Fore.YELLOW,
499 f=lambda b: (get_name(b), b.get('url')))
500 pop(status='SCHEDULED',
501 title='Scheduled:',
502 f=lambda b: (get_name(b), 'id=%s' % b['id']))
503 # The last section is just in case buildbucket API changes OR there is a bug.
504 pop(title='Other:',
505 f=lambda b: (get_name(b), 'id=%s' % b['id']))
506 assert len(builds) == 0
507 print 'Total: %d tryjobs' % total
508
509
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000510def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
511 """Return the corresponding git ref if |base_url| together with |glob_spec|
512 matches the full |url|.
513
514 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
515 """
516 fetch_suburl, as_ref = glob_spec.split(':')
517 if allow_wildcards:
518 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
519 if glob_match:
520 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
521 # "branches/{472,597,648}/src:refs/remotes/svn/*".
522 branch_re = re.escape(base_url)
523 if glob_match.group(1):
524 branch_re += '/' + re.escape(glob_match.group(1))
525 wildcard = glob_match.group(2)
526 if wildcard == '*':
527 branch_re += '([^/]*)'
528 else:
529 # Escape and replace surrounding braces with parentheses and commas
530 # with pipe symbols.
531 wildcard = re.escape(wildcard)
532 wildcard = re.sub('^\\\\{', '(', wildcard)
533 wildcard = re.sub('\\\\,', '|', wildcard)
534 wildcard = re.sub('\\\\}$', ')', wildcard)
535 branch_re += wildcard
536 if glob_match.group(3):
537 branch_re += re.escape(glob_match.group(3))
538 match = re.match(branch_re, url)
539 if match:
540 return re.sub('\*$', match.group(1), as_ref)
541
542 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
543 if fetch_suburl:
544 full_url = base_url + '/' + fetch_suburl
545 else:
546 full_url = base_url
547 if full_url == url:
548 return as_ref
549 return None
550
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000551
iannucci@chromium.org79540052012-10-19 23:15:26 +0000552def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000553 """Prints statistics about the change to the user."""
554 # --no-ext-diff is broken in some versions of Git, so try to work around
555 # this by overriding the environment (but there is still a problem if the
556 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000557 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000558 if 'GIT_EXTERNAL_DIFF' in env:
559 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000560
561 if find_copies:
562 similarity_options = ['--find-copies-harder', '-l100000',
563 '-C%s' % similarity]
564 else:
565 similarity_options = ['-M%s' % similarity]
566
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000567 try:
568 stdout = sys.stdout.fileno()
569 except AttributeError:
570 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000571 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000572 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000573 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000574 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000575
576
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000577class BuildbucketResponseException(Exception):
578 pass
579
580
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000581class Settings(object):
582 def __init__(self):
583 self.default_server = None
584 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000585 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000586 self.is_git_svn = None
587 self.svn_branch = None
588 self.tree_status_url = None
589 self.viewvc_url = None
590 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000591 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000592 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000593 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000594 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000595 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000596 self.force_https_commit_url = None
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000597 self.pending_ref_prefix = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000598
599 def LazyUpdateIfNeeded(self):
600 """Updates the settings from a codereview.settings file, if available."""
601 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000602 # The only value that actually changes the behavior is
603 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000604 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000605 error_ok=True
606 ).strip().lower()
607
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000608 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000609 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000610 LoadCodereviewSettingsFromFile(cr_settings_file)
611 self.updated = True
612
613 def GetDefaultServerUrl(self, error_ok=False):
614 if not self.default_server:
615 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000616 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000617 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000618 if error_ok:
619 return self.default_server
620 if not self.default_server:
621 error_message = ('Could not find settings file. You must configure '
622 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000623 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000624 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000625 return self.default_server
626
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000627 @staticmethod
628 def GetRelativeRoot():
629 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000630
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000631 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000632 if self.root is None:
633 self.root = os.path.abspath(self.GetRelativeRoot())
634 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000635
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000636 def GetGitMirror(self, remote='origin'):
637 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000638 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000639 if not os.path.isdir(local_url):
640 return None
641 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
642 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
643 # Use the /dev/null print_func to avoid terminal spew in WaitForRealCommit.
644 mirror = git_cache.Mirror(remote_url, print_func = lambda *args: None)
645 if mirror.exists():
646 return mirror
647 return None
648
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000649 def GetIsGitSvn(self):
650 """Return true if this repo looks like it's using git-svn."""
651 if self.is_git_svn is None:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000652 if self.GetPendingRefPrefix():
653 # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what.
654 self.is_git_svn = False
655 else:
656 # If you have any "svn-remote.*" config keys, we think you're using svn.
657 self.is_git_svn = RunGitWithCode(
658 ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000659 return self.is_git_svn
660
661 def GetSVNBranch(self):
662 if self.svn_branch is None:
663 if not self.GetIsGitSvn():
664 DieWithError('Repo doesn\'t appear to be a git-svn repo.')
665
666 # Try to figure out which remote branch we're based on.
667 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000668 # 1) iterate through our branch history and find the svn URL.
669 # 2) find the svn-remote that fetches from the URL.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000670
671 # regexp matching the git-svn line that contains the URL.
672 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
673
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000674 # We don't want to go through all of history, so read a line from the
675 # pipe at a time.
676 # The -100 is an arbitrary limit so we don't search forever.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000677 cmd = ['git', 'log', '-100', '--pretty=medium']
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000678 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE,
679 env=GetNoGitPagerEnv())
maruel@chromium.org740f9d72011-06-10 18:33:10 +0000680 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000681 for line in proc.stdout:
682 match = git_svn_re.match(line)
683 if match:
684 url = match.group(1)
685 proc.stdout.close() # Cut pipe.
686 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000687
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000688 if url:
689 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
690 remotes = RunGit(['config', '--get-regexp',
691 r'^svn-remote\..*\.url']).splitlines()
692 for remote in remotes:
693 match = svn_remote_re.match(remote)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000694 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000695 remote = match.group(1)
696 base_url = match.group(2)
szager@chromium.org4ac25532013-12-16 22:07:02 +0000697 rewrite_root = RunGit(
698 ['config', 'svn-remote.%s.rewriteRoot' % remote],
699 error_ok=True).strip()
700 if rewrite_root:
701 base_url = rewrite_root
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000702 fetch_spec = RunGit(
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000703 ['config', 'svn-remote.%s.fetch' % remote],
704 error_ok=True).strip()
705 if fetch_spec:
706 self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
707 if self.svn_branch:
708 break
709 branch_spec = RunGit(
710 ['config', 'svn-remote.%s.branches' % remote],
711 error_ok=True).strip()
712 if branch_spec:
713 self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
714 if self.svn_branch:
715 break
716 tag_spec = RunGit(
717 ['config', 'svn-remote.%s.tags' % remote],
718 error_ok=True).strip()
719 if tag_spec:
720 self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
721 if self.svn_branch:
722 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000723
724 if not self.svn_branch:
725 DieWithError('Can\'t guess svn branch -- try specifying it on the '
726 'command line')
727
728 return self.svn_branch
729
730 def GetTreeStatusUrl(self, error_ok=False):
731 if not self.tree_status_url:
732 error_message = ('You must configure your tree status URL by running '
733 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000734 self.tree_status_url = self._GetRietveldConfig(
735 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000736 return self.tree_status_url
737
738 def GetViewVCUrl(self):
739 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000740 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000741 return self.viewvc_url
742
rmistry@google.com90752582014-01-14 21:04:50 +0000743 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000744 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000745
rmistry@google.com78948ed2015-07-08 23:09:57 +0000746 def GetIsSkipDependencyUpload(self, branch_name):
747 """Returns true if specified branch should skip dep uploads."""
748 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
749 error_ok=True)
750
rmistry@google.com5626a922015-02-26 14:03:30 +0000751 def GetRunPostUploadHook(self):
752 run_post_upload_hook = self._GetRietveldConfig(
753 'run-post-upload-hook', error_ok=True)
754 return run_post_upload_hook == "True"
755
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000756 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000757 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000758
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000759 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000760 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000761
ukai@chromium.orge8077812012-02-03 03:41:46 +0000762 def GetIsGerrit(self):
763 """Return true if this repo is assosiated with gerrit code review system."""
764 if self.is_gerrit is None:
765 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
766 return self.is_gerrit
767
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000768 def GetSquashGerritUploads(self):
769 """Return true if uploads to Gerrit should be squashed by default."""
770 if self.squash_gerrit_uploads is None:
771 self.squash_gerrit_uploads = (
772 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
773 error_ok=True).strip() == 'true')
774 return self.squash_gerrit_uploads
775
tandrii@chromium.org28253532016-04-14 13:46:56 +0000776 def GetGerritSkipEnsureAuthenticated(self):
777 """Return True if EnsureAuthenticated should not be done for Gerrit
778 uploads."""
779 if self.gerrit_skip_ensure_authenticated is None:
780 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000781 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000782 error_ok=True).strip() == 'true')
783 return self.gerrit_skip_ensure_authenticated
784
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000785 def GetGitEditor(self):
786 """Return the editor specified in the git config, or None if none is."""
787 if self.git_editor is None:
788 self.git_editor = self._GetConfig('core.editor', error_ok=True)
789 return self.git_editor or None
790
thestig@chromium.org44202a22014-03-11 19:22:18 +0000791 def GetLintRegex(self):
792 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
793 DEFAULT_LINT_REGEX)
794
795 def GetLintIgnoreRegex(self):
796 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
797 DEFAULT_LINT_IGNORE_REGEX)
798
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000799 def GetProject(self):
800 if not self.project:
801 self.project = self._GetRietveldConfig('project', error_ok=True)
802 return self.project
803
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000804 def GetForceHttpsCommitUrl(self):
805 if not self.force_https_commit_url:
806 self.force_https_commit_url = self._GetRietveldConfig(
807 'force-https-commit-url', error_ok=True)
808 return self.force_https_commit_url
809
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000810 def GetPendingRefPrefix(self):
811 if not self.pending_ref_prefix:
812 self.pending_ref_prefix = self._GetRietveldConfig(
813 'pending-ref-prefix', error_ok=True)
814 return self.pending_ref_prefix
815
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000816 def _GetRietveldConfig(self, param, **kwargs):
817 return self._GetConfig('rietveld.' + param, **kwargs)
818
rmistry@google.com78948ed2015-07-08 23:09:57 +0000819 def _GetBranchConfig(self, branch_name, param, **kwargs):
820 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
821
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000822 def _GetConfig(self, param, **kwargs):
823 self.LazyUpdateIfNeeded()
824 return RunGit(['config', param], **kwargs).strip()
825
826
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827def ShortBranchName(branch):
828 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000829 return branch.replace('refs/heads/', '', 1)
830
831
832def GetCurrentBranchRef():
833 """Returns branch ref (e.g., refs/heads/master) or None."""
834 return RunGit(['symbolic-ref', 'HEAD'],
835 stderr=subprocess2.VOID, error_ok=True).strip() or None
836
837
838def GetCurrentBranch():
839 """Returns current branch or None.
840
841 For refs/heads/* branches, returns just last part. For others, full ref.
842 """
843 branchref = GetCurrentBranchRef()
844 if branchref:
845 return ShortBranchName(branchref)
846 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000847
848
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000849class _CQState(object):
850 """Enum for states of CL with respect to Commit Queue."""
851 NONE = 'none'
852 DRY_RUN = 'dry_run'
853 COMMIT = 'commit'
854
855 ALL_STATES = [NONE, DRY_RUN, COMMIT]
856
857
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000858class _ParsedIssueNumberArgument(object):
859 def __init__(self, issue=None, patchset=None, hostname=None):
860 self.issue = issue
861 self.patchset = patchset
862 self.hostname = hostname
863
864 @property
865 def valid(self):
866 return self.issue is not None
867
868
869class _RietveldParsedIssueNumberArgument(_ParsedIssueNumberArgument):
870 def __init__(self, *args, **kwargs):
871 self.patch_url = kwargs.pop('patch_url', None)
872 super(_RietveldParsedIssueNumberArgument, self).__init__(*args, **kwargs)
873
874
875def ParseIssueNumberArgument(arg):
876 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
877 fail_result = _ParsedIssueNumberArgument()
878
879 if arg.isdigit():
880 return _ParsedIssueNumberArgument(issue=int(arg))
881 if not arg.startswith('http'):
882 return fail_result
883 url = gclient_utils.UpgradeToHttps(arg)
884 try:
885 parsed_url = urlparse.urlparse(url)
886 except ValueError:
887 return fail_result
888 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
889 tmp = cls.ParseIssueURL(parsed_url)
890 if tmp is not None:
891 return tmp
892 return fail_result
893
894
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000895class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000896 """Changelist works with one changelist in local branch.
897
898 Supports two codereview backends: Rietveld or Gerrit, selected at object
899 creation.
900
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000901 Notes:
902 * Not safe for concurrent multi-{thread,process} use.
903 * Caches values from current branch. Therefore, re-use after branch change
904 with care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000905 """
906
907 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
908 """Create a new ChangeList instance.
909
910 If issue is given, the codereview must be given too.
911
912 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
913 Otherwise, it's decided based on current configuration of the local branch,
914 with default being 'rietveld' for backwards compatibility.
915 See _load_codereview_impl for more details.
916
917 **kwargs will be passed directly to codereview implementation.
918 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000919 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000920 global settings
921 if not settings:
922 # Happens when git_cl.py is used as a utility library.
923 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000924
925 if issue:
926 assert codereview, 'codereview must be known, if issue is known'
927
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000928 self.branchref = branchref
929 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000930 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000931 self.branch = ShortBranchName(self.branchref)
932 else:
933 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000934 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000935 self.lookedup_issue = False
936 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000937 self.has_description = False
938 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000939 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000940 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000941 self.cc = None
942 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000943 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000944
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000945 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000946 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000947 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000948 assert self._codereview_impl
949 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000950
951 def _load_codereview_impl(self, codereview=None, **kwargs):
952 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000953 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
954 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
955 self._codereview = codereview
956 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000957 return
958
959 # Automatic selection based on issue number set for a current branch.
960 # Rietveld takes precedence over Gerrit.
961 assert not self.issue
962 # Whether we find issue or not, we are doing the lookup.
963 self.lookedup_issue = True
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000964 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000965 setting = cls.IssueSetting(self.GetBranch())
966 issue = RunGit(['config', setting], error_ok=True).strip()
967 if issue:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000968 self._codereview = codereview
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000969 self._codereview_impl = cls(self, **kwargs)
970 self.issue = int(issue)
971 return
972
973 # No issue is set for this branch, so decide based on repo-wide settings.
974 return self._load_codereview_impl(
975 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
976 **kwargs)
977
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000978 def IsGerrit(self):
979 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000980
981 def GetCCList(self):
982 """Return the users cc'd on this CL.
983
984 Return is a string suitable for passing to gcl with the --cc flag.
985 """
986 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000987 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000988 more_cc = ','.join(self.watchers)
989 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
990 return self.cc
991
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000992 def GetCCListWithoutDefault(self):
993 """Return the users cc'd on this CL excluding default ones."""
994 if self.cc is None:
995 self.cc = ','.join(self.watchers)
996 return self.cc
997
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000998 def SetWatchers(self, watchers):
999 """Set the list of email addresses that should be cc'd based on the changed
1000 files in this CL.
1001 """
1002 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001003
1004 def GetBranch(self):
1005 """Returns the short branch name, e.g. 'master'."""
1006 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001007 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001008 if not branchref:
1009 return None
1010 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001011 self.branch = ShortBranchName(self.branchref)
1012 return self.branch
1013
1014 def GetBranchRef(self):
1015 """Returns the full branch name, e.g. 'refs/heads/master'."""
1016 self.GetBranch() # Poke the lazy loader.
1017 return self.branchref
1018
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001019 def ClearBranch(self):
1020 """Clears cached branch data of this object."""
1021 self.branch = self.branchref = None
1022
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001023 @staticmethod
1024 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001025 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001026 e.g. 'origin', 'refs/heads/master'
1027 """
1028 remote = '.'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001029 upstream_branch = RunGit(['config', 'branch.%s.merge' % branch],
1030 error_ok=True).strip()
1031 if upstream_branch:
1032 remote = RunGit(['config', 'branch.%s.remote' % branch]).strip()
1033 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001034 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1035 error_ok=True).strip()
1036 if upstream_branch:
1037 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001038 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001039 # Fall back on trying a git-svn upstream branch.
1040 if settings.GetIsGitSvn():
1041 upstream_branch = settings.GetSVNBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001042 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001043 # Else, try to guess the origin remote.
1044 remote_branches = RunGit(['branch', '-r']).split()
1045 if 'origin/master' in remote_branches:
1046 # Fall back on origin/master if it exits.
1047 remote = 'origin'
1048 upstream_branch = 'refs/heads/master'
1049 elif 'origin/trunk' in remote_branches:
1050 # Fall back on origin/trunk if it exists. Generally a shared
1051 # git-svn clone
1052 remote = 'origin'
1053 upstream_branch = 'refs/heads/trunk'
1054 else:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001055 DieWithError(
1056 'Unable to determine default branch to diff against.\n'
1057 'Either pass complete "git diff"-style arguments, like\n'
1058 ' git cl upload origin/master\n'
1059 'or verify this branch is set up to track another \n'
1060 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001061
1062 return remote, upstream_branch
1063
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001064 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001065 upstream_branch = self.GetUpstreamBranch()
1066 if not BranchExists(upstream_branch):
1067 DieWithError('The upstream for the current branch (%s) does not exist '
1068 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001069 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001070 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001071
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001072 def GetUpstreamBranch(self):
1073 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001074 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001075 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001076 upstream_branch = upstream_branch.replace('refs/heads/',
1077 'refs/remotes/%s/' % remote)
1078 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1079 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080 self.upstream_branch = upstream_branch
1081 return self.upstream_branch
1082
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001083 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001084 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001085 remote, branch = None, self.GetBranch()
1086 seen_branches = set()
1087 while branch not in seen_branches:
1088 seen_branches.add(branch)
1089 remote, branch = self.FetchUpstreamTuple(branch)
1090 branch = ShortBranchName(branch)
1091 if remote != '.' or branch.startswith('refs/remotes'):
1092 break
1093 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001094 remotes = RunGit(['remote'], error_ok=True).split()
1095 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001096 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001097 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001098 remote = 'origin'
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001099 logging.warning('Could not determine which remote this change is '
1100 'associated with, so defaulting to "%s". This may '
1101 'not be what you want. You may prevent this message '
1102 'by running "git svn info" as documented here: %s',
1103 self._remote,
1104 GIT_INSTRUCTIONS_URL)
1105 else:
1106 logging.warn('Could not determine which remote this change is '
1107 'associated with. You may prevent this message by '
1108 'running "git svn info" as documented here: %s',
1109 GIT_INSTRUCTIONS_URL)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001110 branch = 'HEAD'
1111 if branch.startswith('refs/remotes'):
1112 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001113 elif branch.startswith('refs/branch-heads/'):
1114 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001115 else:
1116 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001117 return self._remote
1118
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001119 def GitSanityChecks(self, upstream_git_obj):
1120 """Checks git repo status and ensures diff is from local commits."""
1121
sbc@chromium.org79706062015-01-14 21:18:12 +00001122 if upstream_git_obj is None:
1123 if self.GetBranch() is None:
1124 print >> sys.stderr, (
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00001125 'ERROR: unable to determine current branch (detached HEAD?)')
sbc@chromium.org79706062015-01-14 21:18:12 +00001126 else:
1127 print >> sys.stderr, (
1128 'ERROR: no upstream branch')
1129 return False
1130
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001131 # Verify the commit we're diffing against is in our current branch.
1132 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1133 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1134 if upstream_sha != common_ancestor:
1135 print >> sys.stderr, (
1136 'ERROR: %s is not in the current branch. You may need to rebase '
1137 'your tracking branch' % upstream_sha)
1138 return False
1139
1140 # List the commits inside the diff, and verify they are all local.
1141 commits_in_diff = RunGit(
1142 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1143 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1144 remote_branch = remote_branch.strip()
1145 if code != 0:
1146 _, remote_branch = self.GetRemoteBranch()
1147
1148 commits_in_remote = RunGit(
1149 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1150
1151 common_commits = set(commits_in_diff) & set(commits_in_remote)
1152 if common_commits:
1153 print >> sys.stderr, (
1154 'ERROR: Your diff contains %d commits already in %s.\n'
1155 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1156 'the diff. If you are using a custom git flow, you can override'
1157 ' the reference used for this check with "git config '
1158 'gitcl.remotebranch <git-ref>".' % (
1159 len(common_commits), remote_branch, upstream_git_obj))
1160 return False
1161 return True
1162
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001163 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001164 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001165
1166 Returns None if it is not set.
1167 """
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001168 return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()],
1169 error_ok=True).strip()
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001170
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00001171 def GetGitSvnRemoteUrl(self):
1172 """Return the configured git-svn remote URL parsed from git svn info.
1173
1174 Returns None if it is not set.
1175 """
1176 # URL is dependent on the current directory.
1177 data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
1178 if data:
1179 keys = dict(line.split(': ', 1) for line in data.splitlines()
1180 if ': ' in line)
1181 return keys.get('URL', None)
1182 return None
1183
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001184 def GetRemoteUrl(self):
1185 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1186
1187 Returns None if there is no remote.
1188 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001189 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001190 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1191
1192 # If URL is pointing to a local directory, it is probably a git cache.
1193 if os.path.isdir(url):
1194 url = RunGit(['config', 'remote.%s.url' % remote],
1195 error_ok=True,
1196 cwd=url).strip()
1197 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001198
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001199 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001200 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001201 if self.issue is None and not self.lookedup_issue:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001202 issue = RunGit(['config',
1203 self._codereview_impl.IssueSetting(self.GetBranch())],
1204 error_ok=True).strip()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001205 self.issue = int(issue) or None if issue else None
1206 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001207 return self.issue
1208
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001209 def GetIssueURL(self):
1210 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001211 issue = self.GetIssue()
1212 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001213 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001214 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001215
1216 def GetDescription(self, pretty=False):
1217 if not self.has_description:
1218 if self.GetIssue():
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001219 self.description = self._codereview_impl.FetchDescription()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001220 self.has_description = True
1221 if pretty:
1222 wrapper = textwrap.TextWrapper()
1223 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1224 return wrapper.fill(self.description)
1225 return self.description
1226
1227 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001228 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001229 if self.patchset is None and not self.lookedup_patchset:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001230 patchset = RunGit(['config', self._codereview_impl.PatchsetSetting()],
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001231 error_ok=True).strip()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001232 self.patchset = int(patchset) or None if patchset else None
1233 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001234 return self.patchset
1235
1236 def SetPatchset(self, patchset):
1237 """Set this branch's patchset. If patchset=0, clears the patchset."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001238 patchset_setting = self._codereview_impl.PatchsetSetting()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001239 if patchset:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001240 RunGit(['config', patchset_setting, str(patchset)])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001241 self.patchset = patchset
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 else:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001243 RunGit(['config', '--unset', patchset_setting],
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +00001244 stderr=subprocess2.PIPE, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001245 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001247 def SetIssue(self, issue=None):
1248 """Set this branch's issue. If issue isn't given, clears the issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001249 issue_setting = self._codereview_impl.IssueSetting(self.GetBranch())
1250 codereview_setting = self._codereview_impl.GetCodereviewServerSetting()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001251 if issue:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001252 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001253 RunGit(['config', issue_setting, str(issue)])
1254 codereview_server = self._codereview_impl.GetCodereviewServer()
1255 if codereview_server:
1256 RunGit(['config', codereview_setting, codereview_server])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001257 else:
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001258 # Reset it regardless. It doesn't hurt.
1259 config_settings = [issue_setting, self._codereview_impl.PatchsetSetting()]
1260 for prop in (['last-upload-hash'] +
1261 self._codereview_impl._PostUnsetIssueProperties()):
1262 config_settings.append('branch.%s.%s' % (self.GetBranch(), prop))
1263 for setting in config_settings:
1264 RunGit(['config', '--unset', setting], error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001265 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001266 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001267
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001268 def GetChange(self, upstream_branch, author):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001269 if not self.GitSanityChecks(upstream_branch):
1270 DieWithError('\nGit sanity check failure')
1271
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001272 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001273 if not root:
1274 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001275 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001276
1277 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001278 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001279 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001280 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001281 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001282 except subprocess2.CalledProcessError:
1283 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001284 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001285 'This branch probably doesn\'t exist anymore. To reset the\n'
1286 'tracking branch, please run\n'
1287 ' git branch --set-upstream %s trunk\n'
1288 'replacing trunk with origin/master or the relevant branch') %
1289 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001290
maruel@chromium.org52424302012-08-29 15:14:30 +00001291 issue = self.GetIssue()
1292 patchset = self.GetPatchset()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001293 if issue:
1294 description = self.GetDescription()
1295 else:
1296 # If the change was never uploaded, use the log messages of all commits
1297 # up to the branch point, as git cl upload will prefill the description
1298 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001299 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1300 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001301
1302 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001303 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001304 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001305 name,
1306 description,
1307 absroot,
1308 files,
1309 issue,
1310 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001311 author,
1312 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001313
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001314 def UpdateDescription(self, description):
1315 self.description = description
1316 return self._codereview_impl.UpdateDescriptionRemote(description)
1317
1318 def RunHook(self, committing, may_prompt, verbose, change):
1319 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1320 try:
1321 return presubmit_support.DoPresubmitChecks(change, committing,
1322 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1323 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001324 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1325 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001326 except presubmit_support.PresubmitFailure, e:
1327 DieWithError(
1328 ('%s\nMaybe your depot_tools is out of date?\n'
1329 'If all fails, contact maruel@') % e)
1330
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001331 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1332 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001333 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1334 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001335 else:
1336 # Assume url.
1337 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1338 urlparse.urlparse(issue_arg))
1339 if not parsed_issue_arg or not parsed_issue_arg.valid:
1340 DieWithError('Failed to parse issue argument "%s". '
1341 'Must be an issue number or a valid URL.' % issue_arg)
1342 return self._codereview_impl.CMDPatchWithParsedIssue(
1343 parsed_issue_arg, reject, nocommit, directory)
1344
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001345 def CMDUpload(self, options, git_diff_args, orig_args):
1346 """Uploads a change to codereview."""
1347 if git_diff_args:
1348 # TODO(ukai): is it ok for gerrit case?
1349 base_branch = git_diff_args[0]
1350 else:
1351 if self.GetBranch() is None:
1352 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1353
1354 # Default to diffing against common ancestor of upstream branch
1355 base_branch = self.GetCommonAncestorWithUpstream()
1356 git_diff_args = [base_branch, 'HEAD']
1357
1358 # Make sure authenticated to codereview before running potentially expensive
1359 # hooks. It is a fast, best efforts check. Codereview still can reject the
1360 # authentication during the actual upload.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001361 self._codereview_impl.EnsureAuthenticated(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001362
1363 # Apply watchlists on upload.
1364 change = self.GetChange(base_branch, None)
1365 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1366 files = [f.LocalPath() for f in change.AffectedFiles()]
1367 if not options.bypass_watchlists:
1368 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1369
1370 if not options.bypass_hooks:
1371 if options.reviewers or options.tbr_owners:
1372 # Set the reviewer list now so that presubmit checks can access it.
1373 change_description = ChangeDescription(change.FullDescriptionText())
1374 change_description.update_reviewers(options.reviewers,
1375 options.tbr_owners,
1376 change)
1377 change.SetDescriptionText(change_description.description)
1378 hook_results = self.RunHook(committing=False,
1379 may_prompt=not options.force,
1380 verbose=options.verbose,
1381 change=change)
1382 if not hook_results.should_continue():
1383 return 1
1384 if not options.reviewers and hook_results.reviewers:
1385 options.reviewers = hook_results.reviewers.split(',')
1386
1387 if self.GetIssue():
1388 latest_patchset = self.GetMostRecentPatchset()
1389 local_patchset = self.GetPatchset()
1390 if (latest_patchset and local_patchset and
1391 local_patchset != latest_patchset):
1392 print ('The last upload made from this repository was patchset #%d but '
1393 'the most recent patchset on the server is #%d.'
1394 % (local_patchset, latest_patchset))
1395 print ('Uploading will still work, but if you\'ve uploaded to this '
1396 'issue from another machine or branch the patch you\'re '
1397 'uploading now might not include those changes.')
1398 ask_for_data('About to upload; enter to confirm.')
1399
1400 print_stats(options.similarity, options.find_copies, git_diff_args)
1401 ret = self.CMDUploadChange(options, git_diff_args, change)
1402 if not ret:
1403 git_set_branch_value('last-upload-hash',
1404 RunGit(['rev-parse', 'HEAD']).strip())
1405 # Run post upload hooks, if specified.
1406 if settings.GetRunPostUploadHook():
1407 presubmit_support.DoPostUploadExecuter(
1408 change,
1409 self,
1410 settings.GetRoot(),
1411 options.verbose,
1412 sys.stdout)
1413
1414 # Upload all dependencies if specified.
1415 if options.dependencies:
1416 print
1417 print '--dependencies has been specified.'
1418 print 'All dependent local branches will be re-uploaded.'
1419 print
1420 # Remove the dependencies flag from args so that we do not end up in a
1421 # loop.
1422 orig_args.remove('--dependencies')
1423 ret = upload_branch_deps(self, orig_args)
1424 return ret
1425
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001426 def SetCQState(self, new_state):
1427 """Update the CQ state for latest patchset.
1428
1429 Issue must have been already uploaded and known.
1430 """
1431 assert new_state in _CQState.ALL_STATES
1432 assert self.GetIssue()
1433 return self._codereview_impl.SetCQState(new_state)
1434
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001435 # Forward methods to codereview specific implementation.
1436
1437 def CloseIssue(self):
1438 return self._codereview_impl.CloseIssue()
1439
1440 def GetStatus(self):
1441 return self._codereview_impl.GetStatus()
1442
1443 def GetCodereviewServer(self):
1444 return self._codereview_impl.GetCodereviewServer()
1445
1446 def GetApprovingReviewers(self):
1447 return self._codereview_impl.GetApprovingReviewers()
1448
1449 def GetMostRecentPatchset(self):
1450 return self._codereview_impl.GetMostRecentPatchset()
1451
1452 def __getattr__(self, attr):
1453 # This is because lots of untested code accesses Rietveld-specific stuff
1454 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001455 # on a case by case basis.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001456 return getattr(self._codereview_impl, attr)
1457
1458
1459class _ChangelistCodereviewBase(object):
1460 """Abstract base class encapsulating codereview specifics of a changelist."""
1461 def __init__(self, changelist):
1462 self._changelist = changelist # instance of Changelist
1463
1464 def __getattr__(self, attr):
1465 # Forward methods to changelist.
1466 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1467 # _RietveldChangelistImpl to avoid this hack?
1468 return getattr(self._changelist, attr)
1469
1470 def GetStatus(self):
1471 """Apply a rough heuristic to give a simple summary of an issue's review
1472 or CQ status, assuming adherence to a common workflow.
1473
1474 Returns None if no issue for this branch, or specific string keywords.
1475 """
1476 raise NotImplementedError()
1477
1478 def GetCodereviewServer(self):
1479 """Returns server URL without end slash, like "https://codereview.com"."""
1480 raise NotImplementedError()
1481
1482 def FetchDescription(self):
1483 """Fetches and returns description from the codereview server."""
1484 raise NotImplementedError()
1485
1486 def GetCodereviewServerSetting(self):
1487 """Returns git config setting for the codereview server."""
1488 raise NotImplementedError()
1489
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001490 @classmethod
1491 def IssueSetting(cls, branch):
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00001492 return 'branch.%s.%s' % (branch, cls.IssueSettingSuffix())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001493
1494 @classmethod
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00001495 def IssueSettingSuffix(cls):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001496 """Returns name of git config setting which stores issue number for a given
1497 branch."""
1498 raise NotImplementedError()
1499
1500 def PatchsetSetting(self):
1501 """Returns name of git config setting which stores issue number."""
1502 raise NotImplementedError()
1503
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001504 def _PostUnsetIssueProperties(self):
1505 """Which branch-specific properties to erase when unsettin issue."""
1506 raise NotImplementedError()
1507
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001508 def GetRieveldObjForPresubmit(self):
1509 # This is an unfortunate Rietveld-embeddedness in presubmit.
1510 # For non-Rietveld codereviews, this probably should return a dummy object.
1511 raise NotImplementedError()
1512
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001513 def GetGerritObjForPresubmit(self):
1514 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1515 return None
1516
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001517 def UpdateDescriptionRemote(self, description):
1518 """Update the description on codereview site."""
1519 raise NotImplementedError()
1520
1521 def CloseIssue(self):
1522 """Closes the issue."""
1523 raise NotImplementedError()
1524
1525 def GetApprovingReviewers(self):
1526 """Returns a list of reviewers approving the change.
1527
1528 Note: not necessarily committers.
1529 """
1530 raise NotImplementedError()
1531
1532 def GetMostRecentPatchset(self):
1533 """Returns the most recent patchset number from the codereview site."""
1534 raise NotImplementedError()
1535
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001536 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1537 directory):
1538 """Fetches and applies the issue.
1539
1540 Arguments:
1541 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1542 reject: if True, reject the failed patch instead of switching to 3-way
1543 merge. Rietveld only.
1544 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1545 only.
1546 directory: switch to directory before applying the patch. Rietveld only.
1547 """
1548 raise NotImplementedError()
1549
1550 @staticmethod
1551 def ParseIssueURL(parsed_url):
1552 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1553 failed."""
1554 raise NotImplementedError()
1555
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001556 def EnsureAuthenticated(self, force):
1557 """Best effort check that user is authenticated with codereview server.
1558
1559 Arguments:
1560 force: whether to skip confirmation questions.
1561 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001562 raise NotImplementedError()
1563
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001564 def CMDUploadChange(self, options, args, change):
1565 """Uploads a change to codereview."""
1566 raise NotImplementedError()
1567
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001568 def SetCQState(self, new_state):
1569 """Update the CQ state for latest patchset.
1570
1571 Issue must have been already uploaded and known.
1572 """
1573 raise NotImplementedError()
1574
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001575
1576class _RietveldChangelistImpl(_ChangelistCodereviewBase):
1577 def __init__(self, changelist, auth_config=None, rietveld_server=None):
1578 super(_RietveldChangelistImpl, self).__init__(changelist)
1579 assert settings, 'must be initialized in _ChangelistCodereviewBase'
1580 settings.GetDefaultServerUrl()
1581
1582 self._rietveld_server = rietveld_server
1583 self._auth_config = auth_config
1584 self._props = None
1585 self._rpc_server = None
1586
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001587 def GetCodereviewServer(self):
1588 if not self._rietveld_server:
1589 # If we're on a branch then get the server potentially associated
1590 # with that branch.
1591 if self.GetIssue():
1592 rietveld_server_setting = self.GetCodereviewServerSetting()
1593 if rietveld_server_setting:
1594 self._rietveld_server = gclient_utils.UpgradeToHttps(RunGit(
1595 ['config', rietveld_server_setting], error_ok=True).strip())
1596 if not self._rietveld_server:
1597 self._rietveld_server = settings.GetDefaultServerUrl()
1598 return self._rietveld_server
1599
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001600 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001601 """Best effort check that user is authenticated with Rietveld server."""
1602 if self._auth_config.use_oauth2:
1603 authenticator = auth.get_authenticator_for_host(
1604 self.GetCodereviewServer(), self._auth_config)
1605 if not authenticator.has_cached_credentials():
1606 raise auth.LoginRequiredError(self.GetCodereviewServer())
1607
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001608 def FetchDescription(self):
1609 issue = self.GetIssue()
1610 assert issue
1611 try:
1612 return self.RpcServer().get_description(issue).strip()
1613 except urllib2.HTTPError as e:
1614 if e.code == 404:
1615 DieWithError(
1616 ('\nWhile fetching the description for issue %d, received a '
1617 '404 (not found)\n'
1618 'error. It is likely that you deleted this '
1619 'issue on the server. If this is the\n'
1620 'case, please run\n\n'
1621 ' git cl issue 0\n\n'
1622 'to clear the association with the deleted issue. Then run '
1623 'this command again.') % issue)
1624 else:
1625 DieWithError(
1626 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1627 except urllib2.URLError as e:
1628 print >> sys.stderr, (
1629 'Warning: Failed to retrieve CL description due to network '
1630 'failure.')
1631 return ''
1632
1633 def GetMostRecentPatchset(self):
1634 return self.GetIssueProperties()['patchsets'][-1]
1635
1636 def GetPatchSetDiff(self, issue, patchset):
1637 return self.RpcServer().get(
1638 '/download/issue%s_%s.diff' % (issue, patchset))
1639
1640 def GetIssueProperties(self):
1641 if self._props is None:
1642 issue = self.GetIssue()
1643 if not issue:
1644 self._props = {}
1645 else:
1646 self._props = self.RpcServer().get_issue_properties(issue, True)
1647 return self._props
1648
1649 def GetApprovingReviewers(self):
1650 return get_approving_reviewers(self.GetIssueProperties())
1651
1652 def AddComment(self, message):
1653 return self.RpcServer().add_comment(self.GetIssue(), message)
1654
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001655 def GetStatus(self):
1656 """Apply a rough heuristic to give a simple summary of an issue's review
1657 or CQ status, assuming adherence to a common workflow.
1658
1659 Returns None if no issue for this branch, or one of the following keywords:
1660 * 'error' - error from review tool (including deleted issues)
1661 * 'unsent' - not sent for review
1662 * 'waiting' - waiting for review
1663 * 'reply' - waiting for owner to reply to review
1664 * 'lgtm' - LGTM from at least one approved reviewer
1665 * 'commit' - in the commit queue
1666 * 'closed' - closed
1667 """
1668 if not self.GetIssue():
1669 return None
1670
1671 try:
1672 props = self.GetIssueProperties()
1673 except urllib2.HTTPError:
1674 return 'error'
1675
1676 if props.get('closed'):
1677 # Issue is closed.
1678 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001679 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001680 # Issue is in the commit queue.
1681 return 'commit'
1682
1683 try:
1684 reviewers = self.GetApprovingReviewers()
1685 except urllib2.HTTPError:
1686 return 'error'
1687
1688 if reviewers:
1689 # Was LGTM'ed.
1690 return 'lgtm'
1691
1692 messages = props.get('messages') or []
1693
1694 if not messages:
1695 # No message was sent.
1696 return 'unsent'
1697 if messages[-1]['sender'] != props.get('owner_email'):
1698 # Non-LGTM reply from non-owner
1699 return 'reply'
1700 return 'waiting'
1701
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001702 def UpdateDescriptionRemote(self, description):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001703 return self.RpcServer().update_description(
1704 self.GetIssue(), self.description)
1705
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001706 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001707 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001708
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001709 def SetFlag(self, flag, value):
1710 """Patchset must match."""
1711 if not self.GetPatchset():
1712 DieWithError('The patchset needs to match. Send another patchset.')
1713 try:
1714 return self.RpcServer().set_flag(
maruel@chromium.org52424302012-08-29 15:14:30 +00001715 self.GetIssue(), self.GetPatchset(), flag, value)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001716 except urllib2.HTTPError, e:
1717 if e.code == 404:
1718 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
1719 if e.code == 403:
1720 DieWithError(
1721 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
1722 'match?') % (self.GetIssue(), self.GetPatchset()))
1723 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001724
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00001725 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001726 """Returns an upload.RpcServer() to access this review's rietveld instance.
1727 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001728 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00001729 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001730 self.GetCodereviewServer(),
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001731 self._auth_config or auth.make_auth_config())
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001732 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001733
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001734 @classmethod
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00001735 def IssueSettingSuffix(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001736 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001737
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001738 def PatchsetSetting(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001739 """Return the git setting that stores this change's most recent patchset."""
1740 return 'branch.%s.rietveldpatchset' % self.GetBranch()
1741
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001742 def GetCodereviewServerSetting(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001743 """Returns the git setting that stores this change's rietveld server."""
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001744 branch = self.GetBranch()
1745 if branch:
1746 return 'branch.%s.rietveldserver' % branch
1747 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001748
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001749 def _PostUnsetIssueProperties(self):
1750 """Which branch-specific properties to erase when unsetting issue."""
1751 return ['rietveldserver']
1752
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001753 def GetRieveldObjForPresubmit(self):
1754 return self.RpcServer()
1755
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001756 def SetCQState(self, new_state):
1757 props = self.GetIssueProperties()
1758 if props.get('private'):
1759 DieWithError('Cannot set-commit on private issue')
1760
1761 if new_state == _CQState.COMMIT:
1762 self.SetFlag('commit', '1')
1763 elif new_state == _CQState.NONE:
1764 self.SetFlag('commit', '0')
1765 else:
1766 raise NotImplementedError()
1767
1768
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001769 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1770 directory):
1771 # TODO(maruel): Use apply_issue.py
1772
1773 # PatchIssue should never be called with a dirty tree. It is up to the
1774 # caller to check this, but just in case we assert here since the
1775 # consequences of the caller not checking this could be dire.
1776 assert(not git_common.is_dirty_git_tree('apply'))
1777 assert(parsed_issue_arg.valid)
1778 self._changelist.issue = parsed_issue_arg.issue
1779 if parsed_issue_arg.hostname:
1780 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
1781
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001782 if (isinstance(parsed_issue_arg, _RietveldParsedIssueNumberArgument) and
1783 parsed_issue_arg.patch_url):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001784 assert parsed_issue_arg.patchset
1785 patchset = parsed_issue_arg.patchset
1786 patch_data = urllib2.urlopen(parsed_issue_arg.patch_url).read()
1787 else:
1788 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
1789 patch_data = self.GetPatchSetDiff(self.GetIssue(), patchset)
1790
1791 # Switch up to the top-level directory, if necessary, in preparation for
1792 # applying the patch.
1793 top = settings.GetRelativeRoot()
1794 if top:
1795 os.chdir(top)
1796
1797 # Git patches have a/ at the beginning of source paths. We strip that out
1798 # with a sed script rather than the -p flag to patch so we can feed either
1799 # Git or svn-style patches into the same apply command.
1800 # re.sub() should be used but flags=re.MULTILINE is only in python 2.7.
1801 try:
1802 patch_data = subprocess2.check_output(
1803 ['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'], stdin=patch_data)
1804 except subprocess2.CalledProcessError:
1805 DieWithError('Git patch mungling failed.')
1806 logging.info(patch_data)
1807
1808 # We use "git apply" to apply the patch instead of "patch" so that we can
1809 # pick up file adds.
1810 # The --index flag means: also insert into the index (so we catch adds).
1811 cmd = ['git', 'apply', '--index', '-p0']
1812 if directory:
1813 cmd.extend(('--directory', directory))
1814 if reject:
1815 cmd.append('--reject')
1816 elif IsGitVersionAtLeast('1.7.12'):
1817 cmd.append('--3way')
1818 try:
1819 subprocess2.check_call(cmd, env=GetNoGitPagerEnv(),
1820 stdin=patch_data, stdout=subprocess2.VOID)
1821 except subprocess2.CalledProcessError:
1822 print 'Failed to apply the patch'
1823 return 1
1824
1825 # If we had an issue, commit the current state and register the issue.
1826 if not nocommit:
1827 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
1828 'patch from issue %(i)s at patchset '
1829 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
1830 % {'i': self.GetIssue(), 'p': patchset})])
1831 self.SetIssue(self.GetIssue())
1832 self.SetPatchset(patchset)
1833 print "Committed patch locally."
1834 else:
1835 print "Patch applied to index."
1836 return 0
1837
1838 @staticmethod
1839 def ParseIssueURL(parsed_url):
1840 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
1841 return None
1842 # Typical url: https://domain/<issue_number>[/[other]]
1843 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
1844 if match:
1845 return _RietveldParsedIssueNumberArgument(
1846 issue=int(match.group(1)),
1847 hostname=parsed_url.netloc)
1848 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
1849 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
1850 if match:
1851 return _RietveldParsedIssueNumberArgument(
1852 issue=int(match.group(1)),
1853 patchset=int(match.group(2)),
1854 hostname=parsed_url.netloc,
1855 patch_url=gclient_utils.UpgradeToHttps(parsed_url.geturl()))
1856 return None
1857
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001858 def CMDUploadChange(self, options, args, change):
1859 """Upload the patch to Rietveld."""
1860 upload_args = ['--assume_yes'] # Don't ask about untracked files.
1861 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001862 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
1863 if options.emulate_svn_auto_props:
1864 upload_args.append('--emulate_svn_auto_props')
1865
1866 change_desc = None
1867
1868 if options.email is not None:
1869 upload_args.extend(['--email', options.email])
1870
1871 if self.GetIssue():
1872 if options.title:
1873 upload_args.extend(['--title', options.title])
1874 if options.message:
1875 upload_args.extend(['--message', options.message])
1876 upload_args.extend(['--issue', str(self.GetIssue())])
1877 print ('This branch is associated with issue %s. '
1878 'Adding patch to that issue.' % self.GetIssue())
1879 else:
1880 if options.title:
1881 upload_args.extend(['--title', options.title])
1882 message = (options.title or options.message or
1883 CreateDescriptionFromLog(args))
1884 change_desc = ChangeDescription(message)
1885 if options.reviewers or options.tbr_owners:
1886 change_desc.update_reviewers(options.reviewers,
1887 options.tbr_owners,
1888 change)
1889 if not options.force:
1890 change_desc.prompt()
1891
1892 if not change_desc.description:
1893 print "Description is empty; aborting."
1894 return 1
1895
1896 upload_args.extend(['--message', change_desc.description])
1897 if change_desc.get_reviewers():
1898 upload_args.append('--reviewers=%s' % ','.join(
1899 change_desc.get_reviewers()))
1900 if options.send_mail:
1901 if not change_desc.get_reviewers():
1902 DieWithError("Must specify reviewers to send email.")
1903 upload_args.append('--send_mail')
1904
1905 # We check this before applying rietveld.private assuming that in
1906 # rietveld.cc only addresses which we can send private CLs to are listed
1907 # if rietveld.private is set, and so we should ignore rietveld.cc only
1908 # when --private is specified explicitly on the command line.
1909 if options.private:
1910 logging.warn('rietveld.cc is ignored since private flag is specified. '
1911 'You need to review and add them manually if necessary.')
1912 cc = self.GetCCListWithoutDefault()
1913 else:
1914 cc = self.GetCCList()
1915 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
1916 if cc:
1917 upload_args.extend(['--cc', cc])
1918
1919 if options.private or settings.GetDefaultPrivateFlag() == "True":
1920 upload_args.append('--private')
1921
1922 upload_args.extend(['--git_similarity', str(options.similarity)])
1923 if not options.find_copies:
1924 upload_args.extend(['--git_no_find_copies'])
1925
1926 # Include the upstream repo's URL in the change -- this is useful for
1927 # projects that have their source spread across multiple repos.
1928 remote_url = self.GetGitBaseUrlFromConfig()
1929 if not remote_url:
1930 if settings.GetIsGitSvn():
1931 remote_url = self.GetGitSvnRemoteUrl()
1932 else:
1933 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
1934 remote_url = '%s@%s' % (self.GetRemoteUrl(),
1935 self.GetUpstreamBranch().split('/')[-1])
1936 if remote_url:
1937 upload_args.extend(['--base_url', remote_url])
1938 remote, remote_branch = self.GetRemoteBranch()
1939 target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
1940 settings.GetPendingRefPrefix())
1941 if target_ref:
1942 upload_args.extend(['--target_ref', target_ref])
1943
1944 # Look for dependent patchsets. See crbug.com/480453 for more details.
1945 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
1946 upstream_branch = ShortBranchName(upstream_branch)
1947 if remote is '.':
1948 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001949 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001950 if settings.GetIsSkipDependencyUpload(local_branch):
1951 print
1952 print ('Skipping dependency patchset upload because git config '
1953 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
1954 print
1955 else:
1956 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001957 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001958 auth_config=auth_config)
1959 branch_cl_issue_url = branch_cl.GetIssueURL()
1960 branch_cl_issue = branch_cl.GetIssue()
1961 branch_cl_patchset = branch_cl.GetPatchset()
1962 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
1963 upload_args.extend(
1964 ['--depends_on_patchset', '%s:%s' % (
1965 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001966 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001967 '\n'
1968 'The current branch (%s) is tracking a local branch (%s) with '
1969 'an associated CL.\n'
1970 'Adding %s/#ps%s as a dependency patchset.\n'
1971 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
1972 branch_cl_patchset))
1973
1974 project = settings.GetProject()
1975 if project:
1976 upload_args.extend(['--project', project])
1977
1978 if options.cq_dry_run:
1979 upload_args.extend(['--cq_dry_run'])
1980
1981 try:
1982 upload_args = ['upload'] + upload_args + args
1983 logging.info('upload.RealMain(%s)', upload_args)
1984 issue, patchset = upload.RealMain(upload_args)
1985 issue = int(issue)
1986 patchset = int(patchset)
1987 except KeyboardInterrupt:
1988 sys.exit(1)
1989 except:
1990 # If we got an exception after the user typed a description for their
1991 # change, back up the description before re-raising.
1992 if change_desc:
1993 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
1994 print('\nGot exception while uploading -- saving description to %s\n' %
1995 backup_path)
1996 backup_file = open(backup_path, 'w')
1997 backup_file.write(change_desc.description)
1998 backup_file.close()
1999 raise
2000
2001 if not self.GetIssue():
2002 self.SetIssue(issue)
2003 self.SetPatchset(patchset)
2004
2005 if options.use_commit_queue:
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002006 self.SetCQState(_CQState.COMMIT)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002007 return 0
2008
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002009
2010class _GerritChangelistImpl(_ChangelistCodereviewBase):
2011 def __init__(self, changelist, auth_config=None):
2012 # auth_config is Rietveld thing, kept here to preserve interface only.
2013 super(_GerritChangelistImpl, self).__init__(changelist)
2014 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002015 # Lazily cached values.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002016 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002017 self._gerrit_host = None # e.g. chromium-review.googlesource.com
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002018
2019 def _GetGerritHost(self):
2020 # Lazy load of configs.
2021 self.GetCodereviewServer()
2022 return self._gerrit_host
2023
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002024 def _GetGitHost(self):
2025 """Returns git host to be used when uploading change to Gerrit."""
2026 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2027
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002028 def GetCodereviewServer(self):
2029 if not self._gerrit_server:
2030 # If we're on a branch then get the server potentially associated
2031 # with that branch.
2032 if self.GetIssue():
2033 gerrit_server_setting = self.GetCodereviewServerSetting()
2034 if gerrit_server_setting:
2035 self._gerrit_server = RunGit(['config', gerrit_server_setting],
2036 error_ok=True).strip()
2037 if self._gerrit_server:
2038 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
2039 if not self._gerrit_server:
2040 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2041 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002042 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002043 parts[0] = parts[0] + '-review'
2044 self._gerrit_host = '.'.join(parts)
2045 self._gerrit_server = 'https://%s' % self._gerrit_host
2046 return self._gerrit_server
2047
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002048 @classmethod
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00002049 def IssueSettingSuffix(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002050 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002051
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002052 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002053 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002054 if settings.GetGerritSkipEnsureAuthenticated():
2055 # For projects with unusual authentication schemes.
2056 # See http://crbug.com/603378.
2057 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002058 # Lazy-loader to identify Gerrit and Git hosts.
2059 if gerrit_util.GceAuthenticator.is_gce():
2060 return
2061 self.GetCodereviewServer()
2062 git_host = self._GetGitHost()
2063 assert self._gerrit_server and self._gerrit_host
2064 cookie_auth = gerrit_util.CookiesAuthenticator()
2065
2066 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2067 git_auth = cookie_auth.get_auth_header(git_host)
2068 if gerrit_auth and git_auth:
2069 if gerrit_auth == git_auth:
2070 return
2071 print((
2072 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2073 ' Check your %s or %s file for credentials of hosts:\n'
2074 ' %s\n'
2075 ' %s\n'
2076 ' %s') %
2077 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2078 git_host, self._gerrit_host,
2079 cookie_auth.get_new_password_message(git_host)))
2080 if not force:
2081 ask_for_data('If you know what you are doing, press Enter to continue, '
2082 'Ctrl+C to abort.')
2083 return
2084 else:
2085 missing = (
2086 [] if gerrit_auth else [self._gerrit_host] +
2087 [] if git_auth else [git_host])
2088 DieWithError('Credentials for the following hosts are required:\n'
2089 ' %s\n'
2090 'These are read from %s (or legacy %s)\n'
2091 '%s' % (
2092 '\n '.join(missing),
2093 cookie_auth.get_gitcookies_path(),
2094 cookie_auth.get_netrc_path(),
2095 cookie_auth.get_new_password_message(git_host)))
2096
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002097
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002098 def PatchsetSetting(self):
2099 """Return the git setting that stores this change's most recent patchset."""
2100 return 'branch.%s.gerritpatchset' % self.GetBranch()
2101
2102 def GetCodereviewServerSetting(self):
2103 """Returns the git setting that stores this change's Gerrit server."""
2104 branch = self.GetBranch()
2105 if branch:
2106 return 'branch.%s.gerritserver' % branch
2107 return None
2108
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002109 def _PostUnsetIssueProperties(self):
2110 """Which branch-specific properties to erase when unsetting issue."""
2111 return [
2112 'gerritserver',
2113 'gerritsquashhash',
2114 ]
2115
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002116 def GetRieveldObjForPresubmit(self):
2117 class ThisIsNotRietveldIssue(object):
2118 def __nonzero__(self):
2119 # This is a hack to make presubmit_support think that rietveld is not
2120 # defined, yet still ensure that calls directly result in a decent
2121 # exception message below.
2122 return False
2123
2124 def __getattr__(self, attr):
2125 print(
2126 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2127 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2128 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2129 'or use Rietveld for codereview.\n'
2130 'See also http://crbug.com/579160.' % attr)
2131 raise NotImplementedError()
2132 return ThisIsNotRietveldIssue()
2133
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002134 def GetGerritObjForPresubmit(self):
2135 return presubmit_support.GerritAccessor(self._GetGerritHost())
2136
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002137 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002138 """Apply a rough heuristic to give a simple summary of an issue's review
2139 or CQ status, assuming adherence to a common workflow.
2140
2141 Returns None if no issue for this branch, or one of the following keywords:
2142 * 'error' - error from review tool (including deleted issues)
2143 * 'unsent' - no reviewers added
2144 * 'waiting' - waiting for review
2145 * 'reply' - waiting for owner to reply to review
2146 * 'not lgtm' - Code-Review -2 from at least one approved reviewer
2147 * 'lgtm' - Code-Review +2 from at least one approved reviewer
2148 * 'commit' - in the commit queue
2149 * 'closed' - abandoned
2150 """
2151 if not self.GetIssue():
2152 return None
2153
2154 try:
2155 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
2156 except httplib.HTTPException:
2157 return 'error'
2158
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002159 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002160 return 'closed'
2161
2162 cq_label = data['labels'].get('Commit-Queue', {})
2163 if cq_label:
2164 # Vote value is a stringified integer, which we expect from 0 to 2.
2165 vote_value = cq_label.get('value', '0')
2166 vote_text = cq_label.get('values', {}).get(vote_value, '')
2167 if vote_text.lower() == 'commit':
2168 return 'commit'
2169
2170 lgtm_label = data['labels'].get('Code-Review', {})
2171 if lgtm_label:
2172 if 'rejected' in lgtm_label:
2173 return 'not lgtm'
2174 if 'approved' in lgtm_label:
2175 return 'lgtm'
2176
2177 if not data.get('reviewers', {}).get('REVIEWER', []):
2178 return 'unsent'
2179
2180 messages = data.get('messages', [])
2181 if messages:
2182 owner = data['owner'].get('_account_id')
2183 last_message_author = messages[-1].get('author', {}).get('_account_id')
2184 if owner != last_message_author:
2185 # Some reply from non-owner.
2186 return 'reply'
2187
2188 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002189
2190 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002191 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002192 return data['revisions'][data['current_revision']]['_number']
2193
2194 def FetchDescription(self):
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002195 data = self._GetChangeDetail(['CURRENT_REVISION'])
2196 current_rev = data['current_revision']
2197 url = data['revisions'][current_rev]['fetch']['http']['url']
2198 return gerrit_util.GetChangeDescriptionFromGitiles(url, current_rev)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002199
2200 def UpdateDescriptionRemote(self, description):
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002201 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
2202 description)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002203
2204 def CloseIssue(self):
2205 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2206
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002207 def GetApprovingReviewers(self):
2208 """Returns a list of reviewers approving the change.
2209
2210 Note: not necessarily committers.
2211 """
2212 raise NotImplementedError()
2213
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002214 def SubmitIssue(self, wait_for_merge=True):
2215 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2216 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002217
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002218 def _GetChangeDetail(self, options=None, issue=None):
2219 options = options or []
2220 issue = issue or self.GetIssue()
2221 assert issue, 'issue required to query Gerrit'
tandrii@chromium.org11a899e2016-04-13 12:45:44 +00002222 return gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2223 options)
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002224
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002225 def CMDLand(self, force, bypass_hooks, verbose):
2226 if git_common.is_dirty_git_tree('land'):
2227 return 1
2228 differs = True
2229 last_upload = RunGit(['config',
2230 'branch.%s.gerritsquashhash' % self.GetBranch()],
2231 error_ok=True).strip()
2232 # Note: git diff outputs nothing if there is no diff.
2233 if not last_upload or RunGit(['diff', last_upload]).strip():
2234 print('WARNING: some changes from local branch haven\'t been uploaded')
2235 else:
2236 detail = self._GetChangeDetail(['CURRENT_REVISION'])
2237 if detail['current_revision'] == last_upload:
2238 differs = False
2239 else:
2240 print('WARNING: local branch contents differ from latest uploaded '
2241 'patchset')
2242 if differs:
2243 if not force:
2244 ask_for_data(
2245 'Do you want to submit latest Gerrit patchset and bypass hooks?')
2246 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2247 elif not bypass_hooks:
2248 hook_results = self.RunHook(
2249 committing=True,
2250 may_prompt=not force,
2251 verbose=verbose,
2252 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2253 if not hook_results.should_continue():
2254 return 1
2255
2256 self.SubmitIssue(wait_for_merge=True)
2257 print('Issue %s has been submitted.' % self.GetIssueURL())
2258 return 0
2259
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002260 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2261 directory):
2262 assert not reject
2263 assert not nocommit
2264 assert not directory
2265 assert parsed_issue_arg.valid
2266
2267 self._changelist.issue = parsed_issue_arg.issue
2268
2269 if parsed_issue_arg.hostname:
2270 self._gerrit_host = parsed_issue_arg.hostname
2271 self._gerrit_server = 'https://%s' % self._gerrit_host
2272
2273 detail = self._GetChangeDetail(['ALL_REVISIONS'])
2274
2275 if not parsed_issue_arg.patchset:
2276 # Use current revision by default.
2277 revision_info = detail['revisions'][detail['current_revision']]
2278 patchset = int(revision_info['_number'])
2279 else:
2280 patchset = parsed_issue_arg.patchset
2281 for revision_info in detail['revisions'].itervalues():
2282 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2283 break
2284 else:
2285 DieWithError('Couldn\'t find patchset %i in issue %i' %
2286 (parsed_issue_arg.patchset, self.GetIssue()))
2287
2288 fetch_info = revision_info['fetch']['http']
2289 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
2290 RunGit(['cherry-pick', 'FETCH_HEAD'])
2291 self.SetIssue(self.GetIssue())
2292 self.SetPatchset(patchset)
2293 print('Committed patch for issue %i pathset %i locally' %
2294 (self.GetIssue(), self.GetPatchset()))
2295 return 0
2296
2297 @staticmethod
2298 def ParseIssueURL(parsed_url):
2299 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2300 return None
2301 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2302 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2303 # Short urls like https://domain/<issue_number> can be used, but don't allow
2304 # specifying the patchset (you'd 404), but we allow that here.
2305 if parsed_url.path == '/':
2306 part = parsed_url.fragment
2307 else:
2308 part = parsed_url.path
2309 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2310 if match:
2311 return _ParsedIssueNumberArgument(
2312 issue=int(match.group(2)),
2313 patchset=int(match.group(4)) if match.group(4) else None,
2314 hostname=parsed_url.netloc)
2315 return None
2316
tandrii16e0b4e2016-06-07 10:34:28 -07002317 def _GerritCommitMsgHookCheck(self, offer_removal):
2318 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2319 if not os.path.exists(hook):
2320 return
2321 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2322 # custom developer made one.
2323 data = gclient_utils.FileRead(hook)
2324 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2325 return
2326 print('Warning: you have Gerrit commit-msg hook installed.\n'
2327 'It is not neccessary for uploading with git cl in squash mode, '
2328 'and may interfere with it in subtle ways.\n'
2329 'We recommend you remove the commit-msg hook.')
2330 if offer_removal:
2331 reply = ask_for_data('Do you want to remove it now? [Yes/No]')
2332 if reply.lower().startswith('y'):
2333 gclient_utils.rm_file_or_tree(hook)
2334 print('Gerrit commit-msg hook removed.')
2335 else:
2336 print('OK, will keep Gerrit commit-msg hook in place.')
2337
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002338 def CMDUploadChange(self, options, args, change):
2339 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002340 if options.squash and options.no_squash:
2341 DieWithError('Can only use one of --squash or --no-squash')
2342 options.squash = ((settings.GetSquashGerritUploads() or options.squash) and
2343 not options.no_squash)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002344 # We assume the remote called "origin" is the one we want.
2345 # It is probably not worthwhile to support different workflows.
2346 gerrit_remote = 'origin'
2347
2348 remote, remote_branch = self.GetRemoteBranch()
2349 branch = GetTargetRef(remote, remote_branch, options.target_branch,
2350 pending_prefix='')
2351
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002352 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002353 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002354 if not self.GetIssue():
2355 # TODO(tandrii): deperecate this after 2016Q2. Backwards compatibility
2356 # with shadow branch, which used to contain change-id for a given
2357 # branch, using which we can fetch actual issue number and set it as the
2358 # property of the branch, which is the new way.
2359 message = RunGitSilent([
2360 'show', '--format=%B', '-s',
2361 'refs/heads/git_cl_uploads/%s' % self.GetBranch()])
2362 if message:
2363 change_ids = git_footers.get_footer_change_id(message.strip())
2364 if change_ids and len(change_ids) == 1:
2365 details = self._GetChangeDetail(issue=change_ids[0])
2366 if details:
2367 print('WARNING: found old upload in branch git_cl_uploads/%s '
2368 'corresponding to issue %s' %
2369 (self.GetBranch(), details['_number']))
2370 self.SetIssue(details['_number'])
2371 if not self.GetIssue():
2372 DieWithError(
2373 '\n' # For readability of the blob below.
2374 'Found old upload in branch git_cl_uploads/%s, '
2375 'but failed to find corresponding Gerrit issue.\n'
2376 'If you know the issue number, set it manually first:\n'
2377 ' git cl issue 123456\n'
2378 'If you intended to upload this CL as new issue, '
2379 'just delete or rename the old upload branch:\n'
2380 ' git rename-branch git_cl_uploads/%s old_upload-%s\n'
2381 'After that, please run git cl upload again.' %
2382 tuple([self.GetBranch()] * 3))
2383 # End of backwards compatability.
2384
2385 if self.GetIssue():
2386 # Try to get the message from a previous upload.
2387 message = self.GetDescription()
2388 if not message:
2389 DieWithError(
2390 'failed to fetch description from current Gerrit issue %d\n'
2391 '%s' % (self.GetIssue(), self.GetIssueURL()))
2392 change_id = self._GetChangeDetail()['change_id']
2393 while True:
2394 footer_change_ids = git_footers.get_footer_change_id(message)
2395 if footer_change_ids == [change_id]:
2396 break
2397 if not footer_change_ids:
2398 message = git_footers.add_footer_change_id(message, change_id)
2399 print('WARNING: appended missing Change-Id to issue description')
2400 continue
2401 # There is already a valid footer but with different or several ids.
2402 # Doing this automatically is non-trivial as we don't want to lose
2403 # existing other footers, yet we want to append just 1 desired
2404 # Change-Id. Thus, just create a new footer, but let user verify the
2405 # new description.
2406 message = '%s\n\nChange-Id: %s' % (message, change_id)
2407 print(
2408 'WARNING: issue %s has Change-Id footer(s):\n'
2409 ' %s\n'
2410 'but issue has Change-Id %s, according to Gerrit.\n'
2411 'Please, check the proposed correction to the description, '
2412 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2413 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2414 change_id))
2415 ask_for_data('Press enter to edit now, Ctrl+C to abort')
2416 if not options.force:
2417 change_desc = ChangeDescription(message)
2418 change_desc.prompt()
2419 message = change_desc.description
2420 if not message:
2421 DieWithError("Description is empty. Aborting...")
2422 # Continue the while loop.
2423 # Sanity check of this code - we should end up with proper message
2424 # footer.
2425 assert [change_id] == git_footers.get_footer_change_id(message)
2426 change_desc = ChangeDescription(message)
2427 else:
2428 change_desc = ChangeDescription(
2429 options.message or CreateDescriptionFromLog(args))
2430 if not options.force:
2431 change_desc.prompt()
2432 if not change_desc.description:
2433 DieWithError("Description is empty. Aborting...")
2434 message = change_desc.description
2435 change_ids = git_footers.get_footer_change_id(message)
2436 if len(change_ids) > 1:
2437 DieWithError('too many Change-Id footers, at most 1 allowed.')
2438 if not change_ids:
2439 # Generate the Change-Id automatically.
2440 message = git_footers.add_footer_change_id(
2441 message, GenerateGerritChangeId(message))
2442 change_desc.set_description(message)
2443 change_ids = git_footers.get_footer_change_id(message)
2444 assert len(change_ids) == 1
2445 change_id = change_ids[0]
2446
2447 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2448 if remote is '.':
2449 # If our upstream branch is local, we base our squashed commit on its
2450 # squashed version.
2451 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2452 # Check the squashed hash of the parent.
2453 parent = RunGit(['config',
2454 'branch.%s.gerritsquashhash' % upstream_branch_name],
2455 error_ok=True).strip()
2456 # Verify that the upstream branch has been uploaded too, otherwise
2457 # Gerrit will create additional CLs when uploading.
2458 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2459 RunGitSilent(['rev-parse', parent + ':'])):
2460 # TODO(tandrii): remove "old depot_tools" part on April 12, 2016.
2461 DieWithError(
2462 'Upload upstream branch %s first.\n'
2463 'Note: maybe you\'ve uploaded it with --no-squash or with an old '
2464 'version of depot_tools. If so, then re-upload it with:\n'
2465 ' git cl upload --squash\n' % upstream_branch_name)
2466 else:
2467 parent = self.GetCommonAncestorWithUpstream()
2468
2469 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2470 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2471 '-m', message]).strip()
2472 else:
2473 change_desc = ChangeDescription(
2474 options.message or CreateDescriptionFromLog(args))
2475 if not change_desc.description:
2476 DieWithError("Description is empty. Aborting...")
2477
2478 if not git_footers.get_footer_change_id(change_desc.description):
2479 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002480 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2481 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002482 ref_to_push = 'HEAD'
2483 parent = '%s/%s' % (gerrit_remote, branch)
2484 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2485
2486 assert change_desc
2487 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2488 ref_to_push)]).splitlines()
2489 if len(commits) > 1:
2490 print('WARNING: This will upload %d commits. Run the following command '
2491 'to see which commits will be uploaded: ' % len(commits))
2492 print('git log %s..%s' % (parent, ref_to_push))
2493 print('You can also use `git squash-branch` to squash these into a '
2494 'single commit.')
2495 ask_for_data('About to upload; enter to confirm.')
2496
2497 if options.reviewers or options.tbr_owners:
2498 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2499 change)
2500
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002501 # Extra options that can be specified at push time. Doc:
2502 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2503 refspec_opts = []
2504 if options.title:
2505 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2506 # reverse on its side.
2507 if '_' in options.title:
2508 print('WARNING: underscores in title will be converted to spaces.')
2509 refspec_opts.append('m=' + options.title.replace(' ', '_'))
2510
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002511 if options.send_mail:
2512 if not change_desc.get_reviewers():
2513 DieWithError('Must specify reviewers to send email.')
2514 refspec_opts.append('notify=ALL')
2515 else:
2516 refspec_opts.append('notify=NONE')
2517
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002518 cc = self.GetCCList().split(',')
2519 if options.cc:
2520 cc.extend(options.cc)
2521 cc = filter(None, cc)
2522 if cc:
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00002523 refspec_opts.extend('cc=' + email.strip() for email in cc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002524
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002525 if change_desc.get_reviewers():
2526 refspec_opts.extend('r=' + email.strip()
2527 for email in change_desc.get_reviewers())
2528
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002529 refspec_suffix = ''
2530 if refspec_opts:
2531 refspec_suffix = '%' + ','.join(refspec_opts)
2532 assert ' ' not in refspec_suffix, (
2533 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002534 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002535
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002536 push_stdout = gclient_utils.CheckCallAndFilter(
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002537 ['git', 'push', gerrit_remote, refspec],
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002538 print_stdout=True,
2539 # Flush after every line: useful for seeing progress when running as
2540 # recipe.
2541 filter_fn=lambda _: sys.stdout.flush())
2542
2543 if options.squash:
2544 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2545 change_numbers = [m.group(1)
2546 for m in map(regex.match, push_stdout.splitlines())
2547 if m]
2548 if len(change_numbers) != 1:
2549 DieWithError(
2550 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
2551 'Change-Id: %s') % (len(change_numbers), change_id))
2552 self.SetIssue(change_numbers[0])
2553 RunGit(['config', 'branch.%s.gerritsquashhash' % self.GetBranch(),
2554 ref_to_push])
2555 return 0
2556
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002557 def _AddChangeIdToCommitMessage(self, options, args):
2558 """Re-commits using the current message, assumes the commit hook is in
2559 place.
2560 """
2561 log_desc = options.message or CreateDescriptionFromLog(args)
2562 git_command = ['commit', '--amend', '-m', log_desc]
2563 RunGit(git_command)
2564 new_log_desc = CreateDescriptionFromLog(args)
2565 if git_footers.get_footer_change_id(new_log_desc):
2566 print 'git-cl: Added Change-Id to commit message.'
2567 return new_log_desc
2568 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002569 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002570
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002571 def SetCQState(self, new_state):
2572 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
2573 # TODO(tandrii): maybe allow configurability in codereview.settings or by
2574 # self-discovery of label config for this CL using REST API.
2575 vote_map = {
2576 _CQState.NONE: 0,
2577 _CQState.DRY_RUN: 1,
2578 _CQState.COMMIT : 2,
2579 }
2580 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2581 labels={'Commit-Queue': vote_map[new_state]})
2582
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002583
2584_CODEREVIEW_IMPLEMENTATIONS = {
2585 'rietveld': _RietveldChangelistImpl,
2586 'gerrit': _GerritChangelistImpl,
2587}
2588
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002589
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002590def _add_codereview_select_options(parser):
2591 """Appends --gerrit and --rietveld options to force specific codereview."""
2592 parser.codereview_group = optparse.OptionGroup(
2593 parser, 'EXPERIMENTAL! Codereview override options')
2594 parser.add_option_group(parser.codereview_group)
2595 parser.codereview_group.add_option(
2596 '--gerrit', action='store_true',
2597 help='Force the use of Gerrit for codereview')
2598 parser.codereview_group.add_option(
2599 '--rietveld', action='store_true',
2600 help='Force the use of Rietveld for codereview')
2601
2602
2603def _process_codereview_select_options(parser, options):
2604 if options.gerrit and options.rietveld:
2605 parser.error('Options --gerrit and --rietveld are mutually exclusive')
2606 options.forced_codereview = None
2607 if options.gerrit:
2608 options.forced_codereview = 'gerrit'
2609 elif options.rietveld:
2610 options.forced_codereview = 'rietveld'
2611
2612
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002613class ChangeDescription(object):
2614 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002615 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
agable@chromium.org42c20792013-09-12 17:34:49 +00002616 BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002617
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002618 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002619 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002620
agable@chromium.org42c20792013-09-12 17:34:49 +00002621 @property # www.logilab.org/ticket/89786
2622 def description(self): # pylint: disable=E0202
2623 return '\n'.join(self._description_lines)
2624
2625 def set_description(self, desc):
2626 if isinstance(desc, basestring):
2627 lines = desc.splitlines()
2628 else:
2629 lines = [line.rstrip() for line in desc]
2630 while lines and not lines[0]:
2631 lines.pop(0)
2632 while lines and not lines[-1]:
2633 lines.pop(-1)
2634 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002635
piman@chromium.org336f9122014-09-04 02:16:55 +00002636 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002637 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002638 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00002639 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002640 return
agable@chromium.org42c20792013-09-12 17:34:49 +00002641 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002642
agable@chromium.org42c20792013-09-12 17:34:49 +00002643 # Get the set of R= and TBR= lines and remove them from the desciption.
2644 regexp = re.compile(self.R_LINE)
2645 matches = [regexp.match(line) for line in self._description_lines]
2646 new_desc = [l for i, l in enumerate(self._description_lines)
2647 if not matches[i]]
2648 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002649
agable@chromium.org42c20792013-09-12 17:34:49 +00002650 # Construct new unified R= and TBR= lines.
2651 r_names = []
2652 tbr_names = []
2653 for match in matches:
2654 if not match:
2655 continue
2656 people = cleanup_list([match.group(2).strip()])
2657 if match.group(1) == 'TBR':
2658 tbr_names.extend(people)
2659 else:
2660 r_names.extend(people)
2661 for name in r_names:
2662 if name not in reviewers:
2663 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00002664 if add_owners_tbr:
2665 owners_db = owners.Database(change.RepositoryRoot(),
2666 fopen=file, os_path=os.path, glob=glob.glob)
2667 all_reviewers = set(tbr_names + reviewers)
2668 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
2669 all_reviewers)
2670 tbr_names.extend(owners_db.reviewers_for(missing_files,
2671 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00002672 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
2673 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
2674
2675 # Put the new lines in the description where the old first R= line was.
2676 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2677 if 0 <= line_loc < len(self._description_lines):
2678 if new_tbr_line:
2679 self._description_lines.insert(line_loc, new_tbr_line)
2680 if new_r_line:
2681 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002682 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002683 if new_r_line:
2684 self.append_footer(new_r_line)
2685 if new_tbr_line:
2686 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002687
2688 def prompt(self):
2689 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002690 self.set_description([
2691 '# Enter a description of the change.',
2692 '# This will be displayed on the codereview site.',
2693 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002694 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002695 '--------------------',
2696 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002697
agable@chromium.org42c20792013-09-12 17:34:49 +00002698 regexp = re.compile(self.BUG_LINE)
2699 if not any((regexp.match(line) for line in self._description_lines)):
rmistry@google.com90752582014-01-14 21:04:50 +00002700 self.append_footer('BUG=%s' % settings.GetBugPrefix())
agable@chromium.org42c20792013-09-12 17:34:49 +00002701 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00002702 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002703 if not content:
2704 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002705 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002706
2707 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00002708 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
2709 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002710 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002711 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002712
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002713 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002714 """Adds a footer line to the description.
2715
2716 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2717 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2718 that Gerrit footers are always at the end.
2719 """
2720 parsed_footer_line = git_footers.parse_footer(line)
2721 if parsed_footer_line:
2722 # Line is a gerrit footer in the form: Footer-Key: any value.
2723 # Thus, must be appended observing Gerrit footer rules.
2724 self.set_description(
2725 git_footers.add_footer(self.description,
2726 key=parsed_footer_line[0],
2727 value=parsed_footer_line[1]))
2728 return
2729
2730 if not self._description_lines:
2731 self._description_lines.append(line)
2732 return
2733
2734 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2735 if gerrit_footers:
2736 # git_footers.split_footers ensures that there is an empty line before
2737 # actual (gerrit) footers, if any. We have to keep it that way.
2738 assert top_lines and top_lines[-1] == ''
2739 top_lines, separator = top_lines[:-1], top_lines[-1:]
2740 else:
2741 separator = [] # No need for separator if there are no gerrit_footers.
2742
2743 prev_line = top_lines[-1] if top_lines else ''
2744 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2745 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2746 top_lines.append('')
2747 top_lines.append(line)
2748 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002749
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002750 def get_reviewers(self):
2751 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002752 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
2753 reviewers = [match.group(2).strip() for match in matches if match]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002754 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002755
2756
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002757def get_approving_reviewers(props):
2758 """Retrieves the reviewers that approved a CL from the issue properties with
2759 messages.
2760
2761 Note that the list may contain reviewers that are not committer, thus are not
2762 considered by the CQ.
2763 """
2764 return sorted(
2765 set(
2766 message['sender']
2767 for message in props['messages']
2768 if message['approval'] and message['sender'] in props['reviewers']
2769 )
2770 )
2771
2772
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002773def FindCodereviewSettingsFile(filename='codereview.settings'):
2774 """Finds the given file starting in the cwd and going up.
2775
2776 Only looks up to the top of the repository unless an
2777 'inherit-review-settings-ok' file exists in the root of the repository.
2778 """
2779 inherit_ok_file = 'inherit-review-settings-ok'
2780 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002781 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002782 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2783 root = '/'
2784 while True:
2785 if filename in os.listdir(cwd):
2786 if os.path.isfile(os.path.join(cwd, filename)):
2787 return open(os.path.join(cwd, filename))
2788 if cwd == root:
2789 break
2790 cwd = os.path.dirname(cwd)
2791
2792
2793def LoadCodereviewSettingsFromFile(fileobj):
2794 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002795 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002796
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002797 def SetProperty(name, setting, unset_error_ok=False):
2798 fullname = 'rietveld.' + name
2799 if setting in keyvals:
2800 RunGit(['config', fullname, keyvals[setting]])
2801 else:
2802 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2803
2804 SetProperty('server', 'CODE_REVIEW_SERVER')
2805 # Only server setting is required. Other settings can be absent.
2806 # In that case, we ignore errors raised during option deletion attempt.
2807 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00002808 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002809 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2810 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002811 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002812 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00002813 SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL',
2814 unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002815 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00002816 SetProperty('project', 'PROJECT', unset_error_ok=True)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002817 SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002818 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2819 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002820
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002821 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002822 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002823
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002824 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
2825 RunGit(['config', 'gerrit.squash-uploads',
2826 keyvals['GERRIT_SQUASH_UPLOADS']])
2827
tandrii@chromium.org28253532016-04-14 13:46:56 +00002828 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002829 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002830 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2831
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002832 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
2833 #should be of the form
2834 #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2835 #ORIGIN_URL_CONFIG: http://src.chromium.org/git
2836 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2837 keyvals['ORIGIN_URL_CONFIG']])
2838
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002839
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002840def urlretrieve(source, destination):
2841 """urllib is broken for SSL connections via a proxy therefore we
2842 can't use urllib.urlretrieve()."""
2843 with open(destination, 'w') as f:
2844 f.write(urllib2.urlopen(source).read())
2845
2846
ukai@chromium.org712d6102013-11-27 00:52:58 +00002847def hasSheBang(fname):
2848 """Checks fname is a #! script."""
2849 with open(fname) as f:
2850 return f.read(2).startswith('#!')
2851
2852
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00002853# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
2854def DownloadHooks(*args, **kwargs):
2855 pass
2856
2857
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002858def DownloadGerritHook(force):
2859 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002860
2861 Args:
2862 force: True to update hooks. False to install hooks if not present.
2863 """
2864 if not settings.GetIsGerrit():
2865 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00002866 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002867 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2868 if not os.access(dst, os.X_OK):
2869 if os.path.exists(dst):
2870 if not force:
2871 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002872 try:
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002873 print(
2874 'WARNING: installing Gerrit commit-msg hook.\n'
2875 ' This behavior of git cl will soon be disabled.\n'
2876 ' See bug http://crbug.com/579176.')
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002877 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002878 if not hasSheBang(dst):
2879 DieWithError('Not a script: %s\n'
2880 'You need to download from\n%s\n'
2881 'into .git/hooks/commit-msg and '
2882 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002883 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2884 except Exception:
2885 if os.path.exists(dst):
2886 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002887 DieWithError('\nFailed to download hooks.\n'
2888 'You need to download from\n%s\n'
2889 'into .git/hooks/commit-msg and '
2890 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002891
2892
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00002893
2894def GetRietveldCodereviewSettingsInteractively():
2895 """Prompt the user for settings."""
2896 server = settings.GetDefaultServerUrl(error_ok=True)
2897 prompt = 'Rietveld server (host[:port])'
2898 prompt += ' [%s]' % (server or DEFAULT_SERVER)
2899 newserver = ask_for_data(prompt + ':')
2900 if not server and not newserver:
2901 newserver = DEFAULT_SERVER
2902 if newserver:
2903 newserver = gclient_utils.UpgradeToHttps(newserver)
2904 if newserver != server:
2905 RunGit(['config', 'rietveld.server', newserver])
2906
2907 def SetProperty(initial, caption, name, is_url):
2908 prompt = caption
2909 if initial:
2910 prompt += ' ("x" to clear) [%s]' % initial
2911 new_val = ask_for_data(prompt + ':')
2912 if new_val == 'x':
2913 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
2914 elif new_val:
2915 if is_url:
2916 new_val = gclient_utils.UpgradeToHttps(new_val)
2917 if new_val != initial:
2918 RunGit(['config', 'rietveld.' + name, new_val])
2919
2920 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
2921 SetProperty(settings.GetDefaultPrivateFlag(),
2922 'Private flag (rietveld only)', 'private', False)
2923 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
2924 'tree-status-url', False)
2925 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
2926 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
2927 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
2928 'run-post-upload-hook', False)
2929
maruel@chromium.org0633fb42013-08-16 20:06:14 +00002930@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002931def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00002932 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002933
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00002934 print('WARNING: git cl config works for Rietveld only.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002935 'For Gerrit, see http://crbug.com/603116.')
2936 # TODO(tandrii): add Gerrit support as part of http://crbug.com/603116.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00002937 parser.add_option('--activate-update', action='store_true',
2938 help='activate auto-updating [rietveld] section in '
2939 '.git/config')
2940 parser.add_option('--deactivate-update', action='store_true',
2941 help='deactivate auto-updating [rietveld] section in '
2942 '.git/config')
2943 options, args = parser.parse_args(args)
2944
2945 if options.deactivate_update:
2946 RunGit(['config', 'rietveld.autoupdate', 'false'])
2947 return
2948
2949 if options.activate_update:
2950 RunGit(['config', '--unset', 'rietveld.autoupdate'])
2951 return
2952
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002953 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00002954 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002955 return 0
2956
2957 url = args[0]
2958 if not url.endswith('codereview.settings'):
2959 url = os.path.join(url, 'codereview.settings')
2960
2961 # Load code review settings and download hooks (if available).
2962 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
2963 return 0
2964
2965
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00002966def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00002967 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00002968 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
2969 branch = ShortBranchName(branchref)
2970 _, args = parser.parse_args(args)
2971 if not args:
2972 print("Current base-url:")
2973 return RunGit(['config', 'branch.%s.base-url' % branch],
2974 error_ok=False).strip()
2975 else:
2976 print("Setting base-url to %s" % args[0])
2977 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
2978 error_ok=False).strip()
2979
2980
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00002981def color_for_status(status):
2982 """Maps a Changelist status to color, for CMDstatus and other tools."""
2983 return {
2984 'unsent': Fore.RED,
2985 'waiting': Fore.BLUE,
2986 'reply': Fore.YELLOW,
2987 'lgtm': Fore.GREEN,
2988 'commit': Fore.MAGENTA,
2989 'closed': Fore.CYAN,
2990 'error': Fore.WHITE,
2991 }.get(status, Fore.WHITE)
2992
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00002993
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002994def get_cl_statuses(changes, fine_grained, max_processes=None):
2995 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00002996
2997 If fine_grained is true, this will fetch CL statuses from the server.
2998 Otherwise, simply indicate if there's a matching url for the given branches.
2999
3000 If max_processes is specified, it is used as the maximum number of processes
3001 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3002 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003003
3004 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003005 """
3006 # Silence upload.py otherwise it becomes unwieldly.
3007 upload.verbosity = 0
3008
3009 if fine_grained:
3010 # Process one branch synchronously to work through authentication, then
3011 # spawn processes to process all the other branches in parallel.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003012 if changes:
3013 fetch = lambda cl: (cl, cl.GetStatus())
3014 yield fetch(changes[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003015
kmarshall3bff56b2016-06-06 18:31:47 -07003016 if not changes:
3017 # Exit early if there was only one branch to fetch.
3018 return
3019
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003020 changes_to_fetch = changes[1:]
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003021 pool = ThreadPool(
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003022 min(max_processes, len(changes_to_fetch))
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003023 if max_processes is not None
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003024 else len(changes_to_fetch))
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003025
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003026 fetched_cls = set()
3027 it = pool.imap_unordered(fetch, changes_to_fetch).__iter__()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003028 while True:
3029 try:
3030 row = it.next(timeout=5)
3031 except multiprocessing.TimeoutError:
3032 break
3033
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003034 fetched_cls.add(row[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003035 yield row
3036
3037 # Add any branches that failed to fetch.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003038 for cl in set(changes_to_fetch) - fetched_cls:
3039 yield (cl, 'error')
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003040
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003041 else:
3042 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003043 for cl in changes:
3044 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003045
rmistry@google.com2dd99862015-06-22 12:22:18 +00003046
3047def upload_branch_deps(cl, args):
3048 """Uploads CLs of local branches that are dependents of the current branch.
3049
3050 If the local branch dependency tree looks like:
3051 test1 -> test2.1 -> test3.1
3052 -> test3.2
3053 -> test2.2 -> test3.3
3054
3055 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3056 run on the dependent branches in this order:
3057 test2.1, test3.1, test3.2, test2.2, test3.3
3058
3059 Note: This function does not rebase your local dependent branches. Use it when
3060 you make a change to the parent branch that will not conflict with its
3061 dependent branches, and you would like their dependencies updated in
3062 Rietveld.
3063 """
3064 if git_common.is_dirty_git_tree('upload-branch-deps'):
3065 return 1
3066
3067 root_branch = cl.GetBranch()
3068 if root_branch is None:
3069 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3070 'Get on a branch!')
3071 if not cl.GetIssue() or not cl.GetPatchset():
3072 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3073 'patchset dependencies without an uploaded CL.')
3074
3075 branches = RunGit(['for-each-ref',
3076 '--format=%(refname:short) %(upstream:short)',
3077 'refs/heads'])
3078 if not branches:
3079 print('No local branches found.')
3080 return 0
3081
3082 # Create a dictionary of all local branches to the branches that are dependent
3083 # on it.
3084 tracked_to_dependents = collections.defaultdict(list)
3085 for b in branches.splitlines():
3086 tokens = b.split()
3087 if len(tokens) == 2:
3088 branch_name, tracked = tokens
3089 tracked_to_dependents[tracked].append(branch_name)
3090
3091 print
3092 print 'The dependent local branches of %s are:' % root_branch
3093 dependents = []
3094 def traverse_dependents_preorder(branch, padding=''):
3095 dependents_to_process = tracked_to_dependents.get(branch, [])
3096 padding += ' '
3097 for dependent in dependents_to_process:
3098 print '%s%s' % (padding, dependent)
3099 dependents.append(dependent)
3100 traverse_dependents_preorder(dependent, padding)
3101 traverse_dependents_preorder(root_branch)
3102 print
3103
3104 if not dependents:
3105 print 'There are no dependent local branches for %s' % root_branch
3106 return 0
3107
3108 print ('This command will checkout all dependent branches and run '
3109 '"git cl upload".')
3110 ask_for_data('[Press enter to continue or ctrl-C to quit]')
3111
andybons@chromium.org962f9462016-02-03 20:00:42 +00003112 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003113 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003114 args.extend(['-t', 'Updated patchset dependency'])
3115
rmistry@google.com2dd99862015-06-22 12:22:18 +00003116 # Record all dependents that failed to upload.
3117 failures = {}
3118 # Go through all dependents, checkout the branch and upload.
3119 try:
3120 for dependent_branch in dependents:
3121 print
3122 print '--------------------------------------'
3123 print 'Running "git cl upload" from %s:' % dependent_branch
3124 RunGit(['checkout', '-q', dependent_branch])
3125 print
3126 try:
3127 if CMDupload(OptionParser(), args) != 0:
3128 print 'Upload failed for %s!' % dependent_branch
3129 failures[dependent_branch] = 1
3130 except: # pylint: disable=W0702
3131 failures[dependent_branch] = 1
3132 print
3133 finally:
3134 # Swap back to the original root branch.
3135 RunGit(['checkout', '-q', root_branch])
3136
3137 print
3138 print 'Upload complete for dependent branches!'
3139 for dependent_branch in dependents:
3140 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
3141 print ' %s : %s' % (dependent_branch, upload_status)
3142 print
3143
3144 return 0
3145
3146
kmarshall3bff56b2016-06-06 18:31:47 -07003147def CMDarchive(parser, args):
3148 """Archives and deletes branches associated with closed changelists."""
3149 parser.add_option(
3150 '-j', '--maxjobs', action='store', type=int,
3151 help='The maximum number of jobs to use when retrieving review status')
3152 parser.add_option(
3153 '-f', '--force', action='store_true',
3154 help='Bypasses the confirmation prompt.')
3155
3156 auth.add_auth_options(parser)
3157 options, args = parser.parse_args(args)
3158 if args:
3159 parser.error('Unsupported args: %s' % ' '.join(args))
3160 auth_config = auth.extract_auth_config_from_options(options)
3161
3162 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3163 if not branches:
3164 return 0
3165
3166 print 'Finding all branches associated with closed issues...'
3167 changes = [Changelist(branchref=b, auth_config=auth_config)
3168 for b in branches.splitlines()]
3169 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3170 statuses = get_cl_statuses(changes,
3171 fine_grained=True,
3172 max_processes=options.maxjobs)
3173 proposal = [(cl.GetBranch(),
3174 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3175 for cl, status in statuses
3176 if status == 'closed']
3177 proposal.sort()
3178
3179 if not proposal:
3180 print 'No branches with closed codereview issues found.'
3181 return 0
3182
3183 current_branch = GetCurrentBranch()
3184
3185 print '\nBranches with closed issues that will be archived:\n'
3186 print '%*s | %s' % (alignment, 'Branch name', 'Archival tag name')
3187 for next_item in proposal:
3188 print '%*s %s' % (alignment, next_item[0], next_item[1])
3189
3190 if any(branch == current_branch for branch, _ in proposal):
3191 print('You are currently on a branch \'%s\' which is associated with a '
3192 'closed codereview issue, so archive cannot proceed. Please '
3193 'checkout another branch and run this command again.' %
3194 current_branch)
3195 return 1
3196
3197 if not options.force:
3198 if ask_for_data('\nProceed with deletion (Y/N)? ').lower() != 'y':
3199 print 'Aborted.'
3200 return 1
3201
3202 for branch, tagname in proposal:
3203 RunGit(['tag', tagname, branch])
3204 RunGit(['branch', '-D', branch])
3205 print '\nJob\'s done!'
3206
3207 return 0
3208
3209
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003210def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003211 """Show status of changelists.
3212
3213 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003214 - Red not sent for review or broken
3215 - Blue waiting for review
3216 - Yellow waiting for you to reply to review
3217 - Green LGTM'ed
3218 - Magenta in the commit queue
3219 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003220
3221 Also see 'git cl comments'.
3222 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003223 parser.add_option('--field',
3224 help='print only specific field (desc|id|patch|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003225 parser.add_option('-f', '--fast', action='store_true',
3226 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003227 parser.add_option(
3228 '-j', '--maxjobs', action='store', type=int,
3229 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003230
3231 auth.add_auth_options(parser)
3232 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003233 if args:
3234 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003235 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003236
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003237 if options.field:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003238 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003239 if options.field.startswith('desc'):
3240 print cl.GetDescription()
3241 elif options.field == 'id':
3242 issueid = cl.GetIssue()
3243 if issueid:
3244 print issueid
3245 elif options.field == 'patch':
3246 patchset = cl.GetPatchset()
3247 if patchset:
3248 print patchset
3249 elif options.field == 'url':
3250 url = cl.GetIssueURL()
3251 if url:
3252 print url
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003253 return 0
3254
3255 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3256 if not branches:
3257 print('No local branch found.')
3258 return 0
3259
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003260 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003261 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003262 for b in branches.splitlines()]
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003263 print 'Branches associated with reviews:'
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003264 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003265 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003266 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003267
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003268 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003269 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
3270 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3271 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003272 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003273 c, status = output.next()
3274 branch_statuses[c.GetBranch()] = status
3275 status = branch_statuses.pop(branch)
3276 url = cl.GetIssueURL()
3277 if url and (not status or status == 'error'):
3278 # The issue probably doesn't exist anymore.
3279 url += ' (broken)'
3280
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003281 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003282 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003283 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003284 color = ''
3285 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003286 status_str = '(%s)' % status if status else ''
3287 print ' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003288 alignment, ShortBranchName(branch), color, url,
3289 status_str, reset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003290
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003291 cl = Changelist(auth_config=auth_config)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003292 print
3293 print 'Current branch:',
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003294 print cl.GetBranch()
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003295 if not cl.GetIssue():
3296 print 'No issue assigned.'
3297 return 0
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003298 print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
maruel@chromium.org85616e02014-07-28 15:37:55 +00003299 if not options.fast:
3300 print 'Issue description:'
3301 print cl.GetDescription(pretty=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003302 return 0
3303
3304
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003305def colorize_CMDstatus_doc():
3306 """To be called once in main() to add colors to git cl status help."""
3307 colors = [i for i in dir(Fore) if i[0].isupper()]
3308
3309 def colorize_line(line):
3310 for color in colors:
3311 if color in line.upper():
3312 # Extract whitespaces first and the leading '-'.
3313 indent = len(line) - len(line.lstrip(' ')) + 1
3314 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3315 return line
3316
3317 lines = CMDstatus.__doc__.splitlines()
3318 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3319
3320
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003321@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003322def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003323 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003324
3325 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003326 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003327 parser.add_option('-r', '--reverse', action='store_true',
3328 help='Lookup the branch(es) for the specified issues. If '
3329 'no issues are specified, all branches with mapped '
3330 'issues will be listed.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003331 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003332 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003333 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003334
dnj@chromium.org406c4402015-03-03 17:22:28 +00003335 if options.reverse:
3336 branches = RunGit(['for-each-ref', 'refs/heads',
3337 '--format=%(refname:short)']).splitlines()
3338
3339 # Reverse issue lookup.
3340 issue_branch_map = {}
3341 for branch in branches:
3342 cl = Changelist(branchref=branch)
3343 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
3344 if not args:
3345 args = sorted(issue_branch_map.iterkeys())
3346 for issue in args:
3347 if not issue:
3348 continue
3349 print 'Branch for issue number %s: %s' % (
3350 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',)))
3351 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003352 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003353 if len(args) > 0:
3354 try:
3355 issue = int(args[0])
3356 except ValueError:
3357 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003358 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003359 cl.SetIssue(issue)
3360 print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003361 return 0
3362
3363
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003364def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003365 """Shows or posts review comments for any changelist."""
3366 parser.add_option('-a', '--add-comment', dest='comment',
3367 help='comment to add to an issue')
3368 parser.add_option('-i', dest='issue',
3369 help="review issue id (defaults to current issue)")
smut@google.comc85ac942015-09-15 16:34:43 +00003370 parser.add_option('-j', '--json-file',
3371 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003372 auth.add_auth_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003373 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003374 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003375
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003376 issue = None
3377 if options.issue:
3378 try:
3379 issue = int(options.issue)
3380 except ValueError:
3381 DieWithError('A review issue id is expected to be a number')
3382
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00003383 cl = Changelist(issue=issue, codereview='rietveld', auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003384
3385 if options.comment:
3386 cl.AddComment(options.comment)
3387 return 0
3388
3389 data = cl.GetIssueProperties()
smut@google.comc85ac942015-09-15 16:34:43 +00003390 summary = []
maruel@chromium.org5cab2d32014-11-11 18:32:41 +00003391 for message in sorted(data.get('messages', []), key=lambda x: x['date']):
smut@google.comc85ac942015-09-15 16:34:43 +00003392 summary.append({
3393 'date': message['date'],
3394 'lgtm': False,
3395 'message': message['text'],
3396 'not_lgtm': False,
3397 'sender': message['sender'],
3398 })
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003399 if message['disapproval']:
3400 color = Fore.RED
smut@google.comc85ac942015-09-15 16:34:43 +00003401 summary[-1]['not lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003402 elif message['approval']:
3403 color = Fore.GREEN
smut@google.comc85ac942015-09-15 16:34:43 +00003404 summary[-1]['lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003405 elif message['sender'] == data['owner_email']:
3406 color = Fore.MAGENTA
3407 else:
3408 color = Fore.BLUE
3409 print '\n%s%s %s%s' % (
3410 color, message['date'].split('.', 1)[0], message['sender'],
3411 Fore.RESET)
3412 if message['text'].strip():
3413 print '\n'.join(' ' + l for l in message['text'].splitlines())
smut@google.comc85ac942015-09-15 16:34:43 +00003414 if options.json_file:
3415 with open(options.json_file, 'wb') as f:
3416 json.dump(summary, f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003417 return 0
3418
3419
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003420@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003421def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003422 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003423 parser.add_option('-d', '--display', action='store_true',
3424 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003425 parser.add_option('-n', '--new-description',
3426 help='New description to set for this issue (- for stdin)')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003427
3428 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003429 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003430 options, args = parser.parse_args(args)
3431 _process_codereview_select_options(parser, options)
3432
3433 target_issue = None
3434 if len(args) > 0:
3435 issue_arg = ParseIssueNumberArgument(args[0])
3436 if not issue_arg.valid:
3437 parser.print_help()
3438 return 1
3439 target_issue = issue_arg.issue
3440
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003441 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003442
3443 cl = Changelist(
3444 auth_config=auth_config, issue=target_issue,
3445 codereview=options.forced_codereview)
3446
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003447 if not cl.GetIssue():
3448 DieWithError('This branch has no associated changelist.')
3449 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003450
smut@google.com34fb6b12015-07-13 20:03:26 +00003451 if options.display:
tandrii@chromium.org8c3b4422016-04-27 13:11:18 +00003452 print description.description
smut@google.com34fb6b12015-07-13 20:03:26 +00003453 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003454
3455 if options.new_description:
3456 text = options.new_description
3457 if text == '-':
3458 text = '\n'.join(l.rstrip() for l in sys.stdin)
3459
3460 description.set_description(text)
3461 else:
3462 description.prompt()
3463
wychen@chromium.org063e4e52015-04-03 06:51:44 +00003464 if cl.GetDescription() != description.description:
3465 cl.UpdateDescription(description.description)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003466 return 0
3467
3468
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003469def CreateDescriptionFromLog(args):
3470 """Pulls out the commit log to use as a base for the CL description."""
3471 log_args = []
3472 if len(args) == 1 and not args[0].endswith('.'):
3473 log_args = [args[0] + '..']
3474 elif len(args) == 1 and args[0].endswith('...'):
3475 log_args = [args[0][:-1]]
3476 elif len(args) == 2:
3477 log_args = [args[0] + '..' + args[1]]
3478 else:
3479 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00003480 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003481
3482
thestig@chromium.org44202a22014-03-11 19:22:18 +00003483def CMDlint(parser, args):
3484 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003485 parser.add_option('--filter', action='append', metavar='-x,+y',
3486 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003487 auth.add_auth_options(parser)
3488 options, args = parser.parse_args(args)
3489 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003490
3491 # Access to a protected member _XX of a client class
3492 # pylint: disable=W0212
3493 try:
3494 import cpplint
3495 import cpplint_chromium
3496 except ImportError:
3497 print "Your depot_tools is missing cpplint.py and/or cpplint_chromium.py."
3498 return 1
3499
3500 # Change the current working directory before calling lint so that it
3501 # shows the correct base.
3502 previous_cwd = os.getcwd()
3503 os.chdir(settings.GetRoot())
3504 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003505 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003506 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
3507 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003508 if not files:
3509 print "Cannot lint an empty CL"
3510 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003511
3512 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003513 command = args + files
3514 if options.filter:
3515 command = ['--filter=' + ','.join(options.filter)] + command
3516 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003517
3518 white_regex = re.compile(settings.GetLintRegex())
3519 black_regex = re.compile(settings.GetLintIgnoreRegex())
3520 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3521 for filename in filenames:
3522 if white_regex.match(filename):
3523 if black_regex.match(filename):
3524 print "Ignoring file %s" % filename
3525 else:
3526 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3527 extra_check_functions)
3528 else:
3529 print "Skipping file %s" % filename
3530 finally:
3531 os.chdir(previous_cwd)
3532 print "Total errors found: %d\n" % cpplint._cpplint_state.error_count
3533 if cpplint._cpplint_state.error_count != 0:
3534 return 1
3535 return 0
3536
3537
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003538def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003539 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003540 parser.add_option('-u', '--upload', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003541 help='Run upload hook instead of the push/dcommit hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003542 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003543 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003544 auth.add_auth_options(parser)
3545 options, args = parser.parse_args(args)
3546 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003547
sbc@chromium.org71437c02015-04-09 19:29:40 +00003548 if not options.force and git_common.is_dirty_git_tree('presubmit'):
ukai@chromium.org259e4682012-10-25 07:36:33 +00003549 print 'use --force to check even if tree is dirty.'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003550 return 1
3551
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003552 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003553 if args:
3554 base_branch = args[0]
3555 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003556 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003557 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003558
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003559 cl.RunHook(
3560 committing=not options.upload,
3561 may_prompt=False,
3562 verbose=options.verbose,
3563 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003564 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003565
3566
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003567def GenerateGerritChangeId(message):
3568 """Returns Ixxxxxx...xxx change id.
3569
3570 Works the same way as
3571 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3572 but can be called on demand on all platforms.
3573
3574 The basic idea is to generate git hash of a state of the tree, original commit
3575 message, author/committer info and timestamps.
3576 """
3577 lines = []
3578 tree_hash = RunGitSilent(['write-tree'])
3579 lines.append('tree %s' % tree_hash.strip())
3580 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3581 if code == 0:
3582 lines.append('parent %s' % parent.strip())
3583 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3584 lines.append('author %s' % author.strip())
3585 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3586 lines.append('committer %s' % committer.strip())
3587 lines.append('')
3588 # Note: Gerrit's commit-hook actually cleans message of some lines and
3589 # whitespace. This code is not doing this, but it clearly won't decrease
3590 # entropy.
3591 lines.append(message)
3592 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
3593 stdin='\n'.join(lines))
3594 return 'I%s' % change_hash.strip()
3595
3596
wittman@chromium.org455dc922015-01-26 20:15:50 +00003597def GetTargetRef(remote, remote_branch, target_branch, pending_prefix):
3598 """Computes the remote branch ref to use for the CL.
3599
3600 Args:
3601 remote (str): The git remote for the CL.
3602 remote_branch (str): The git remote branch for the CL.
3603 target_branch (str): The target branch specified by the user.
3604 pending_prefix (str): The pending prefix from the settings.
3605 """
3606 if not (remote and remote_branch):
3607 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003608
wittman@chromium.org455dc922015-01-26 20:15:50 +00003609 if target_branch:
3610 # Cannonicalize branch references to the equivalent local full symbolic
3611 # refs, which are then translated into the remote full symbolic refs
3612 # below.
3613 if '/' not in target_branch:
3614 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3615 else:
3616 prefix_replacements = (
3617 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3618 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3619 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3620 )
3621 match = None
3622 for regex, replacement in prefix_replacements:
3623 match = re.search(regex, target_branch)
3624 if match:
3625 remote_branch = target_branch.replace(match.group(0), replacement)
3626 break
3627 if not match:
3628 # This is a branch path but not one we recognize; use as-is.
3629 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003630 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3631 # Handle the refs that need to land in different refs.
3632 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003633
wittman@chromium.org455dc922015-01-26 20:15:50 +00003634 # Create the true path to the remote branch.
3635 # Does the following translation:
3636 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3637 # * refs/remotes/origin/master -> refs/heads/master
3638 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3639 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3640 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3641 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3642 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3643 'refs/heads/')
3644 elif remote_branch.startswith('refs/remotes/branch-heads'):
3645 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
3646 # If a pending prefix exists then replace refs/ with it.
3647 if pending_prefix:
3648 remote_branch = remote_branch.replace('refs/', pending_prefix)
3649 return remote_branch
3650
3651
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003652def cleanup_list(l):
3653 """Fixes a list so that comma separated items are put as individual items.
3654
3655 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3656 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3657 """
3658 items = sum((i.split(',') for i in l), [])
3659 stripped_items = (i.strip() for i in items)
3660 return sorted(filter(None, stripped_items))
3661
3662
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003663@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003664def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003665 """Uploads the current changelist to codereview.
3666
3667 Can skip dependency patchset uploads for a branch by running:
3668 git config branch.branch_name.skip-deps-uploads True
3669 To unset run:
3670 git config --unset branch.branch_name.skip-deps-uploads
3671 Can also set the above globally by using the --global flag.
3672 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003673 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3674 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003675 parser.add_option('--bypass-watchlists', action='store_true',
3676 dest='bypass_watchlists',
3677 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003678 parser.add_option('-f', action='store_true', dest='force',
3679 help="force yes to questions (don't prompt)")
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00003680 parser.add_option('-m', dest='message', help='message for patchset')
andybons@chromium.org962f9462016-02-03 20:00:42 +00003681 parser.add_option('-t', dest='title',
3682 help='title for patchset (Rietveld only)')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003683 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003684 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003685 help='reviewer email addresses')
3686 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003687 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003688 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00003689 parser.add_option('-s', '--send-mail', action='store_true',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003690 help='send email to reviewer immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003691 parser.add_option('--emulate_svn_auto_props',
3692 '--emulate-svn-auto-props',
3693 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00003694 dest="emulate_svn_auto_props",
3695 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00003696 parser.add_option('-c', '--use-commit-queue', action='store_true',
3697 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003698 parser.add_option('--private', action='store_true',
3699 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00003700 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003701 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00003702 metavar='TARGET',
3703 help='Apply CL to remote ref TARGET. ' +
3704 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003705 parser.add_option('--squash', action='store_true',
3706 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003707 parser.add_option('--no-squash', action='store_true',
3708 help='Don\'t squash multiple commits into one ' +
3709 '(Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00003710 parser.add_option('--email', default=None,
3711 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00003712 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
3713 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00003714 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
3715 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00003716 help='Send the patchset to do a CQ dry run right after '
3717 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003718 parser.add_option('--dependencies', action='store_true',
3719 help='Uploads CLs of all the local branches that depend on '
3720 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00003721
rmistry@google.com2dd99862015-06-22 12:22:18 +00003722 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00003723 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003724 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003725 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003726 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003727 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003728 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003729
sbc@chromium.org71437c02015-04-09 19:29:40 +00003730 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00003731 return 1
3732
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003733 options.reviewers = cleanup_list(options.reviewers)
3734 options.cc = cleanup_list(options.cc)
3735
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00003736 # For sanity of test expectations, do this otherwise lazy-loading *now*.
3737 settings.GetIsGerrit()
3738
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003739 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00003740 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003741
3742
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003743def IsSubmoduleMergeCommit(ref):
3744 # When submodules are added to the repo, we expect there to be a single
3745 # non-git-svn merge commit at remote HEAD with a signature comment.
3746 pattern = '^SVN changes up to revision [0-9]*$'
szager@chromium.orge84b7542012-06-15 21:26:58 +00003747 cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003748 return RunGit(cmd) != ''
3749
3750
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003751def SendUpstream(parser, args, cmd):
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00003752 """Common code for CMDland and CmdDCommit
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003753
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003754 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
3755 upstream and closes the issue automatically and atomically.
3756
3757 Otherwise (in case of Rietveld):
3758 Squashes branch into a single commit.
3759 Updates changelog with metadata (e.g. pointer to review).
3760 Pushes/dcommits the code upstream.
3761 Updates review and closes.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003762 """
3763 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3764 help='bypass upload presubmit hook')
3765 parser.add_option('-m', dest='message',
3766 help="override review description")
3767 parser.add_option('-f', action='store_true', dest='force',
3768 help="force yes to questions (don't prompt)")
3769 parser.add_option('-c', dest='contributor',
3770 help="external contributor for patch (appended to " +
3771 "description and used as author for git). Should be " +
3772 "formatted as 'First Last <email@example.com>'")
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00003773 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003774 auth.add_auth_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003775 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003776 auth_config = auth.extract_auth_config_from_options(options)
3777
3778 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003779
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003780 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
3781 if cl.IsGerrit():
3782 if options.message:
3783 # This could be implemented, but it requires sending a new patch to
3784 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
3785 # Besides, Gerrit has the ability to change the commit message on submit
3786 # automatically, thus there is no need to support this option (so far?).
3787 parser.error('-m MESSAGE option is not supported for Gerrit.')
3788 if options.contributor:
3789 parser.error(
3790 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
3791 'Before uploading a commit to Gerrit, ensure it\'s author field is '
3792 'the contributor\'s "name <email>". If you can\'t upload such a '
3793 'commit for review, contact your repository admin and request'
3794 '"Forge-Author" permission.')
3795 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
3796 options.verbose)
3797
iannucci@chromium.org5724c962014-04-11 09:32:56 +00003798 current = cl.GetBranch()
3799 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
3800 if not settings.GetIsGitSvn() and remote == '.':
3801 print
3802 print 'Attempting to push branch %r into another local branch!' % current
3803 print
3804 print 'Either reparent this branch on top of origin/master:'
3805 print ' git reparent-branch --root'
3806 print
3807 print 'OR run `git rebase-update` if you think the parent branch is already'
3808 print 'committed.'
3809 print
3810 print ' Current parent: %r' % upstream_branch
3811 return 1
3812
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003813 if not args or cmd == 'land':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003814 # Default to merging against our best guess of the upstream branch.
3815 args = [cl.GetUpstreamBranch()]
3816
maruel@chromium.org13f623c2011-07-22 16:02:23 +00003817 if options.contributor:
3818 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
3819 print "Please provide contibutor as 'First Last <email@example.com>'"
3820 return 1
3821
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003822 base_branch = args[0]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003823 base_has_submodules = IsSubmoduleMergeCommit(base_branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003824
sbc@chromium.org71437c02015-04-09 19:29:40 +00003825 if git_common.is_dirty_git_tree(cmd):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003826 return 1
3827
3828 # This rev-list syntax means "show all commits not in my branch that
3829 # are in base_branch".
3830 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
3831 base_branch]).splitlines()
3832 if upstream_commits:
3833 print ('Base branch "%s" has %d commits '
3834 'not in this branch.' % (base_branch, len(upstream_commits)))
3835 print 'Run "git merge %s" before attempting to %s.' % (base_branch, cmd)
3836 return 1
3837
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003838 # This is the revision `svn dcommit` will commit on top of.
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003839 svn_head = None
3840 if cmd == 'dcommit' or base_has_submodules:
3841 svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
3842 '--pretty=format:%H'])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003843
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003844 if cmd == 'dcommit':
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003845 # If the base_head is a submodule merge commit, the first parent of the
3846 # base_head should be a git-svn commit, which is what we're interested in.
3847 base_svn_head = base_branch
3848 if base_has_submodules:
3849 base_svn_head += '^1'
3850
3851 extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003852 if extra_commits:
3853 print ('This branch has %d additional commits not upstreamed yet.'
3854 % len(extra_commits.splitlines()))
3855 print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
3856 'before attempting to %s.' % (base_branch, cmd))
3857 return 1
3858
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003859 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003860 if not options.bypass_hooks:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00003861 author = None
3862 if options.contributor:
3863 author = re.search(r'\<(.*)\>', options.contributor).group(1)
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003864 hook_results = cl.RunHook(
3865 committing=True,
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003866 may_prompt=not options.force,
3867 verbose=options.verbose,
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003868 change=cl.GetChange(merge_base, author))
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003869 if not hook_results.should_continue():
3870 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003871
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003872 # Check the tree status if the tree status URL is set.
3873 status = GetTreeStatus()
3874 if 'closed' == status:
3875 print('The tree is closed. Please wait for it to reopen. Use '
3876 '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
3877 return 1
3878 elif 'unknown' == status:
3879 print('Unable to determine tree status. Please verify manually and '
3880 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
3881 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003882
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003883 change_desc = ChangeDescription(options.message)
3884 if not change_desc.description and cl.GetIssue():
3885 change_desc = ChangeDescription(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003886
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003887 if not change_desc.description:
erg@chromium.org1a173982012-08-29 20:43:05 +00003888 if not cl.GetIssue() and options.bypass_hooks:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003889 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
erg@chromium.org1a173982012-08-29 20:43:05 +00003890 else:
3891 print 'No description set.'
3892 print 'Visit %s/edit to set it.' % (cl.GetIssueURL())
3893 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003894
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003895 # Keep a separate copy for the commit message, because the commit message
3896 # contains the link to the Rietveld issue, while the Rietveld message contains
3897 # the commit viewvc url.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003898 # Keep a separate copy for the commit message.
3899 if cl.GetIssue():
maruel@chromium.orgcf087782013-07-23 13:08:48 +00003900 change_desc.update_reviewers(cl.GetApprovingReviewers())
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003901
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003902 commit_desc = ChangeDescription(change_desc.description)
maruel@chromium.orgcc73ad62011-07-06 17:39:26 +00003903 if cl.GetIssue():
smut@google.com4c61dcc2015-06-08 22:31:29 +00003904 # Xcode won't linkify this URL unless there is a non-whitespace character
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +00003905 # after it. Add a period on a new line to circumvent this. Also add a space
3906 # before the period to make sure that Gitiles continues to correctly resolve
3907 # the URL.
3908 commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003909 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003910 commit_desc.append_footer('Patch from %s.' % options.contributor)
3911
agable@chromium.orgeec3ea32013-08-15 20:31:39 +00003912 print('Description:')
3913 print(commit_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003914
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003915 branches = [merge_base, cl.GetBranchRef()]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003916 if not options.force:
iannucci@chromium.org79540052012-10-19 23:15:26 +00003917 print_stats(options.similarity, options.find_copies, branches)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003918
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003919 # We want to squash all this branch's commits into one commit with the proper
3920 # description. We do this by doing a "reset --soft" to the base branch (which
3921 # keeps the working copy the same), then dcommitting that. If origin/master
3922 # has a submodule merge commit, we'll also need to cherry-pick the squashed
3923 # commit onto a branch based on the git-svn head.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003924 MERGE_BRANCH = 'git-cl-commit'
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003925 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
3926 # Delete the branches if they exist.
3927 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
3928 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
3929 result = RunGitWithCode(showref_cmd)
3930 if result[0] == 0:
3931 RunGit(['branch', '-D', branch])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003932
3933 # We might be in a directory that's present in this branch but not in the
3934 # trunk. Move up to the top of the tree so that git commands that expect a
3935 # valid CWD won't fail after we check out the merge branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003936 rel_base_path = settings.GetRelativeRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003937 if rel_base_path:
3938 os.chdir(rel_base_path)
3939
3940 # Stuff our change into the merge branch.
3941 # We wrap in a try...finally block so if anything goes wrong,
3942 # we clean up the branches.
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00003943 retcode = -1
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003944 pushed_to_pending = False
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003945 pending_ref = None
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003946 revision = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003947 try:
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00003948 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003949 RunGit(['reset', '--soft', merge_base])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003950 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003951 RunGit(
3952 [
3953 'commit', '--author', options.contributor,
3954 '-m', commit_desc.description,
3955 ])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003956 else:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003957 RunGit(['commit', '-m', commit_desc.description])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003958 if base_has_submodules:
3959 cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip()
3960 RunGit(['branch', CHERRY_PICK_BRANCH, svn_head])
3961 RunGit(['checkout', CHERRY_PICK_BRANCH])
3962 RunGit(['cherry-pick', cherry_pick_commit])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003963 if cmd == 'land':
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003964 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
szager@chromium.org151ebcf2016-03-09 01:08:25 +00003965 mirror = settings.GetGitMirror(remote)
3966 pushurl = mirror.url if mirror else remote
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003967 pending_prefix = settings.GetPendingRefPrefix()
3968 if not pending_prefix or branch.startswith(pending_prefix):
3969 # If not using refs/pending/heads/* at all, or target ref is already set
3970 # to pending, then push to the target ref directly.
3971 retcode, output = RunGitWithCode(
szager@chromium.org151ebcf2016-03-09 01:08:25 +00003972 ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003973 pushed_to_pending = pending_prefix and branch.startswith(pending_prefix)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003974 else:
3975 # Cherry-pick the change on top of pending ref and then push it.
3976 assert branch.startswith('refs/'), branch
3977 assert pending_prefix[-1] == '/', pending_prefix
3978 pending_ref = pending_prefix + branch[len('refs/'):]
szager@chromium.org151ebcf2016-03-09 01:08:25 +00003979 retcode, output = PushToGitPending(pushurl, pending_ref, branch)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003980 pushed_to_pending = (retcode == 0)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00003981 if retcode == 0:
3982 revision = RunGit(['rev-parse', 'HEAD']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003983 else:
3984 # dcommit the merge branch.
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00003985 cmd_args = [
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00003986 'svn', 'dcommit',
3987 '-C%s' % options.similarity,
3988 '--no-rebase', '--rmdir',
3989 ]
3990 if settings.GetForceHttpsCommitUrl():
3991 # Allow forcing https commit URLs for some projects that don't allow
3992 # committing to http URLs (like Google Code).
3993 remote_url = cl.GetGitSvnRemoteUrl()
3994 if urlparse.urlparse(remote_url).scheme == 'http':
3995 remote_url = remote_url.replace('http://', 'https://')
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00003996 cmd_args.append('--commit-url=%s' % remote_url)
3997 _, output = RunGitWithCode(cmd_args)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00003998 if 'Committed r' in output:
3999 revision = re.match(
4000 '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
4001 logging.debug(output)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002 finally:
4003 # And then swap back to the original branch and clean up.
4004 RunGit(['checkout', '-q', cl.GetBranch()])
4005 RunGit(['branch', '-D', MERGE_BRANCH])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004006 if base_has_submodules:
4007 RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004008
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004009 if not revision:
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004010 print 'Failed to push. If this persists, please file a bug.'
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004011 return 1
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004012
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004013 killed = False
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004014 if pushed_to_pending:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004015 try:
4016 revision = WaitForRealCommit(remote, revision, base_branch, branch)
4017 # We set pushed_to_pending to False, since it made it all the way to the
4018 # real ref.
4019 pushed_to_pending = False
4020 except KeyboardInterrupt:
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004021 killed = True
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004022
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004023 if cl.GetIssue():
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004024 to_pending = ' to pending queue' if pushed_to_pending else ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004025 viewvc_url = settings.GetViewVCUrl()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004026 if not to_pending:
4027 if viewvc_url and revision:
4028 change_desc.append_footer(
4029 'Committed: %s%s' % (viewvc_url, revision))
4030 elif revision:
4031 change_desc.append_footer('Committed: %s' % (revision,))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004032 print ('Closing issue '
4033 '(you may be prompted for your codereview password)...')
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004034 cl.UpdateDescription(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004035 cl.CloseIssue()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004036 props = cl.GetIssueProperties()
sadrul@chromium.org34b5d822013-02-18 01:39:24 +00004037 patch_num = len(props['patchsets'])
rmistry@google.com52d224a2014-08-27 14:44:41 +00004038 comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
mark@chromium.org782570c2014-09-26 21:48:02 +00004039 patch_num, props['patchsets'][-1], to_pending, revision)
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004040 if options.bypass_hooks:
4041 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4042 else:
4043 comment += ' (presubmit successful).'
iannucci@chromium.orgb85a3162013-01-26 01:11:13 +00004044 cl.RpcServer().add_comment(cl.GetIssue(), comment)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004045 cl.SetIssue(None)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004046
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004047 if pushed_to_pending:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004048 _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
4049 print 'The commit is in the pending queue (%s).' % pending_ref
4050 print (
thakis@chromium.org5f32a962014-09-05 21:33:23 +00004051 'It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004052 'footer.' % branch)
4053
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004054 hook = POSTUPSTREAM_HOOK_PATTERN % cmd
4055 if os.path.isfile(hook):
4056 RunCommand([hook, merge_base], error_ok=True)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004057
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004058 return 1 if killed else 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004059
4060
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004061def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
4062 print
4063 print 'Waiting for commit to be landed on %s...' % real_ref
4064 print '(If you are impatient, you may Ctrl-C once without harm)'
4065 target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
4066 current_rev = RunGit(['rev-parse', local_base_ref]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004067 mirror = settings.GetGitMirror(remote)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004068
4069 loop = 0
4070 while True:
4071 sys.stdout.write('fetching (%d)... \r' % loop)
4072 sys.stdout.flush()
4073 loop += 1
4074
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004075 if mirror:
4076 mirror.populate()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004077 RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID)
4078 to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
4079 commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)])
4080 for commit in commits.splitlines():
4081 if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree:
4082 print 'Found commit on %s' % real_ref
4083 return commit
4084
4085 current_rev = to_rev
4086
4087
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004088def PushToGitPending(remote, pending_ref, upstream_ref):
4089 """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
4090
4091 Returns:
4092 (retcode of last operation, output log of last operation).
4093 """
4094 assert pending_ref.startswith('refs/'), pending_ref
4095 local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):]
4096 cherry = RunGit(['rev-parse', 'HEAD']).strip()
4097 code = 0
4098 out = ''
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004099 max_attempts = 3
4100 attempts_left = max_attempts
4101 while attempts_left:
4102 if attempts_left != max_attempts:
4103 print 'Retrying, %d attempts left...' % (attempts_left - 1,)
4104 attempts_left -= 1
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004105
4106 # Fetch. Retry fetch errors.
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004107 print 'Fetching pending ref %s...' % pending_ref
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004108 code, out = RunGitWithCode(
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004109 ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004110 if code:
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004111 print 'Fetch failed with exit code %d.' % code
4112 if out.strip():
4113 print out.strip()
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004114 continue
4115
4116 # Try to cherry pick. Abort on merge conflicts.
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004117 print 'Cherry-picking commit on top of pending ref...'
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004118 RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004119 code, out = RunGitWithCode(['cherry-pick', cherry])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004120 if code:
4121 print (
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004122 'Your patch doesn\'t apply cleanly to ref \'%s\', '
4123 'the following files have merge conflicts:' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004124 print RunGit(['diff', '--name-status', '--diff-filter=U']).strip()
4125 print 'Please rebase your patch and try again.'
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004126 RunGitWithCode(['cherry-pick', '--abort'])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004127 return code, out
4128
4129 # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004130 print 'Pushing commit to %s... It can take a while.' % pending_ref
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004131 code, out = RunGitWithCode(
4132 ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
4133 if code == 0:
4134 # Success.
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004135 print 'Commit pushed to pending ref successfully!'
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004136 return code, out
4137
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004138 print 'Push failed with exit code %d.' % code
4139 if out.strip():
4140 print out.strip()
4141 if IsFatalPushFailure(out):
4142 print (
4143 'Fatal push error. Make sure your .netrc credentials and git '
4144 'user.email are correct and you have push access to the repo.')
4145 return code, out
4146
4147 print 'All attempts to push to pending ref failed.'
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004148 return code, out
4149
4150
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004151def IsFatalPushFailure(push_stdout):
4152 """True if retrying push won't help."""
4153 return '(prohibited by Gerrit)' in push_stdout
4154
4155
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004156@subcommand.usage('[upstream branch to apply against]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004157def CMDdcommit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004158 """Commits the current changelist via git-svn."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004159 if not settings.GetIsGitSvn():
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004160 if git_footers.get_footer_svn_id():
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004161 # If it looks like previous commits were mirrored with git-svn.
4162 message = """This repository appears to be a git-svn mirror, but no
4163upstream SVN master is set. You probably need to run 'git auto-svn' once."""
4164 else:
4165 message = """This doesn't appear to be an SVN repository.
4166If your project has a true, writeable git repository, you probably want to run
4167'git cl land' instead.
4168If your project has a git mirror of an upstream SVN master, you probably need
4169to run 'git svn init'.
4170
4171Using the wrong command might cause your commit to appear to succeed, and the
4172review to be closed, without actually landing upstream. If you choose to
4173proceed, please verify that the commit lands upstream as expected."""
thakis@chromium.orgcde3bb62011-01-20 01:16:14 +00004174 print(message)
maruel@chromium.org90541732011-04-01 17:54:18 +00004175 ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004176 return SendUpstream(parser, args, 'dcommit')
4177
4178
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004179@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004180def CMDland(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004181 """Commits the current changelist via git."""
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004182 if settings.GetIsGitSvn() or git_footers.get_footer_svn_id():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004183 print('This appears to be an SVN repository.')
4184 print('Are you sure you didn\'t mean \'git cl dcommit\'?')
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004185 print('(Ignore if this is the first commit after migrating from svn->git)')
maruel@chromium.org90541732011-04-01 17:54:18 +00004186 ask_for_data('[Press enter to push or ctrl-C to quit]')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004187 return SendUpstream(parser, args, 'land')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004188
4189
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004190@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004191def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004192 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004193 parser.add_option('-b', dest='newbranch',
4194 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004195 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004196 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004197 parser.add_option('-d', '--directory', action='store', metavar='DIR',
4198 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004199 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004200 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004201 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004202 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004203 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004204 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004205
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004206
4207 group = optparse.OptionGroup(
4208 parser,
4209 'Options for continuing work on the current issue uploaded from a '
4210 'different clone (e.g. different machine). Must be used independently '
4211 'from the other options. No issue number should be specified, and the '
4212 'branch must have an issue number associated with it')
4213 group.add_option('--reapply', action='store_true', dest='reapply',
4214 help='Reset the branch and reapply the issue.\n'
4215 'CAUTION: This will undo any local changes in this '
4216 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004217
4218 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004219 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004220 parser.add_option_group(group)
4221
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004222 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004223 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004224 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004225 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004226 auth_config = auth.extract_auth_config_from_options(options)
4227
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004228
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004229 if options.reapply :
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004230 if options.newbranch:
4231 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004232 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004233 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004234
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004235 cl = Changelist(auth_config=auth_config,
4236 codereview=options.forced_codereview)
4237 if not cl.GetIssue():
4238 parser.error('current branch must have an associated issue')
4239
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004240 upstream = cl.GetUpstreamBranch()
4241 if upstream == None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004242 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004243
4244 RunGit(['reset', '--hard', upstream])
4245 if options.pull:
4246 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004247
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004248 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4249 options.directory)
4250
4251 if len(args) != 1 or not args[0]:
4252 parser.error('Must specify issue number or url')
4253
4254 # We don't want uncommitted changes mixed up with the patch.
4255 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004256 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004257
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004258 if options.newbranch:
4259 if options.force:
4260 RunGit(['branch', '-D', options.newbranch],
4261 stderr=subprocess2.PIPE, error_ok=True)
4262 RunGit(['new-branch', options.newbranch])
4263
4264 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
4265
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004266 if cl.IsGerrit():
4267 if options.reject:
4268 parser.error('--reject is not supported with Gerrit codereview.')
4269 if options.nocommit:
4270 parser.error('--nocommit is not supported with Gerrit codereview.')
4271 if options.directory:
4272 parser.error('--directory is not supported with Gerrit codereview.')
4273
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004274 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004275 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004276
4277
4278def CMDrebase(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004279 """Rebases current branch on top of svn repo."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004280 # Provide a wrapper for git svn rebase to help avoid accidental
4281 # git svn dcommit.
4282 # It's the only command that doesn't use parser at all since we just defer
4283 # execution to git-svn.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00004284
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004285 return RunGitWithCode(['svn', 'rebase'] + args)[1]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004286
4287
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004288def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004289 """Fetches the tree status and returns either 'open', 'closed',
4290 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004291 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004292 if url:
4293 status = urllib2.urlopen(url).read().lower()
4294 if status.find('closed') != -1 or status == '0':
4295 return 'closed'
4296 elif status.find('open') != -1 or status == '1':
4297 return 'open'
4298 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004299 return 'unset'
4300
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004301
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004302def GetTreeStatusReason():
4303 """Fetches the tree status from a json url and returns the message
4304 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004305 url = settings.GetTreeStatusUrl()
4306 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004307 connection = urllib2.urlopen(json_url)
4308 status = json.loads(connection.read())
4309 connection.close()
4310 return status['message']
4311
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004312
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00004313def GetBuilderMaster(bot_list):
4314 """For a given builder, fetch the master from AE if available."""
4315 map_url = 'https://builders-map.appspot.com/'
4316 try:
4317 master_map = json.load(urllib2.urlopen(map_url))
4318 except urllib2.URLError as e:
4319 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
4320 (map_url, e))
4321 except ValueError as e:
4322 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
4323 if not master_map:
4324 return None, 'Failed to build master map.'
4325
4326 result_master = ''
4327 for bot in bot_list:
4328 builder = bot.split(':', 1)[0]
4329 master_list = master_map.get(builder, [])
4330 if not master_list:
4331 return None, ('No matching master for builder %s.' % builder)
4332 elif len(master_list) > 1:
4333 return None, ('The builder name %s exists in multiple masters %s.' %
4334 (builder, master_list))
4335 else:
4336 cur_master = master_list[0]
4337 if not result_master:
4338 result_master = cur_master
4339 elif result_master != cur_master:
4340 return None, 'The builders do not belong to the same master.'
4341 return result_master, None
4342
4343
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004344def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004345 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004346 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004347 status = GetTreeStatus()
4348 if 'unset' == status:
4349 print 'You must configure your tree status URL by running "git cl config".'
4350 return 2
4351
4352 print "The tree is %s" % status
4353 print
4354 print GetTreeStatusReason()
4355 if status != 'open':
4356 return 1
4357 return 0
4358
4359
maruel@chromium.org15192402012-09-06 12:38:29 +00004360def CMDtry(parser, args):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004361 """Triggers try jobs through BuildBucket."""
maruel@chromium.org15192402012-09-06 12:38:29 +00004362 group = optparse.OptionGroup(parser, "Try job options")
4363 group.add_option(
4364 "-b", "--bot", action="append",
4365 help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple "
4366 "times to specify multiple builders. ex: "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004367 "'-b win_rel -b win_layout'. See "
maruel@chromium.org15192402012-09-06 12:38:29 +00004368 "the try server waterfall for the builders name and the tests "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004369 "available."))
maruel@chromium.org15192402012-09-06 12:38:29 +00004370 group.add_option(
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004371 "-m", "--master", default='',
iannucci@chromium.org9e849272014-04-04 00:31:55 +00004372 help=("Specify a try master where to run the tries."))
hinoka@chromium.orgfeb9e2a2015-09-25 19:11:09 +00004373 group.add_option( "--luci", action='store_true')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004374 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00004375 "-r", "--revision",
4376 help="Revision to use for the try job; default: the "
4377 "revision will be determined by the try server; see "
4378 "its waterfall for more info")
4379 group.add_option(
4380 "-c", "--clobber", action="store_true", default=False,
4381 help="Force a clobber before building; e.g. don't do an "
4382 "incremental build")
4383 group.add_option(
4384 "--project",
4385 help="Override which project to use. Projects are defined "
4386 "server-side to define what default bot set to use")
4387 group.add_option(
machenbach@chromium.org45453142015-09-15 08:45:22 +00004388 "-p", "--property", dest="properties", action="append", default=[],
4389 help="Specify generic properties in the form -p key1=value1 -p "
4390 "key2=value2 etc (buildbucket only). The value will be treated as "
4391 "json if decodable, or as string otherwise.")
4392 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00004393 "-n", "--name", help="Try job name; default to current branch name")
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004394 group.add_option(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004395 "--use-rietveld", action="store_true", default=False,
4396 help="Use Rietveld to trigger try jobs.")
4397 group.add_option(
4398 "--buildbucket-host", default='cr-buildbucket.appspot.com',
4399 help="Host of buildbucket. The default host is %default.")
maruel@chromium.org15192402012-09-06 12:38:29 +00004400 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004401 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004402 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004403 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004404
machenbach@chromium.org45453142015-09-15 08:45:22 +00004405 if options.use_rietveld and options.properties:
4406 parser.error('Properties can only be specified with buildbucket')
4407
4408 # Make sure that all properties are prop=value pairs.
4409 bad_params = [x for x in options.properties if '=' not in x]
4410 if bad_params:
4411 parser.error('Got properties with missing "=": %s' % bad_params)
4412
maruel@chromium.org15192402012-09-06 12:38:29 +00004413 if args:
4414 parser.error('Unknown arguments: %s' % args)
4415
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004416 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00004417 if not cl.GetIssue():
4418 parser.error('Need to upload first')
4419
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004420 if cl.IsGerrit():
4421 parser.error(
4422 'Not yet supported for Gerrit (http://crbug.com/599931).\n'
4423 'If your project has Commit Queue, dry run is a workaround:\n'
4424 ' git cl set-commit --dry-run')
4425 # Code below assumes Rietveld issue.
4426 # TODO(tandrii): actually implement for Gerrit http://crbug.com/599931.
4427
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004428 props = cl.GetIssueProperties()
agable@chromium.org787e3062014-08-20 16:31:19 +00004429 if props.get('closed'):
4430 parser.error('Cannot send tryjobs for a closed CL')
4431
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004432 if props.get('private'):
4433 parser.error('Cannot use trybots with private issue')
4434
maruel@chromium.org15192402012-09-06 12:38:29 +00004435 if not options.name:
4436 options.name = cl.GetBranch()
4437
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004438 if options.bot and not options.master:
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00004439 options.master, err_msg = GetBuilderMaster(options.bot)
4440 if err_msg:
4441 parser.error('Tryserver master cannot be found because: %s\n'
4442 'Please manually specify the tryserver master'
4443 ', e.g. "-m tryserver.chromium.linux".' % err_msg)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004444
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004445 def GetMasterMap():
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004446 # Process --bot.
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004447 if not options.bot:
4448 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
maruel@chromium.org15192402012-09-06 12:38:29 +00004449
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004450 # Get try masters from PRESUBMIT.py files.
4451 masters = presubmit_support.DoGetTryMasters(
4452 change,
4453 change.LocalPaths(),
4454 settings.GetRoot(),
4455 None,
4456 None,
4457 options.verbose,
4458 sys.stdout)
4459 if masters:
4460 return masters
stip@chromium.org43064fd2013-12-18 20:07:44 +00004461
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004462 # Fall back to deprecated method: get try slaves from PRESUBMIT.py files.
4463 options.bot = presubmit_support.DoGetTrySlaves(
4464 change,
4465 change.LocalPaths(),
4466 settings.GetRoot(),
4467 None,
4468 None,
4469 options.verbose,
4470 sys.stdout)
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004471
4472 if not options.bot:
4473 # Get try masters from cq.cfg if any.
4474 # TODO(tandrii): some (but very few) projects store cq.cfg in different
4475 # location.
4476 cq_cfg = os.path.join(change.RepositoryRoot(),
4477 'infra', 'config', 'cq.cfg')
4478 if os.path.exists(cq_cfg):
4479 masters = {}
machenbach@chromium.org59994802016-01-14 10:10:33 +00004480 cq_masters = commit_queue.get_master_builder_map(
4481 cq_cfg, include_experimental=False, include_triggered=False)
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004482 for master, builders in cq_masters.iteritems():
4483 for builder in builders:
4484 # Skip presubmit builders, because these will fail without LGTM.
machenbach@chromium.org2403e802016-04-29 12:34:42 +00004485 masters.setdefault(master, {})[builder] = ['defaulttests']
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004486 if masters:
tandriib93dd2b2016-06-07 08:03:08 -07004487 print('Loaded default bots from CQ config (%s)' % cq_cfg)
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004488 return masters
tandriib93dd2b2016-06-07 08:03:08 -07004489 else:
4490 print('CQ config exists (%s) but has no try bots listed' % cq_cfg)
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004491
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004492 if not options.bot:
4493 parser.error('No default try builder to try, use --bot')
maruel@chromium.org15192402012-09-06 12:38:29 +00004494
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004495 builders_and_tests = {}
4496 # TODO(machenbach): The old style command-line options don't support
4497 # multiple try masters yet.
4498 old_style = filter(lambda x: isinstance(x, basestring), options.bot)
4499 new_style = filter(lambda x: isinstance(x, tuple), options.bot)
4500
4501 for bot in old_style:
4502 if ':' in bot:
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004503 parser.error('Specifying testfilter is no longer supported')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004504 elif ',' in bot:
4505 parser.error('Specify one bot per --bot flag')
4506 else:
tandrii@chromium.org3764fa22015-10-21 16:40:40 +00004507 builders_and_tests.setdefault(bot, [])
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004508
4509 for bot, tests in new_style:
4510 builders_and_tests.setdefault(bot, []).extend(tests)
4511
4512 # Return a master map with one master to be backwards compatible. The
4513 # master name defaults to an empty string, which will cause the master
4514 # not to be set on rietveld (deprecated).
4515 return {options.master: builders_and_tests}
4516
4517 masters = GetMasterMap()
stip@chromium.org43064fd2013-12-18 20:07:44 +00004518
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004519 for builders in masters.itervalues():
4520 if any('triggered' in b for b in builders):
4521 print >> sys.stderr, (
4522 'ERROR You are trying to send a job to a triggered bot. This type of'
4523 ' bot requires an\ninitial job from a parent (usually a builder). '
4524 'Instead send your job to the parent.\n'
4525 'Bot list: %s' % builders)
4526 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004527
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004528 patchset = cl.GetMostRecentPatchset()
4529 if patchset and patchset != cl.GetPatchset():
4530 print(
4531 '\nWARNING Mismatch between local config and server. Did a previous '
4532 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
4533 'Continuing using\npatchset %s.\n' % patchset)
hinoka@chromium.orgfeb9e2a2015-09-25 19:11:09 +00004534 if options.luci:
4535 trigger_luci_job(cl, masters, options)
4536 elif not options.use_rietveld:
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004537 try:
4538 trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
4539 except BuildbucketResponseException as ex:
4540 print 'ERROR: %s' % ex
fischman@chromium.orgd246c972013-12-21 22:47:38 +00004541 return 1
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004542 except Exception as e:
4543 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
4544 print 'ERROR: Exception when trying to trigger tryjobs: %s\n%s' % (
4545 e, stacktrace)
4546 return 1
4547 else:
4548 try:
4549 cl.RpcServer().trigger_distributed_try_jobs(
4550 cl.GetIssue(), patchset, options.name, options.clobber,
4551 options.revision, masters)
4552 except urllib2.HTTPError as e:
4553 if e.code == 404:
4554 print('404 from rietveld; '
4555 'did you mean to use "git try" instead of "git cl try"?')
4556 return 1
4557 print('Tried jobs on:')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004558
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004559 for (master, builders) in sorted(masters.iteritems()):
4560 if master:
4561 print 'Master: %s' % master
4562 length = max(len(builder) for builder in builders)
4563 for builder in sorted(builders):
4564 print ' %*s: %s' % (length, builder, ','.join(builders[builder]))
maruel@chromium.org15192402012-09-06 12:38:29 +00004565 return 0
4566
4567
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004568def CMDtry_results(parser, args):
4569 group = optparse.OptionGroup(parser, "Try job results options")
4570 group.add_option(
4571 "-p", "--patchset", type=int, help="patchset number if not current.")
4572 group.add_option(
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004573 "--print-master", action='store_true', help="print master name as well.")
4574 group.add_option(
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004575 "--color", action='store_true', default=setup_color.IS_TTY,
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004576 help="force color output, useful when piping output.")
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004577 group.add_option(
4578 "--buildbucket-host", default='cr-buildbucket.appspot.com',
4579 help="Host of buildbucket. The default host is %default.")
4580 parser.add_option_group(group)
4581 auth.add_auth_options(parser)
4582 options, args = parser.parse_args(args)
4583 if args:
4584 parser.error('Unrecognized args: %s' % ' '.join(args))
4585
4586 auth_config = auth.extract_auth_config_from_options(options)
4587 cl = Changelist(auth_config=auth_config)
4588 if not cl.GetIssue():
4589 parser.error('Need to upload first')
4590
4591 if not options.patchset:
4592 options.patchset = cl.GetMostRecentPatchset()
4593 if options.patchset and options.patchset != cl.GetPatchset():
4594 print(
4595 '\nWARNING Mismatch between local config and server. Did a previous '
4596 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
4597 'Continuing using\npatchset %s.\n' % options.patchset)
4598 try:
4599 jobs = fetch_try_jobs(auth_config, cl, options)
4600 except BuildbucketResponseException as ex:
4601 print 'Buildbucket error: %s' % ex
4602 return 1
4603 except Exception as e:
4604 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
4605 print 'ERROR: Exception when trying to fetch tryjobs: %s\n%s' % (
4606 e, stacktrace)
4607 return 1
4608 print_tryjobs(options, jobs)
4609 return 0
4610
4611
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004612@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004613def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004614 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004615 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004616 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004617 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004618
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004619 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004620 if args:
4621 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004622 branch = cl.GetBranch()
4623 RunGit(['branch', '--set-upstream', branch, args[0]])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004624 cl = Changelist()
4625 print "Upstream branch set to " + cl.GetUpstreamBranch()
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004626
4627 # Clear configured merge-base, if there is one.
4628 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004629 else:
4630 print cl.GetUpstreamBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004631 return 0
4632
4633
thestig@chromium.org00858c82013-12-02 23:08:03 +00004634def CMDweb(parser, args):
4635 """Opens the current CL in the web browser."""
4636 _, args = parser.parse_args(args)
4637 if args:
4638 parser.error('Unrecognized args: %s' % ' '.join(args))
4639
4640 issue_url = Changelist().GetIssueURL()
4641 if not issue_url:
4642 print >> sys.stderr, 'ERROR No issue to open'
4643 return 1
4644
4645 webbrowser.open(issue_url)
4646 return 0
4647
4648
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004649def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004650 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004651 parser.add_option('-d', '--dry-run', action='store_true',
4652 help='trigger in dry run mode')
4653 parser.add_option('-c', '--clear', action='store_true',
4654 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004655 auth.add_auth_options(parser)
4656 options, args = parser.parse_args(args)
4657 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004658 if args:
4659 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004660 if options.dry_run and options.clear:
4661 parser.error('Make up your mind: both --dry-run and --clear not allowed')
4662
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004663 cl = Changelist(auth_config=auth_config)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004664 if options.clear:
4665 state = _CQState.CLEAR
4666 elif options.dry_run:
4667 state = _CQState.DRY_RUN
4668 else:
4669 state = _CQState.COMMIT
4670 if not cl.GetIssue():
4671 parser.error('Must upload the issue first')
4672 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004673 return 0
4674
4675
groby@chromium.org411034a2013-02-26 15:12:01 +00004676def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004677 """Closes the issue."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004678 auth.add_auth_options(parser)
4679 options, args = parser.parse_args(args)
4680 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004681 if args:
4682 parser.error('Unrecognized args: %s' % ' '.join(args))
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004683 cl = Changelist(auth_config=auth_config)
groby@chromium.org411034a2013-02-26 15:12:01 +00004684 # Ensure there actually is an issue to close.
4685 cl.GetDescription()
4686 cl.CloseIssue()
4687 return 0
4688
4689
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004690def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004691 """Shows differences between local tree and last upload."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004692 auth.add_auth_options(parser)
4693 options, args = parser.parse_args(args)
4694 auth_config = auth.extract_auth_config_from_options(options)
4695 if args:
4696 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004697
4698 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004699 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004700 # Staged changes would be committed along with the patch from last
4701 # upload, hence counted toward the "last upload" side in the final
4702 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00004703 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004704 return 1
4705
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004706 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004707 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004708 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004709 if not issue:
4710 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004711 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004712 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004713
4714 # Create a new branch based on the merge-base
4715 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00004716 # Clear cached branch in cl object, to avoid overwriting original CL branch
4717 # properties.
4718 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004719 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004720 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004721 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00004722 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004723 return rtn
4724
wychen@chromium.org06928532015-02-03 02:11:29 +00004725 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004726 # branch containing the latest rietveld patch.
wychen@chromium.org06928532015-02-03 02:11:29 +00004727 subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch, '--'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004728 finally:
4729 RunGit(['checkout', '-q', branch])
4730 RunGit(['branch', '-D', TMP_BRANCH])
4731
4732 return 0
4733
4734
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004735def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004736 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004737 parser.add_option(
4738 '--no-color',
4739 action='store_true',
4740 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004741 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004742 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004743 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004744
4745 author = RunGit(['config', 'user.email']).strip() or None
4746
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004747 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004748
4749 if args:
4750 if len(args) > 1:
4751 parser.error('Unknown args')
4752 base_branch = args[0]
4753 else:
4754 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004755 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004756
4757 change = cl.GetChange(base_branch, None)
4758 return owners_finder.OwnersFinder(
4759 [f.LocalPath() for f in
4760 cl.GetChange(base_branch, None).AffectedFiles()],
4761 change.RepositoryRoot(), author,
4762 fopen=file, os_path=os.path, glob=glob.glob,
4763 disable_color=options.no_color).run()
4764
4765
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004766def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004767 """Generates a diff command."""
4768 # Generate diff for the current branch's changes.
4769 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
4770 upstream_commit, '--' ]
4771
4772 if args:
4773 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004774 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004775 diff_cmd.append(arg)
4776 else:
4777 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004778
4779 return diff_cmd
4780
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004781def MatchingFileType(file_name, extensions):
4782 """Returns true if the file name ends with one of the given extensions."""
4783 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004784
enne@chromium.org555cfe42014-01-29 18:21:39 +00004785@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004786def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004787 """Runs auto-formatting tools (clang-format etc.) on the diff."""
thakis@chromium.org9819b1b2014-12-09 21:21:53 +00004788 CLANG_EXTS = ['.cc', '.cpp', '.h', '.mm', '.proto', '.java']
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004789 GN_EXTS = ['.gn', '.gni']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004790 parser.add_option('--full', action='store_true',
4791 help='Reformat the full content of all touched files')
4792 parser.add_option('--dry-run', action='store_true',
4793 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004794 parser.add_option('--python', action='store_true',
4795 help='Format python code with yapf (experimental).')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004796 parser.add_option('--diff', action='store_true',
4797 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004798 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004799
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004800 # git diff generates paths against the root of the repository. Change
4801 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004802 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004803 if rel_base_path:
4804 os.chdir(rel_base_path)
4805
digit@chromium.org29e47272013-05-17 17:01:46 +00004806 # Grab the merge-base commit, i.e. the upstream commit of the current
4807 # branch when it was created or the last time it was rebased. This is
4808 # to cover the case where the user may have called "git fetch origin",
4809 # moving the origin branch to a newer commit, but hasn't rebased yet.
4810 upstream_commit = None
4811 cl = Changelist()
4812 upstream_branch = cl.GetUpstreamBranch()
4813 if upstream_branch:
4814 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4815 upstream_commit = upstream_commit.strip()
4816
4817 if not upstream_commit:
4818 DieWithError('Could not find base commit for this branch. '
4819 'Are you in detached state?')
4820
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004821 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4822 diff_output = RunGit(changed_files_cmd)
4823 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004824 # Filter out files deleted by this CL
4825 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004826
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004827 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
4828 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
4829 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004830 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004831
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004832 top_dir = os.path.normpath(
4833 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
4834
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004835 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4836 # formatted. This is used to block during the presubmit.
4837 return_value = 0
4838
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004839 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00004840 # Locate the clang-format binary in the checkout
4841 try:
4842 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
4843 except clang_format.NotFoundError, e:
4844 DieWithError(e)
4845
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004846 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004847 cmd = [clang_format_tool]
4848 if not opts.dry_run and not opts.diff:
4849 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004850 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004851 if opts.diff:
4852 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004853 else:
4854 env = os.environ.copy()
4855 env['PATH'] = str(os.path.dirname(clang_format_tool))
4856 try:
4857 script = clang_format.FindClangFormatScriptInChromiumTree(
4858 'clang-format-diff.py')
4859 except clang_format.NotFoundError, e:
4860 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00004861
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004862 cmd = [sys.executable, script, '-p0']
4863 if not opts.dry_run and not opts.diff:
4864 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00004865
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004866 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
4867 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004868
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004869 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
4870 if opts.diff:
4871 sys.stdout.write(stdout)
4872 if opts.dry_run and len(stdout) > 0:
4873 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004874
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004875 # Similar code to above, but using yapf on .py files rather than clang-format
4876 # on C/C++ files
4877 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004878 yapf_tool = gclient_utils.FindExecutable('yapf')
4879 if yapf_tool is None:
4880 DieWithError('yapf not found in PATH')
4881
4882 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004883 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004884 cmd = [yapf_tool]
4885 if not opts.dry_run and not opts.diff:
4886 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004887 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004888 if opts.diff:
4889 sys.stdout.write(stdout)
4890 else:
4891 # TODO(sbc): yapf --lines mode still has some issues.
4892 # https://github.com/google/yapf/issues/154
4893 DieWithError('--python currently only works with --full')
4894
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004895 # Dart's formatter does not have the nice property of only operating on
4896 # modified chunks, so hard code full.
4897 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004898 try:
4899 command = [dart_format.FindDartFmtToolInChromiumTree()]
4900 if not opts.dry_run and not opts.diff:
4901 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004902 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004903
ppi@chromium.org6593d932016-03-03 15:41:15 +00004904 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004905 if opts.dry_run and stdout:
4906 return_value = 2
4907 except dart_format.NotFoundError as e:
erikcorry@chromium.org3e445022015-12-17 09:07:26 +00004908 print ('Warning: Unable to check Dart code formatting. Dart SDK not ' +
4909 'found in this checkout. Files in other languages are still ' +
4910 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004911
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004912 # Format GN build files. Always run on full build files for canonical form.
4913 if gn_diff_files:
4914 cmd = ['gn', 'format']
4915 if not opts.dry_run and not opts.diff:
4916 cmd.append('--in-place')
4917 for gn_diff_file in gn_diff_files:
bsep@chromium.org627d9002016-04-29 00:00:52 +00004918 stdout = RunCommand(cmd + [gn_diff_file],
4919 shell=sys.platform == 'win32',
4920 cwd=top_dir)
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004921 if opts.diff:
4922 sys.stdout.write(stdout)
4923
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004924 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004925
4926
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004927@subcommand.usage('<codereview url or issue id>')
4928def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00004929 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004930 _, args = parser.parse_args(args)
4931
4932 if len(args) != 1:
4933 parser.print_help()
4934 return 1
4935
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004936 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00004937 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004938 parser.print_help()
4939 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00004940 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004941
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00004942 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00004943 output = RunGit(['config', '--local', '--get-regexp',
4944 r'branch\..*\.%s' % issueprefix],
4945 error_ok=True)
4946 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00004947 if issue == target_issue:
4948 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004949
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00004950 branches = []
4951 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00004952 branches.extend(find_issues(cls.IssueSettingSuffix()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004953 if len(branches) == 0:
4954 print 'No branch found for issue %s.' % target_issue
4955 return 1
4956 if len(branches) == 1:
4957 RunGit(['checkout', branches[0]])
4958 else:
4959 print 'Multiple branches match issue %s:' % target_issue
4960 for i in range(len(branches)):
4961 print '%d: %s' % (i, branches[i])
4962 which = raw_input('Choose by index: ')
4963 try:
4964 RunGit(['checkout', branches[int(which)]])
4965 except (IndexError, ValueError):
4966 print 'Invalid selection, not checking out any branch.'
4967 return 1
4968
4969 return 0
4970
4971
maruel@chromium.org29404b52014-09-08 22:58:00 +00004972def CMDlol(parser, args):
4973 # This command is intentionally undocumented.
thakis@chromium.org3421c992014-11-02 02:20:32 +00004974 print zlib.decompress(base64.b64decode(
4975 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
4976 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
4977 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
4978 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00004979 return 0
4980
4981
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004982class OptionParser(optparse.OptionParser):
4983 """Creates the option parse and add --verbose support."""
4984 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004985 optparse.OptionParser.__init__(
4986 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004987 self.add_option(
4988 '-v', '--verbose', action='count', default=0,
4989 help='Use 2 times for more debugging info')
4990
4991 def parse_args(self, args=None, values=None):
4992 options, args = optparse.OptionParser.parse_args(self, args, values)
4993 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
4994 logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
4995 return options, args
4996
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004997
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004998def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00004999 if sys.hexversion < 0x02060000:
5000 print >> sys.stderr, (
5001 '\nYour python version %s is unsupported, please upgrade.\n' %
5002 sys.version.split(' ', 1)[0])
5003 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005004
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005005 # Reload settings.
5006 global settings
5007 settings = Settings()
5008
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005009 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005010 dispatcher = subcommand.CommandDispatcher(__name__)
5011 try:
5012 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005013 except auth.AuthenticationError as e:
5014 DieWithError(str(e))
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005015 except urllib2.HTTPError, e:
5016 if e.code != 500:
5017 raise
5018 DieWithError(
5019 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5020 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005021 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005022
5023
5024if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005025 # These affect sys.stdout so do it outside of main() to simplify mocks in
5026 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005027 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005028 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005029 try:
5030 sys.exit(main(sys.argv[1:]))
5031 except KeyboardInterrupt:
5032 sys.stderr.write('interrupted\n')
5033 sys.exit(1)