blob: 7199f260d6a43e5e69862d610f9ea40549c28194 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
sheyang@google.com6ebaf782015-05-12 19:17:54 +000016import httplib
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000017import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000018import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000019import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import optparse
21import os
22import re
ukai@chromium.org78c4b982012-02-14 02:20:26 +000023import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000025import textwrap
sheyang@google.com6ebaf782015-05-12 19:17:54 +000026import time
27import traceback
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000028import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000029import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000030import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000031import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000032import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000033import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000034
35try:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000036 import readline # pylint: disable=F0401,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000037except ImportError:
38 pass
39
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000040from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000041from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000042from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000043import auth
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000044import clang_format
tandrii@chromium.org71184c02016-01-13 15:18:44 +000045import commit_queue
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000046import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000047import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000048import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000049import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000050import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000051import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000052import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000053import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000054import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000057import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000059import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000060import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import watchlists
62
tandrii7400cf02016-06-21 08:48:07 -070063__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064
tandrii9d2c7a32016-06-22 03:42:45 -070065COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +000066DEFAULT_SERVER = 'https://codereview.appspot.com'
maruel@chromium.org0ba7f962011-01-11 22:13:58 +000067POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000068DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +000069GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
rmistry@google.comc68112d2015-03-03 12:48:06 +000070REFS_THAT_ALIAS_TO_OTHER_REFS = {
71 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
72 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
73}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074
thestig@chromium.org44202a22014-03-11 19:22:18 +000075# Valid extensions for files we want to lint.
76DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
77DEFAULT_LINT_IGNORE_REGEX = r"$^"
78
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000079# Shortcut since it quickly becomes redundant.
80Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000081
maruel@chromium.orgddd59412011-11-30 14:20:38 +000082# Initialized in main()
83settings = None
84
85
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000086def DieWithError(message):
vapiera7fbd5a2016-06-16 09:17:49 -070087 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000088 sys.exit(1)
89
90
thestig@chromium.org8b0553c2014-02-11 00:33:37 +000091def GetNoGitPagerEnv():
92 env = os.environ.copy()
93 # 'cat' is a magical git string that disables pagers on all platforms.
94 env['GIT_PAGER'] = 'cat'
95 return env
96
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +000097
bsep@chromium.org627d9002016-04-29 00:00:52 +000098def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000099 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000100 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000101 except subprocess2.CalledProcessError as e:
102 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000103 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000104 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000105 'Command "%s" failed.\n%s' % (
106 ' '.join(args), error_message or e.stdout or ''))
107 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000108
109
110def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000111 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000112 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000113
114
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000115def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000116 """Returns return code and stdout."""
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000117 try:
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000118 if suppress_stderr:
119 stderr = subprocess2.VOID
120 else:
121 stderr = sys.stderr
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000122 out, code = subprocess2.communicate(['git'] + args,
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000123 env=GetNoGitPagerEnv(),
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000124 stdout=subprocess2.PIPE,
125 stderr=stderr)
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000126 return code, out[0]
127 except ValueError:
128 # When the subprocess fails, it returns None. That triggers a ValueError
129 # when trying to unpack the return value into (out, code).
130 return 1, ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000131
132
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000133def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000134 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000135 return RunGitWithCode(args, suppress_stderr=True)[1]
136
137
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000138def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000139 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000140 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000141 return (version.startswith(prefix) and
142 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000143
144
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000145def BranchExists(branch):
146 """Return True if specified branch exists."""
147 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
148 suppress_stderr=True)
149 return not code
150
151
maruel@chromium.org90541732011-04-01 17:54:18 +0000152def ask_for_data(prompt):
153 try:
154 return raw_input(prompt)
155 except KeyboardInterrupt:
156 # Hide the exception.
157 sys.exit(1)
158
159
iannucci@chromium.org79540052012-10-19 23:15:26 +0000160def git_set_branch_value(key, value):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000161 branch = GetCurrentBranch()
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000162 if not branch:
163 return
164
165 cmd = ['config']
166 if isinstance(value, int):
167 cmd.append('--int')
168 git_key = 'branch.%s.%s' % (branch, key)
169 RunGit(cmd + [git_key, str(value)])
iannucci@chromium.org79540052012-10-19 23:15:26 +0000170
171
172def git_get_branch_default(key, default):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000173 branch = GetCurrentBranch()
iannucci@chromium.org79540052012-10-19 23:15:26 +0000174 if branch:
175 git_key = 'branch.%s.%s' % (branch, key)
176 (_, stdout) = RunGitWithCode(['config', '--int', '--get', git_key])
177 try:
178 return int(stdout.strip())
179 except ValueError:
180 pass
181 return default
182
183
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000184def add_git_similarity(parser):
185 parser.add_option(
iannucci@chromium.org79540052012-10-19 23:15:26 +0000186 '--similarity', metavar='SIM', type='int', action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000187 help='Sets the percentage that a pair of files need to match in order to'
188 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000189 parser.add_option(
190 '--find-copies', action='store_true',
191 help='Allows git to look for copies.')
192 parser.add_option(
193 '--no-find-copies', action='store_false', dest='find_copies',
194 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000195
196 old_parser_args = parser.parse_args
197 def Parse(args):
198 options, args = old_parser_args(args)
199
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000200 if options.similarity is None:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000201 options.similarity = git_get_branch_default('git-cl-similarity', 50)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000202 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000203 print('Note: Saving similarity of %d%% in git config.'
204 % options.similarity)
205 git_set_branch_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000206
iannucci@chromium.org79540052012-10-19 23:15:26 +0000207 options.similarity = max(0, min(options.similarity, 100))
208
209 if options.find_copies is None:
210 options.find_copies = bool(
211 git_get_branch_default('git-find-copies', True))
212 else:
213 git_set_branch_value('git-find-copies', int(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000214
215 print('Using %d%% similarity for rename/copy detection. '
216 'Override with --similarity.' % options.similarity)
217
218 return options, args
219 parser.parse_args = Parse
220
221
machenbach@chromium.org45453142015-09-15 08:45:22 +0000222def _get_properties_from_options(options):
223 properties = dict(x.split('=', 1) for x in options.properties)
224 for key, val in properties.iteritems():
225 try:
226 properties[key] = json.loads(val)
227 except ValueError:
228 pass # If a value couldn't be evaluated, treat it as a string.
229 return properties
230
231
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000232def _prefix_master(master):
233 """Convert user-specified master name to full master name.
234
235 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
236 name, while the developers always use shortened master name
237 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
238 function does the conversion for buildbucket migration.
239 """
240 prefix = 'master.'
241 if master.startswith(prefix):
242 return master
243 return '%s%s' % (prefix, master)
244
245
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000246def _buildbucket_retry(operation_name, http, *args, **kwargs):
247 """Retries requests to buildbucket service and returns parsed json content."""
248 try_count = 0
249 while True:
250 response, content = http.request(*args, **kwargs)
251 try:
252 content_json = json.loads(content)
253 except ValueError:
254 content_json = None
255
256 # Buildbucket could return an error even if status==200.
257 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000258 error = content_json.get('error')
259 if error.get('code') == 403:
260 raise BuildbucketResponseException(
261 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000262 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000263 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000264 raise BuildbucketResponseException(msg)
265
266 if response.status == 200:
267 if not content_json:
268 raise BuildbucketResponseException(
269 'Buildbucket returns invalid json content: %s.\n'
270 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
271 content)
272 return content_json
273 if response.status < 500 or try_count >= 2:
274 raise httplib2.HttpLib2Error(content)
275
276 # status >= 500 means transient failures.
277 logging.debug('Transient errors when %s. Will retry.', operation_name)
278 time.sleep(0.5 + 1.5*try_count)
279 try_count += 1
280 assert False, 'unreachable'
281
282
machenbach@chromium.org45453142015-09-15 08:45:22 +0000283def trigger_try_jobs(auth_config, changelist, options, masters, category):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000284 rietveld_url = settings.GetDefaultServerUrl()
285 rietveld_host = urlparse.urlparse(rietveld_url).hostname
286 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
287 http = authenticator.authorize(httplib2.Http())
288 http.force_exception_to_status_code = True
289 issue_props = changelist.GetIssueProperties()
290 issue = changelist.GetIssue()
291 patchset = changelist.GetMostRecentPatchset()
machenbach@chromium.org45453142015-09-15 08:45:22 +0000292 properties = _get_properties_from_options(options)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000293
294 buildbucket_put_url = (
295 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000296 hostname=options.buildbucket_host))
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000297 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
298 hostname=rietveld_host,
299 issue=issue,
300 patch=patchset)
301
302 batch_req_body = {'builds': []}
303 print_text = []
304 print_text.append('Tried jobs on:')
305 for master, builders_and_tests in sorted(masters.iteritems()):
306 print_text.append('Master: %s' % master)
307 bucket = _prefix_master(master)
308 for builder, tests in sorted(builders_and_tests.iteritems()):
309 print_text.append(' %s: %s' % (builder, tests))
310 parameters = {
311 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000312 'changes': [{
313 'author': {'email': issue_props['owner_email']},
314 'revision': options.revision,
315 }],
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000316 'properties': {
317 'category': category,
318 'issue': issue,
319 'master': master,
320 'patch_project': issue_props['project'],
321 'patch_storage': 'rietveld',
322 'patchset': patchset,
323 'reason': options.name,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000324 'rietveld': rietveld_url,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000325 },
326 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000327 if 'presubmit' in builder.lower():
328 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000329 if tests:
330 parameters['properties']['testfilter'] = tests
machenbach@chromium.org45453142015-09-15 08:45:22 +0000331 if properties:
332 parameters['properties'].update(properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000333 if options.clobber:
334 parameters['properties']['clobber'] = True
335 batch_req_body['builds'].append(
336 {
337 'bucket': bucket,
338 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000339 'client_operation_id': str(uuid.uuid4()),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000340 'tags': ['builder:%s' % builder,
341 'buildset:%s' % buildset,
342 'master:%s' % master,
343 'user_agent:git_cl_try']
344 }
345 )
346
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000347 _buildbucket_retry(
348 'triggering tryjobs',
349 http,
350 buildbucket_put_url,
351 'PUT',
352 body=json.dumps(batch_req_body),
353 headers={'Content-Type': 'application/json'}
354 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000355 print_text.append('To see results here, run: git cl try-results')
356 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700357 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000358
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000359
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000360def fetch_try_jobs(auth_config, changelist, options):
361 """Fetches tryjobs from buildbucket.
362
363 Returns a map from build id to build info as json dictionary.
364 """
365 rietveld_url = settings.GetDefaultServerUrl()
366 rietveld_host = urlparse.urlparse(rietveld_url).hostname
367 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
368 if authenticator.has_cached_credentials():
369 http = authenticator.authorize(httplib2.Http())
370 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700371 print('Warning: Some results might be missing because %s' %
372 # Get the message on how to login.
373 (auth.LoginRequiredError(rietveld_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000374 http = httplib2.Http()
375
376 http.force_exception_to_status_code = True
377
378 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
379 hostname=rietveld_host,
380 issue=changelist.GetIssue(),
381 patch=options.patchset)
382 params = {'tag': 'buildset:%s' % buildset}
383
384 builds = {}
385 while True:
386 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
387 hostname=options.buildbucket_host,
388 params=urllib.urlencode(params))
389 content = _buildbucket_retry('fetching tryjobs', http, url, 'GET')
390 for build in content.get('builds', []):
391 builds[build['id']] = build
392 if 'next_cursor' in content:
393 params['start_cursor'] = content['next_cursor']
394 else:
395 break
396 return builds
397
398
399def print_tryjobs(options, builds):
400 """Prints nicely result of fetch_try_jobs."""
401 if not builds:
vapiera7fbd5a2016-06-16 09:17:49 -0700402 print('No tryjobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000403 return
404
405 # Make a copy, because we'll be modifying builds dictionary.
406 builds = builds.copy()
407 builder_names_cache = {}
408
409 def get_builder(b):
410 try:
411 return builder_names_cache[b['id']]
412 except KeyError:
413 try:
414 parameters = json.loads(b['parameters_json'])
415 name = parameters['builder_name']
416 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700417 print('WARNING: failed to get builder name for build %s: %s' % (
418 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000419 name = None
420 builder_names_cache[b['id']] = name
421 return name
422
423 def get_bucket(b):
424 bucket = b['bucket']
425 if bucket.startswith('master.'):
426 return bucket[len('master.'):]
427 return bucket
428
429 if options.print_master:
430 name_fmt = '%%-%ds %%-%ds' % (
431 max(len(str(get_bucket(b))) for b in builds.itervalues()),
432 max(len(str(get_builder(b))) for b in builds.itervalues()))
433 def get_name(b):
434 return name_fmt % (get_bucket(b), get_builder(b))
435 else:
436 name_fmt = '%%-%ds' % (
437 max(len(str(get_builder(b))) for b in builds.itervalues()))
438 def get_name(b):
439 return name_fmt % get_builder(b)
440
441 def sort_key(b):
442 return b['status'], b.get('result'), get_name(b), b.get('url')
443
444 def pop(title, f, color=None, **kwargs):
445 """Pop matching builds from `builds` dict and print them."""
446
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000447 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000448 colorize = str
449 else:
450 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
451
452 result = []
453 for b in builds.values():
454 if all(b.get(k) == v for k, v in kwargs.iteritems()):
455 builds.pop(b['id'])
456 result.append(b)
457 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700458 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000459 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700460 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000461
462 total = len(builds)
463 pop(status='COMPLETED', result='SUCCESS',
464 title='Successes:', color=Fore.GREEN,
465 f=lambda b: (get_name(b), b.get('url')))
466 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
467 title='Infra Failures:', color=Fore.MAGENTA,
468 f=lambda b: (get_name(b), b.get('url')))
469 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
470 title='Failures:', color=Fore.RED,
471 f=lambda b: (get_name(b), b.get('url')))
472 pop(status='COMPLETED', result='CANCELED',
473 title='Canceled:', color=Fore.MAGENTA,
474 f=lambda b: (get_name(b),))
475 pop(status='COMPLETED', result='FAILURE',
476 failure_reason='INVALID_BUILD_DEFINITION',
477 title='Wrong master/builder name:', color=Fore.MAGENTA,
478 f=lambda b: (get_name(b),))
479 pop(status='COMPLETED', result='FAILURE',
480 title='Other failures:',
481 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
482 pop(status='COMPLETED',
483 title='Other finished:',
484 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
485 pop(status='STARTED',
486 title='Started:', color=Fore.YELLOW,
487 f=lambda b: (get_name(b), b.get('url')))
488 pop(status='SCHEDULED',
489 title='Scheduled:',
490 f=lambda b: (get_name(b), 'id=%s' % b['id']))
491 # The last section is just in case buildbucket API changes OR there is a bug.
492 pop(title='Other:',
493 f=lambda b: (get_name(b), 'id=%s' % b['id']))
494 assert len(builds) == 0
vapiera7fbd5a2016-06-16 09:17:49 -0700495 print('Total: %d tryjobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000496
497
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000498def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
499 """Return the corresponding git ref if |base_url| together with |glob_spec|
500 matches the full |url|.
501
502 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
503 """
504 fetch_suburl, as_ref = glob_spec.split(':')
505 if allow_wildcards:
506 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
507 if glob_match:
508 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
509 # "branches/{472,597,648}/src:refs/remotes/svn/*".
510 branch_re = re.escape(base_url)
511 if glob_match.group(1):
512 branch_re += '/' + re.escape(glob_match.group(1))
513 wildcard = glob_match.group(2)
514 if wildcard == '*':
515 branch_re += '([^/]*)'
516 else:
517 # Escape and replace surrounding braces with parentheses and commas
518 # with pipe symbols.
519 wildcard = re.escape(wildcard)
520 wildcard = re.sub('^\\\\{', '(', wildcard)
521 wildcard = re.sub('\\\\,', '|', wildcard)
522 wildcard = re.sub('\\\\}$', ')', wildcard)
523 branch_re += wildcard
524 if glob_match.group(3):
525 branch_re += re.escape(glob_match.group(3))
526 match = re.match(branch_re, url)
527 if match:
528 return re.sub('\*$', match.group(1), as_ref)
529
530 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
531 if fetch_suburl:
532 full_url = base_url + '/' + fetch_suburl
533 else:
534 full_url = base_url
535 if full_url == url:
536 return as_ref
537 return None
538
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000539
iannucci@chromium.org79540052012-10-19 23:15:26 +0000540def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000541 """Prints statistics about the change to the user."""
542 # --no-ext-diff is broken in some versions of Git, so try to work around
543 # this by overriding the environment (but there is still a problem if the
544 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000545 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000546 if 'GIT_EXTERNAL_DIFF' in env:
547 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000548
549 if find_copies:
550 similarity_options = ['--find-copies-harder', '-l100000',
551 '-C%s' % similarity]
552 else:
553 similarity_options = ['-M%s' % similarity]
554
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000555 try:
556 stdout = sys.stdout.fileno()
557 except AttributeError:
558 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000559 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000560 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000561 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000562 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000563
564
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000565class BuildbucketResponseException(Exception):
566 pass
567
568
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000569class Settings(object):
570 def __init__(self):
571 self.default_server = None
572 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000573 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000574 self.is_git_svn = None
575 self.svn_branch = None
576 self.tree_status_url = None
577 self.viewvc_url = None
578 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000579 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000580 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000581 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000582 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000583 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000584 self.force_https_commit_url = None
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000585 self.pending_ref_prefix = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000586
587 def LazyUpdateIfNeeded(self):
588 """Updates the settings from a codereview.settings file, if available."""
589 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000590 # The only value that actually changes the behavior is
591 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000592 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000593 error_ok=True
594 ).strip().lower()
595
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000596 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000597 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000598 LoadCodereviewSettingsFromFile(cr_settings_file)
599 self.updated = True
600
601 def GetDefaultServerUrl(self, error_ok=False):
602 if not self.default_server:
603 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000604 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000605 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000606 if error_ok:
607 return self.default_server
608 if not self.default_server:
609 error_message = ('Could not find settings file. You must configure '
610 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000611 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000612 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000613 return self.default_server
614
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000615 @staticmethod
616 def GetRelativeRoot():
617 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000618
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000619 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000620 if self.root is None:
621 self.root = os.path.abspath(self.GetRelativeRoot())
622 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000623
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000624 def GetGitMirror(self, remote='origin'):
625 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000626 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000627 if not os.path.isdir(local_url):
628 return None
629 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
630 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
631 # Use the /dev/null print_func to avoid terminal spew in WaitForRealCommit.
632 mirror = git_cache.Mirror(remote_url, print_func = lambda *args: None)
633 if mirror.exists():
634 return mirror
635 return None
636
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000637 def GetIsGitSvn(self):
638 """Return true if this repo looks like it's using git-svn."""
639 if self.is_git_svn is None:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000640 if self.GetPendingRefPrefix():
641 # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what.
642 self.is_git_svn = False
643 else:
644 # If you have any "svn-remote.*" config keys, we think you're using svn.
645 self.is_git_svn = RunGitWithCode(
646 ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000647 return self.is_git_svn
648
649 def GetSVNBranch(self):
650 if self.svn_branch is None:
651 if not self.GetIsGitSvn():
652 DieWithError('Repo doesn\'t appear to be a git-svn repo.')
653
654 # Try to figure out which remote branch we're based on.
655 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000656 # 1) iterate through our branch history and find the svn URL.
657 # 2) find the svn-remote that fetches from the URL.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000658
659 # regexp matching the git-svn line that contains the URL.
660 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
661
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000662 # We don't want to go through all of history, so read a line from the
663 # pipe at a time.
664 # The -100 is an arbitrary limit so we don't search forever.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000665 cmd = ['git', 'log', '-100', '--pretty=medium']
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000666 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE,
667 env=GetNoGitPagerEnv())
maruel@chromium.org740f9d72011-06-10 18:33:10 +0000668 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000669 for line in proc.stdout:
670 match = git_svn_re.match(line)
671 if match:
672 url = match.group(1)
673 proc.stdout.close() # Cut pipe.
674 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000675
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000676 if url:
677 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
678 remotes = RunGit(['config', '--get-regexp',
679 r'^svn-remote\..*\.url']).splitlines()
680 for remote in remotes:
681 match = svn_remote_re.match(remote)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000682 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000683 remote = match.group(1)
684 base_url = match.group(2)
szager@chromium.org4ac25532013-12-16 22:07:02 +0000685 rewrite_root = RunGit(
686 ['config', 'svn-remote.%s.rewriteRoot' % remote],
687 error_ok=True).strip()
688 if rewrite_root:
689 base_url = rewrite_root
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000690 fetch_spec = RunGit(
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000691 ['config', 'svn-remote.%s.fetch' % remote],
692 error_ok=True).strip()
693 if fetch_spec:
694 self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
695 if self.svn_branch:
696 break
697 branch_spec = RunGit(
698 ['config', 'svn-remote.%s.branches' % remote],
699 error_ok=True).strip()
700 if branch_spec:
701 self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
702 if self.svn_branch:
703 break
704 tag_spec = RunGit(
705 ['config', 'svn-remote.%s.tags' % remote],
706 error_ok=True).strip()
707 if tag_spec:
708 self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
709 if self.svn_branch:
710 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000711
712 if not self.svn_branch:
713 DieWithError('Can\'t guess svn branch -- try specifying it on the '
714 'command line')
715
716 return self.svn_branch
717
718 def GetTreeStatusUrl(self, error_ok=False):
719 if not self.tree_status_url:
720 error_message = ('You must configure your tree status URL by running '
721 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000722 self.tree_status_url = self._GetRietveldConfig(
723 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000724 return self.tree_status_url
725
726 def GetViewVCUrl(self):
727 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000728 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000729 return self.viewvc_url
730
rmistry@google.com90752582014-01-14 21:04:50 +0000731 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000732 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000733
rmistry@google.com78948ed2015-07-08 23:09:57 +0000734 def GetIsSkipDependencyUpload(self, branch_name):
735 """Returns true if specified branch should skip dep uploads."""
736 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
737 error_ok=True)
738
rmistry@google.com5626a922015-02-26 14:03:30 +0000739 def GetRunPostUploadHook(self):
740 run_post_upload_hook = self._GetRietveldConfig(
741 'run-post-upload-hook', error_ok=True)
742 return run_post_upload_hook == "True"
743
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000744 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000745 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000746
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000747 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000748 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000749
ukai@chromium.orge8077812012-02-03 03:41:46 +0000750 def GetIsGerrit(self):
751 """Return true if this repo is assosiated with gerrit code review system."""
752 if self.is_gerrit is None:
753 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
754 return self.is_gerrit
755
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000756 def GetSquashGerritUploads(self):
757 """Return true if uploads to Gerrit should be squashed by default."""
758 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700759 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
760 if self.squash_gerrit_uploads is None:
761 # Default is squash now (http://crbug.com/611892#c23).
762 self.squash_gerrit_uploads = not (
763 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
764 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000765 return self.squash_gerrit_uploads
766
tandriia60502f2016-06-20 02:01:53 -0700767 def GetSquashGerritUploadsOverride(self):
768 """Return True or False if codereview.settings should be overridden.
769
770 Returns None if no override has been defined.
771 """
772 # See also http://crbug.com/611892#c23
773 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
774 error_ok=True).strip()
775 if result == 'true':
776 return True
777 if result == 'false':
778 return False
779 return None
780
tandrii@chromium.org28253532016-04-14 13:46:56 +0000781 def GetGerritSkipEnsureAuthenticated(self):
782 """Return True if EnsureAuthenticated should not be done for Gerrit
783 uploads."""
784 if self.gerrit_skip_ensure_authenticated is None:
785 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000786 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000787 error_ok=True).strip() == 'true')
788 return self.gerrit_skip_ensure_authenticated
789
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000790 def GetGitEditor(self):
791 """Return the editor specified in the git config, or None if none is."""
792 if self.git_editor is None:
793 self.git_editor = self._GetConfig('core.editor', error_ok=True)
794 return self.git_editor or None
795
thestig@chromium.org44202a22014-03-11 19:22:18 +0000796 def GetLintRegex(self):
797 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
798 DEFAULT_LINT_REGEX)
799
800 def GetLintIgnoreRegex(self):
801 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
802 DEFAULT_LINT_IGNORE_REGEX)
803
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000804 def GetProject(self):
805 if not self.project:
806 self.project = self._GetRietveldConfig('project', error_ok=True)
807 return self.project
808
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000809 def GetForceHttpsCommitUrl(self):
810 if not self.force_https_commit_url:
811 self.force_https_commit_url = self._GetRietveldConfig(
812 'force-https-commit-url', error_ok=True)
813 return self.force_https_commit_url
814
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000815 def GetPendingRefPrefix(self):
816 if not self.pending_ref_prefix:
817 self.pending_ref_prefix = self._GetRietveldConfig(
818 'pending-ref-prefix', error_ok=True)
819 return self.pending_ref_prefix
820
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000821 def _GetRietveldConfig(self, param, **kwargs):
822 return self._GetConfig('rietveld.' + param, **kwargs)
823
rmistry@google.com78948ed2015-07-08 23:09:57 +0000824 def _GetBranchConfig(self, branch_name, param, **kwargs):
825 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
826
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000827 def _GetConfig(self, param, **kwargs):
828 self.LazyUpdateIfNeeded()
829 return RunGit(['config', param], **kwargs).strip()
830
831
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000832def ShortBranchName(branch):
833 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000834 return branch.replace('refs/heads/', '', 1)
835
836
837def GetCurrentBranchRef():
838 """Returns branch ref (e.g., refs/heads/master) or None."""
839 return RunGit(['symbolic-ref', 'HEAD'],
840 stderr=subprocess2.VOID, error_ok=True).strip() or None
841
842
843def GetCurrentBranch():
844 """Returns current branch or None.
845
846 For refs/heads/* branches, returns just last part. For others, full ref.
847 """
848 branchref = GetCurrentBranchRef()
849 if branchref:
850 return ShortBranchName(branchref)
851 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000852
853
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +0000854class _CQState(object):
855 """Enum for states of CL with respect to Commit Queue."""
856 NONE = 'none'
857 DRY_RUN = 'dry_run'
858 COMMIT = 'commit'
859
860 ALL_STATES = [NONE, DRY_RUN, COMMIT]
861
862
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000863class _ParsedIssueNumberArgument(object):
864 def __init__(self, issue=None, patchset=None, hostname=None):
865 self.issue = issue
866 self.patchset = patchset
867 self.hostname = hostname
868
869 @property
870 def valid(self):
871 return self.issue is not None
872
873
874class _RietveldParsedIssueNumberArgument(_ParsedIssueNumberArgument):
875 def __init__(self, *args, **kwargs):
876 self.patch_url = kwargs.pop('patch_url', None)
877 super(_RietveldParsedIssueNumberArgument, self).__init__(*args, **kwargs)
878
879
880def ParseIssueNumberArgument(arg):
881 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
882 fail_result = _ParsedIssueNumberArgument()
883
884 if arg.isdigit():
885 return _ParsedIssueNumberArgument(issue=int(arg))
886 if not arg.startswith('http'):
887 return fail_result
888 url = gclient_utils.UpgradeToHttps(arg)
889 try:
890 parsed_url = urlparse.urlparse(url)
891 except ValueError:
892 return fail_result
893 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
894 tmp = cls.ParseIssueURL(parsed_url)
895 if tmp is not None:
896 return tmp
897 return fail_result
898
899
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000900class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000901 """Changelist works with one changelist in local branch.
902
903 Supports two codereview backends: Rietveld or Gerrit, selected at object
904 creation.
905
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +0000906 Notes:
907 * Not safe for concurrent multi-{thread,process} use.
908 * Caches values from current branch. Therefore, re-use after branch change
909 with care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000910 """
911
912 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
913 """Create a new ChangeList instance.
914
915 If issue is given, the codereview must be given too.
916
917 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
918 Otherwise, it's decided based on current configuration of the local branch,
919 with default being 'rietveld' for backwards compatibility.
920 See _load_codereview_impl for more details.
921
922 **kwargs will be passed directly to codereview implementation.
923 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000924 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000925 global settings
926 if not settings:
927 # Happens when git_cl.py is used as a utility library.
928 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000929
930 if issue:
931 assert codereview, 'codereview must be known, if issue is known'
932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000933 self.branchref = branchref
934 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000935 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000936 self.branch = ShortBranchName(self.branchref)
937 else:
938 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000939 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000940 self.lookedup_issue = False
941 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000942 self.has_description = False
943 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000944 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000945 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000946 self.cc = None
947 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000948 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000949
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000950 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000951 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000952 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000953 assert self._codereview_impl
954 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000955
956 def _load_codereview_impl(self, codereview=None, **kwargs):
957 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000958 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
959 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
960 self._codereview = codereview
961 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000962 return
963
964 # Automatic selection based on issue number set for a current branch.
965 # Rietveld takes precedence over Gerrit.
966 assert not self.issue
967 # Whether we find issue or not, we are doing the lookup.
968 self.lookedup_issue = True
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000969 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000970 setting = cls.IssueSetting(self.GetBranch())
971 issue = RunGit(['config', setting], error_ok=True).strip()
972 if issue:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000973 self._codereview = codereview
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000974 self._codereview_impl = cls(self, **kwargs)
975 self.issue = int(issue)
976 return
977
978 # No issue is set for this branch, so decide based on repo-wide settings.
979 return self._load_codereview_impl(
980 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
981 **kwargs)
982
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +0000983 def IsGerrit(self):
984 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000985
986 def GetCCList(self):
987 """Return the users cc'd on this CL.
988
989 Return is a string suitable for passing to gcl with the --cc flag.
990 """
991 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000992 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000993 more_cc = ','.join(self.watchers)
994 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
995 return self.cc
996
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000997 def GetCCListWithoutDefault(self):
998 """Return the users cc'd on this CL excluding default ones."""
999 if self.cc is None:
1000 self.cc = ','.join(self.watchers)
1001 return self.cc
1002
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001003 def SetWatchers(self, watchers):
1004 """Set the list of email addresses that should be cc'd based on the changed
1005 files in this CL.
1006 """
1007 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001008
1009 def GetBranch(self):
1010 """Returns the short branch name, e.g. 'master'."""
1011 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001012 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001013 if not branchref:
1014 return None
1015 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001016 self.branch = ShortBranchName(self.branchref)
1017 return self.branch
1018
1019 def GetBranchRef(self):
1020 """Returns the full branch name, e.g. 'refs/heads/master'."""
1021 self.GetBranch() # Poke the lazy loader.
1022 return self.branchref
1023
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001024 def ClearBranch(self):
1025 """Clears cached branch data of this object."""
1026 self.branch = self.branchref = None
1027
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001028 @staticmethod
1029 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001030 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001031 e.g. 'origin', 'refs/heads/master'
1032 """
1033 remote = '.'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001034 upstream_branch = RunGit(['config', 'branch.%s.merge' % branch],
1035 error_ok=True).strip()
1036 if upstream_branch:
1037 remote = RunGit(['config', 'branch.%s.remote' % branch]).strip()
1038 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001039 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1040 error_ok=True).strip()
1041 if upstream_branch:
1042 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001043 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001044 # Fall back on trying a git-svn upstream branch.
1045 if settings.GetIsGitSvn():
1046 upstream_branch = settings.GetSVNBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001047 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001048 # Else, try to guess the origin remote.
1049 remote_branches = RunGit(['branch', '-r']).split()
1050 if 'origin/master' in remote_branches:
1051 # Fall back on origin/master if it exits.
1052 remote = 'origin'
1053 upstream_branch = 'refs/heads/master'
1054 elif 'origin/trunk' in remote_branches:
1055 # Fall back on origin/trunk if it exists. Generally a shared
1056 # git-svn clone
1057 remote = 'origin'
1058 upstream_branch = 'refs/heads/trunk'
1059 else:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001060 DieWithError(
1061 'Unable to determine default branch to diff against.\n'
1062 'Either pass complete "git diff"-style arguments, like\n'
1063 ' git cl upload origin/master\n'
1064 'or verify this branch is set up to track another \n'
1065 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001066
1067 return remote, upstream_branch
1068
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001069 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001070 upstream_branch = self.GetUpstreamBranch()
1071 if not BranchExists(upstream_branch):
1072 DieWithError('The upstream for the current branch (%s) does not exist '
1073 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001074 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001075 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001076
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001077 def GetUpstreamBranch(self):
1078 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001079 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001080 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001081 upstream_branch = upstream_branch.replace('refs/heads/',
1082 'refs/remotes/%s/' % remote)
1083 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1084 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001085 self.upstream_branch = upstream_branch
1086 return self.upstream_branch
1087
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001088 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001089 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001090 remote, branch = None, self.GetBranch()
1091 seen_branches = set()
1092 while branch not in seen_branches:
1093 seen_branches.add(branch)
1094 remote, branch = self.FetchUpstreamTuple(branch)
1095 branch = ShortBranchName(branch)
1096 if remote != '.' or branch.startswith('refs/remotes'):
1097 break
1098 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001099 remotes = RunGit(['remote'], error_ok=True).split()
1100 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001101 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001102 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001103 remote = 'origin'
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001104 logging.warning('Could not determine which remote this change is '
1105 'associated with, so defaulting to "%s". This may '
1106 'not be what you want. You may prevent this message '
1107 'by running "git svn info" as documented here: %s',
1108 self._remote,
1109 GIT_INSTRUCTIONS_URL)
1110 else:
1111 logging.warn('Could not determine which remote this change is '
1112 'associated with. You may prevent this message by '
1113 'running "git svn info" as documented here: %s',
1114 GIT_INSTRUCTIONS_URL)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001115 branch = 'HEAD'
1116 if branch.startswith('refs/remotes'):
1117 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001118 elif branch.startswith('refs/branch-heads/'):
1119 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001120 else:
1121 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001122 return self._remote
1123
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001124 def GitSanityChecks(self, upstream_git_obj):
1125 """Checks git repo status and ensures diff is from local commits."""
1126
sbc@chromium.org79706062015-01-14 21:18:12 +00001127 if upstream_git_obj is None:
1128 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001129 print('ERROR: unable to determine current branch (detached HEAD?)',
1130 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001131 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001132 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001133 return False
1134
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001135 # Verify the commit we're diffing against is in our current branch.
1136 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1137 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1138 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001139 print('ERROR: %s is not in the current branch. You may need to rebase '
1140 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001141 return False
1142
1143 # List the commits inside the diff, and verify they are all local.
1144 commits_in_diff = RunGit(
1145 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1146 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1147 remote_branch = remote_branch.strip()
1148 if code != 0:
1149 _, remote_branch = self.GetRemoteBranch()
1150
1151 commits_in_remote = RunGit(
1152 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1153
1154 common_commits = set(commits_in_diff) & set(commits_in_remote)
1155 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001156 print('ERROR: Your diff contains %d commits already in %s.\n'
1157 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1158 'the diff. If you are using a custom git flow, you can override'
1159 ' the reference used for this check with "git config '
1160 'gitcl.remotebranch <git-ref>".' % (
1161 len(common_commits), remote_branch, upstream_git_obj),
1162 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 return False
1164 return True
1165
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001166 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001167 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001168
1169 Returns None if it is not set.
1170 """
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001171 return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()],
1172 error_ok=True).strip()
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001173
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00001174 def GetGitSvnRemoteUrl(self):
1175 """Return the configured git-svn remote URL parsed from git svn info.
1176
1177 Returns None if it is not set.
1178 """
1179 # URL is dependent on the current directory.
1180 data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
1181 if data:
1182 keys = dict(line.split(': ', 1) for line in data.splitlines()
1183 if ': ' in line)
1184 return keys.get('URL', None)
1185 return None
1186
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001187 def GetRemoteUrl(self):
1188 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1189
1190 Returns None if there is no remote.
1191 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001192 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001193 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1194
1195 # If URL is pointing to a local directory, it is probably a git cache.
1196 if os.path.isdir(url):
1197 url = RunGit(['config', 'remote.%s.url' % remote],
1198 error_ok=True,
1199 cwd=url).strip()
1200 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001202 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001203 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001204 if self.issue is None and not self.lookedup_issue:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001205 issue = RunGit(['config',
1206 self._codereview_impl.IssueSetting(self.GetBranch())],
1207 error_ok=True).strip()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001208 self.issue = int(issue) or None if issue else None
1209 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001210 return self.issue
1211
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001212 def GetIssueURL(self):
1213 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001214 issue = self.GetIssue()
1215 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001216 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001217 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001218
1219 def GetDescription(self, pretty=False):
1220 if not self.has_description:
1221 if self.GetIssue():
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001222 self.description = self._codereview_impl.FetchDescription()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001223 self.has_description = True
1224 if pretty:
1225 wrapper = textwrap.TextWrapper()
1226 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1227 return wrapper.fill(self.description)
1228 return self.description
1229
1230 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001231 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001232 if self.patchset is None and not self.lookedup_patchset:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001233 patchset = RunGit(['config', self._codereview_impl.PatchsetSetting()],
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001234 error_ok=True).strip()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001235 self.patchset = int(patchset) or None if patchset else None
1236 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001237 return self.patchset
1238
1239 def SetPatchset(self, patchset):
1240 """Set this branch's patchset. If patchset=0, clears the patchset."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001241 patchset_setting = self._codereview_impl.PatchsetSetting()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001242 if patchset:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001243 RunGit(['config', patchset_setting, str(patchset)])
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001244 self.patchset = patchset
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001245 else:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001246 RunGit(['config', '--unset', patchset_setting],
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +00001247 stderr=subprocess2.PIPE, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001248 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001249
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001250 def SetIssue(self, issue=None):
1251 """Set this branch's issue. If issue isn't given, clears the issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001252 issue_setting = self._codereview_impl.IssueSetting(self.GetBranch())
1253 codereview_setting = self._codereview_impl.GetCodereviewServerSetting()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001254 if issue:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001255 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001256 RunGit(['config', issue_setting, str(issue)])
1257 codereview_server = self._codereview_impl.GetCodereviewServer()
1258 if codereview_server:
1259 RunGit(['config', codereview_setting, codereview_server])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001260 else:
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001261 # Reset it regardless. It doesn't hurt.
1262 config_settings = [issue_setting, self._codereview_impl.PatchsetSetting()]
1263 for prop in (['last-upload-hash'] +
1264 self._codereview_impl._PostUnsetIssueProperties()):
1265 config_settings.append('branch.%s.%s' % (self.GetBranch(), prop))
1266 for setting in config_settings:
1267 RunGit(['config', '--unset', setting], error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001268 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001269 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001270
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001271 def GetChange(self, upstream_branch, author):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001272 if not self.GitSanityChecks(upstream_branch):
1273 DieWithError('\nGit sanity check failure')
1274
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001275 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001276 if not root:
1277 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001278 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001279
1280 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001281 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001282 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001283 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001284 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001285 except subprocess2.CalledProcessError:
1286 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001287 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001288 'This branch probably doesn\'t exist anymore. To reset the\n'
1289 'tracking branch, please run\n'
1290 ' git branch --set-upstream %s trunk\n'
1291 'replacing trunk with origin/master or the relevant branch') %
1292 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001293
maruel@chromium.org52424302012-08-29 15:14:30 +00001294 issue = self.GetIssue()
1295 patchset = self.GetPatchset()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001296 if issue:
1297 description = self.GetDescription()
1298 else:
1299 # If the change was never uploaded, use the log messages of all commits
1300 # up to the branch point, as git cl upload will prefill the description
1301 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001302 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1303 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001304
1305 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001306 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001307 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001308 name,
1309 description,
1310 absroot,
1311 files,
1312 issue,
1313 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001314 author,
1315 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001316
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001317 def UpdateDescription(self, description):
1318 self.description = description
1319 return self._codereview_impl.UpdateDescriptionRemote(description)
1320
1321 def RunHook(self, committing, may_prompt, verbose, change):
1322 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1323 try:
1324 return presubmit_support.DoPresubmitChecks(change, committing,
1325 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1326 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001327 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1328 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001329 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001330 DieWithError(
1331 ('%s\nMaybe your depot_tools is out of date?\n'
1332 'If all fails, contact maruel@') % e)
1333
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001334 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1335 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001336 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1337 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001338 else:
1339 # Assume url.
1340 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1341 urlparse.urlparse(issue_arg))
1342 if not parsed_issue_arg or not parsed_issue_arg.valid:
1343 DieWithError('Failed to parse issue argument "%s". '
1344 'Must be an issue number or a valid URL.' % issue_arg)
1345 return self._codereview_impl.CMDPatchWithParsedIssue(
1346 parsed_issue_arg, reject, nocommit, directory)
1347
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001348 def CMDUpload(self, options, git_diff_args, orig_args):
1349 """Uploads a change to codereview."""
1350 if git_diff_args:
1351 # TODO(ukai): is it ok for gerrit case?
1352 base_branch = git_diff_args[0]
1353 else:
1354 if self.GetBranch() is None:
1355 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1356
1357 # Default to diffing against common ancestor of upstream branch
1358 base_branch = self.GetCommonAncestorWithUpstream()
1359 git_diff_args = [base_branch, 'HEAD']
1360
1361 # Make sure authenticated to codereview before running potentially expensive
1362 # hooks. It is a fast, best efforts check. Codereview still can reject the
1363 # authentication during the actual upload.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001364 self._codereview_impl.EnsureAuthenticated(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001365
1366 # Apply watchlists on upload.
1367 change = self.GetChange(base_branch, None)
1368 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1369 files = [f.LocalPath() for f in change.AffectedFiles()]
1370 if not options.bypass_watchlists:
1371 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1372
1373 if not options.bypass_hooks:
1374 if options.reviewers or options.tbr_owners:
1375 # Set the reviewer list now so that presubmit checks can access it.
1376 change_description = ChangeDescription(change.FullDescriptionText())
1377 change_description.update_reviewers(options.reviewers,
1378 options.tbr_owners,
1379 change)
1380 change.SetDescriptionText(change_description.description)
1381 hook_results = self.RunHook(committing=False,
1382 may_prompt=not options.force,
1383 verbose=options.verbose,
1384 change=change)
1385 if not hook_results.should_continue():
1386 return 1
1387 if not options.reviewers and hook_results.reviewers:
1388 options.reviewers = hook_results.reviewers.split(',')
1389
1390 if self.GetIssue():
1391 latest_patchset = self.GetMostRecentPatchset()
1392 local_patchset = self.GetPatchset()
1393 if (latest_patchset and local_patchset and
1394 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001395 print('The last upload made from this repository was patchset #%d but '
1396 'the most recent patchset on the server is #%d.'
1397 % (local_patchset, latest_patchset))
1398 print('Uploading will still work, but if you\'ve uploaded to this '
1399 'issue from another machine or branch the patch you\'re '
1400 'uploading now might not include those changes.')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001401 ask_for_data('About to upload; enter to confirm.')
1402
1403 print_stats(options.similarity, options.find_copies, git_diff_args)
1404 ret = self.CMDUploadChange(options, git_diff_args, change)
1405 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001406 if options.use_commit_queue:
1407 self.SetCQState(_CQState.COMMIT)
1408 elif options.cq_dry_run:
1409 self.SetCQState(_CQState.DRY_RUN)
1410
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001411 git_set_branch_value('last-upload-hash',
1412 RunGit(['rev-parse', 'HEAD']).strip())
1413 # Run post upload hooks, if specified.
1414 if settings.GetRunPostUploadHook():
1415 presubmit_support.DoPostUploadExecuter(
1416 change,
1417 self,
1418 settings.GetRoot(),
1419 options.verbose,
1420 sys.stdout)
1421
1422 # Upload all dependencies if specified.
1423 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001424 print()
1425 print('--dependencies has been specified.')
1426 print('All dependent local branches will be re-uploaded.')
1427 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001428 # Remove the dependencies flag from args so that we do not end up in a
1429 # loop.
1430 orig_args.remove('--dependencies')
1431 ret = upload_branch_deps(self, orig_args)
1432 return ret
1433
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001434 def SetCQState(self, new_state):
1435 """Update the CQ state for latest patchset.
1436
1437 Issue must have been already uploaded and known.
1438 """
1439 assert new_state in _CQState.ALL_STATES
1440 assert self.GetIssue()
1441 return self._codereview_impl.SetCQState(new_state)
1442
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001443 # Forward methods to codereview specific implementation.
1444
1445 def CloseIssue(self):
1446 return self._codereview_impl.CloseIssue()
1447
1448 def GetStatus(self):
1449 return self._codereview_impl.GetStatus()
1450
1451 def GetCodereviewServer(self):
1452 return self._codereview_impl.GetCodereviewServer()
1453
1454 def GetApprovingReviewers(self):
1455 return self._codereview_impl.GetApprovingReviewers()
1456
1457 def GetMostRecentPatchset(self):
1458 return self._codereview_impl.GetMostRecentPatchset()
1459
1460 def __getattr__(self, attr):
1461 # This is because lots of untested code accesses Rietveld-specific stuff
1462 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001463 # on a case by case basis.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001464 return getattr(self._codereview_impl, attr)
1465
1466
1467class _ChangelistCodereviewBase(object):
1468 """Abstract base class encapsulating codereview specifics of a changelist."""
1469 def __init__(self, changelist):
1470 self._changelist = changelist # instance of Changelist
1471
1472 def __getattr__(self, attr):
1473 # Forward methods to changelist.
1474 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1475 # _RietveldChangelistImpl to avoid this hack?
1476 return getattr(self._changelist, attr)
1477
1478 def GetStatus(self):
1479 """Apply a rough heuristic to give a simple summary of an issue's review
1480 or CQ status, assuming adherence to a common workflow.
1481
1482 Returns None if no issue for this branch, or specific string keywords.
1483 """
1484 raise NotImplementedError()
1485
1486 def GetCodereviewServer(self):
1487 """Returns server URL without end slash, like "https://codereview.com"."""
1488 raise NotImplementedError()
1489
1490 def FetchDescription(self):
1491 """Fetches and returns description from the codereview server."""
1492 raise NotImplementedError()
1493
1494 def GetCodereviewServerSetting(self):
1495 """Returns git config setting for the codereview server."""
1496 raise NotImplementedError()
1497
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001498 @classmethod
1499 def IssueSetting(cls, branch):
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00001500 return 'branch.%s.%s' % (branch, cls.IssueSettingSuffix())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001501
1502 @classmethod
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00001503 def IssueSettingSuffix(cls):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001504 """Returns name of git config setting which stores issue number for a given
1505 branch."""
1506 raise NotImplementedError()
1507
1508 def PatchsetSetting(self):
1509 """Returns name of git config setting which stores issue number."""
1510 raise NotImplementedError()
1511
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001512 def _PostUnsetIssueProperties(self):
1513 """Which branch-specific properties to erase when unsettin issue."""
1514 raise NotImplementedError()
1515
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001516 def GetRieveldObjForPresubmit(self):
1517 # This is an unfortunate Rietveld-embeddedness in presubmit.
1518 # For non-Rietveld codereviews, this probably should return a dummy object.
1519 raise NotImplementedError()
1520
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001521 def GetGerritObjForPresubmit(self):
1522 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1523 return None
1524
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001525 def UpdateDescriptionRemote(self, description):
1526 """Update the description on codereview site."""
1527 raise NotImplementedError()
1528
1529 def CloseIssue(self):
1530 """Closes the issue."""
1531 raise NotImplementedError()
1532
1533 def GetApprovingReviewers(self):
1534 """Returns a list of reviewers approving the change.
1535
1536 Note: not necessarily committers.
1537 """
1538 raise NotImplementedError()
1539
1540 def GetMostRecentPatchset(self):
1541 """Returns the most recent patchset number from the codereview site."""
1542 raise NotImplementedError()
1543
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001544 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1545 directory):
1546 """Fetches and applies the issue.
1547
1548 Arguments:
1549 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1550 reject: if True, reject the failed patch instead of switching to 3-way
1551 merge. Rietveld only.
1552 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1553 only.
1554 directory: switch to directory before applying the patch. Rietveld only.
1555 """
1556 raise NotImplementedError()
1557
1558 @staticmethod
1559 def ParseIssueURL(parsed_url):
1560 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1561 failed."""
1562 raise NotImplementedError()
1563
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001564 def EnsureAuthenticated(self, force):
1565 """Best effort check that user is authenticated with codereview server.
1566
1567 Arguments:
1568 force: whether to skip confirmation questions.
1569 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001570 raise NotImplementedError()
1571
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001572 def CMDUploadChange(self, options, args, change):
1573 """Uploads a change to codereview."""
1574 raise NotImplementedError()
1575
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001576 def SetCQState(self, new_state):
1577 """Update the CQ state for latest patchset.
1578
1579 Issue must have been already uploaded and known.
1580 """
1581 raise NotImplementedError()
1582
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001583
1584class _RietveldChangelistImpl(_ChangelistCodereviewBase):
1585 def __init__(self, changelist, auth_config=None, rietveld_server=None):
1586 super(_RietveldChangelistImpl, self).__init__(changelist)
1587 assert settings, 'must be initialized in _ChangelistCodereviewBase'
martiniss6eda05f2016-06-30 10:18:35 -07001588 if not rietveld_server:
1589 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001590
1591 self._rietveld_server = rietveld_server
1592 self._auth_config = auth_config
1593 self._props = None
1594 self._rpc_server = None
1595
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001596 def GetCodereviewServer(self):
1597 if not self._rietveld_server:
1598 # If we're on a branch then get the server potentially associated
1599 # with that branch.
1600 if self.GetIssue():
1601 rietveld_server_setting = self.GetCodereviewServerSetting()
1602 if rietveld_server_setting:
1603 self._rietveld_server = gclient_utils.UpgradeToHttps(RunGit(
1604 ['config', rietveld_server_setting], error_ok=True).strip())
1605 if not self._rietveld_server:
1606 self._rietveld_server = settings.GetDefaultServerUrl()
1607 return self._rietveld_server
1608
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001609 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001610 """Best effort check that user is authenticated with Rietveld server."""
1611 if self._auth_config.use_oauth2:
1612 authenticator = auth.get_authenticator_for_host(
1613 self.GetCodereviewServer(), self._auth_config)
1614 if not authenticator.has_cached_credentials():
1615 raise auth.LoginRequiredError(self.GetCodereviewServer())
1616
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001617 def FetchDescription(self):
1618 issue = self.GetIssue()
1619 assert issue
1620 try:
1621 return self.RpcServer().get_description(issue).strip()
1622 except urllib2.HTTPError as e:
1623 if e.code == 404:
1624 DieWithError(
1625 ('\nWhile fetching the description for issue %d, received a '
1626 '404 (not found)\n'
1627 'error. It is likely that you deleted this '
1628 'issue on the server. If this is the\n'
1629 'case, please run\n\n'
1630 ' git cl issue 0\n\n'
1631 'to clear the association with the deleted issue. Then run '
1632 'this command again.') % issue)
1633 else:
1634 DieWithError(
1635 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1636 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001637 print('Warning: Failed to retrieve CL description due to network '
1638 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001639 return ''
1640
1641 def GetMostRecentPatchset(self):
1642 return self.GetIssueProperties()['patchsets'][-1]
1643
1644 def GetPatchSetDiff(self, issue, patchset):
1645 return self.RpcServer().get(
1646 '/download/issue%s_%s.diff' % (issue, patchset))
1647
1648 def GetIssueProperties(self):
1649 if self._props is None:
1650 issue = self.GetIssue()
1651 if not issue:
1652 self._props = {}
1653 else:
1654 self._props = self.RpcServer().get_issue_properties(issue, True)
1655 return self._props
1656
1657 def GetApprovingReviewers(self):
1658 return get_approving_reviewers(self.GetIssueProperties())
1659
1660 def AddComment(self, message):
1661 return self.RpcServer().add_comment(self.GetIssue(), message)
1662
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001663 def GetStatus(self):
1664 """Apply a rough heuristic to give a simple summary of an issue's review
1665 or CQ status, assuming adherence to a common workflow.
1666
1667 Returns None if no issue for this branch, or one of the following keywords:
1668 * 'error' - error from review tool (including deleted issues)
1669 * 'unsent' - not sent for review
1670 * 'waiting' - waiting for review
1671 * 'reply' - waiting for owner to reply to review
1672 * 'lgtm' - LGTM from at least one approved reviewer
1673 * 'commit' - in the commit queue
1674 * 'closed' - closed
1675 """
1676 if not self.GetIssue():
1677 return None
1678
1679 try:
1680 props = self.GetIssueProperties()
1681 except urllib2.HTTPError:
1682 return 'error'
1683
1684 if props.get('closed'):
1685 # Issue is closed.
1686 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001687 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001688 # Issue is in the commit queue.
1689 return 'commit'
1690
1691 try:
1692 reviewers = self.GetApprovingReviewers()
1693 except urllib2.HTTPError:
1694 return 'error'
1695
1696 if reviewers:
1697 # Was LGTM'ed.
1698 return 'lgtm'
1699
1700 messages = props.get('messages') or []
1701
tandrii9d2c7a32016-06-22 03:42:45 -07001702 # Skip CQ messages that don't require owner's action.
1703 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
1704 if 'Dry run:' in messages[-1]['text']:
1705 messages.pop()
1706 elif 'The CQ bit was unchecked' in messages[-1]['text']:
1707 # This message always follows prior messages from CQ,
1708 # so skip this too.
1709 messages.pop()
1710 else:
1711 # This is probably a CQ messages warranting user attention.
1712 break
1713
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001714 if not messages:
1715 # No message was sent.
1716 return 'unsent'
1717 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07001718 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001719 return 'reply'
1720 return 'waiting'
1721
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001722 def UpdateDescriptionRemote(self, description):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001723 return self.RpcServer().update_description(
1724 self.GetIssue(), self.description)
1725
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001726 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001727 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001728
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001729 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07001730 return self.SetFlags({flag: value})
1731
1732 def SetFlags(self, flags):
1733 """Sets flags on this CL/patchset in Rietveld.
1734
1735 The latest patchset in Rietveld must be the same as latest known locally.
1736 """
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001737 if not self.GetPatchset():
1738 DieWithError('The patchset needs to match. Send another patchset.')
1739 try:
tandrii4b233bd2016-07-06 03:50:29 -07001740 return self.RpcServer().set_flags(
1741 self.GetIssue(), self.GetPatchset(), flags)
vapierfd77ac72016-06-16 08:33:57 -07001742 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001743 if e.code == 404:
1744 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
1745 if e.code == 403:
1746 DieWithError(
1747 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
1748 'match?') % (self.GetIssue(), self.GetPatchset()))
1749 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001750
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00001751 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001752 """Returns an upload.RpcServer() to access this review's rietveld instance.
1753 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001754 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00001755 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001756 self.GetCodereviewServer(),
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001757 self._auth_config or auth.make_auth_config())
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001758 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001759
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001760 @classmethod
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00001761 def IssueSettingSuffix(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001762 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001763
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764 def PatchsetSetting(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001765 """Return the git setting that stores this change's most recent patchset."""
1766 return 'branch.%s.rietveldpatchset' % self.GetBranch()
1767
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001768 def GetCodereviewServerSetting(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001769 """Returns the git setting that stores this change's rietveld server."""
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001770 branch = self.GetBranch()
1771 if branch:
1772 return 'branch.%s.rietveldserver' % branch
1773 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001774
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001775 def _PostUnsetIssueProperties(self):
1776 """Which branch-specific properties to erase when unsetting issue."""
1777 return ['rietveldserver']
1778
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001779 def GetRieveldObjForPresubmit(self):
1780 return self.RpcServer()
1781
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001782 def SetCQState(self, new_state):
1783 props = self.GetIssueProperties()
1784 if props.get('private'):
1785 DieWithError('Cannot set-commit on private issue')
1786
1787 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07001788 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001789 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07001790 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001791 else:
tandrii4b233bd2016-07-06 03:50:29 -07001792 assert new_state == _CQState.DRY_RUN
1793 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001794
1795
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001796 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1797 directory):
1798 # TODO(maruel): Use apply_issue.py
1799
1800 # PatchIssue should never be called with a dirty tree. It is up to the
1801 # caller to check this, but just in case we assert here since the
1802 # consequences of the caller not checking this could be dire.
1803 assert(not git_common.is_dirty_git_tree('apply'))
1804 assert(parsed_issue_arg.valid)
1805 self._changelist.issue = parsed_issue_arg.issue
1806 if parsed_issue_arg.hostname:
1807 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
1808
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001809 if (isinstance(parsed_issue_arg, _RietveldParsedIssueNumberArgument) and
1810 parsed_issue_arg.patch_url):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001811 assert parsed_issue_arg.patchset
1812 patchset = parsed_issue_arg.patchset
1813 patch_data = urllib2.urlopen(parsed_issue_arg.patch_url).read()
1814 else:
1815 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
1816 patch_data = self.GetPatchSetDiff(self.GetIssue(), patchset)
1817
1818 # Switch up to the top-level directory, if necessary, in preparation for
1819 # applying the patch.
1820 top = settings.GetRelativeRoot()
1821 if top:
1822 os.chdir(top)
1823
1824 # Git patches have a/ at the beginning of source paths. We strip that out
1825 # with a sed script rather than the -p flag to patch so we can feed either
1826 # Git or svn-style patches into the same apply command.
1827 # re.sub() should be used but flags=re.MULTILINE is only in python 2.7.
1828 try:
1829 patch_data = subprocess2.check_output(
1830 ['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'], stdin=patch_data)
1831 except subprocess2.CalledProcessError:
1832 DieWithError('Git patch mungling failed.')
1833 logging.info(patch_data)
1834
1835 # We use "git apply" to apply the patch instead of "patch" so that we can
1836 # pick up file adds.
1837 # The --index flag means: also insert into the index (so we catch adds).
1838 cmd = ['git', 'apply', '--index', '-p0']
1839 if directory:
1840 cmd.extend(('--directory', directory))
1841 if reject:
1842 cmd.append('--reject')
1843 elif IsGitVersionAtLeast('1.7.12'):
1844 cmd.append('--3way')
1845 try:
1846 subprocess2.check_call(cmd, env=GetNoGitPagerEnv(),
1847 stdin=patch_data, stdout=subprocess2.VOID)
1848 except subprocess2.CalledProcessError:
vapiera7fbd5a2016-06-16 09:17:49 -07001849 print('Failed to apply the patch')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001850 return 1
1851
1852 # If we had an issue, commit the current state and register the issue.
1853 if not nocommit:
1854 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
1855 'patch from issue %(i)s at patchset '
1856 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
1857 % {'i': self.GetIssue(), 'p': patchset})])
1858 self.SetIssue(self.GetIssue())
1859 self.SetPatchset(patchset)
vapiera7fbd5a2016-06-16 09:17:49 -07001860 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001861 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001862 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001863 return 0
1864
1865 @staticmethod
1866 def ParseIssueURL(parsed_url):
1867 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
1868 return None
1869 # Typical url: https://domain/<issue_number>[/[other]]
1870 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
1871 if match:
1872 return _RietveldParsedIssueNumberArgument(
1873 issue=int(match.group(1)),
1874 hostname=parsed_url.netloc)
1875 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
1876 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
1877 if match:
1878 return _RietveldParsedIssueNumberArgument(
1879 issue=int(match.group(1)),
1880 patchset=int(match.group(2)),
1881 hostname=parsed_url.netloc,
1882 patch_url=gclient_utils.UpgradeToHttps(parsed_url.geturl()))
1883 return None
1884
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001885 def CMDUploadChange(self, options, args, change):
1886 """Upload the patch to Rietveld."""
1887 upload_args = ['--assume_yes'] # Don't ask about untracked files.
1888 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001889 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
1890 if options.emulate_svn_auto_props:
1891 upload_args.append('--emulate_svn_auto_props')
1892
1893 change_desc = None
1894
1895 if options.email is not None:
1896 upload_args.extend(['--email', options.email])
1897
1898 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07001899 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001900 upload_args.extend(['--title', options.title])
1901 if options.message:
1902 upload_args.extend(['--message', options.message])
1903 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07001904 print('This branch is associated with issue %s. '
1905 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001906 else:
nodirca166002016-06-27 10:59:51 -07001907 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001908 upload_args.extend(['--title', options.title])
1909 message = (options.title or options.message or
1910 CreateDescriptionFromLog(args))
1911 change_desc = ChangeDescription(message)
1912 if options.reviewers or options.tbr_owners:
1913 change_desc.update_reviewers(options.reviewers,
1914 options.tbr_owners,
1915 change)
1916 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07001917 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001918
1919 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07001920 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001921 return 1
1922
1923 upload_args.extend(['--message', change_desc.description])
1924 if change_desc.get_reviewers():
1925 upload_args.append('--reviewers=%s' % ','.join(
1926 change_desc.get_reviewers()))
1927 if options.send_mail:
1928 if not change_desc.get_reviewers():
1929 DieWithError("Must specify reviewers to send email.")
1930 upload_args.append('--send_mail')
1931
1932 # We check this before applying rietveld.private assuming that in
1933 # rietveld.cc only addresses which we can send private CLs to are listed
1934 # if rietveld.private is set, and so we should ignore rietveld.cc only
1935 # when --private is specified explicitly on the command line.
1936 if options.private:
1937 logging.warn('rietveld.cc is ignored since private flag is specified. '
1938 'You need to review and add them manually if necessary.')
1939 cc = self.GetCCListWithoutDefault()
1940 else:
1941 cc = self.GetCCList()
1942 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
1943 if cc:
1944 upload_args.extend(['--cc', cc])
1945
1946 if options.private or settings.GetDefaultPrivateFlag() == "True":
1947 upload_args.append('--private')
1948
1949 upload_args.extend(['--git_similarity', str(options.similarity)])
1950 if not options.find_copies:
1951 upload_args.extend(['--git_no_find_copies'])
1952
1953 # Include the upstream repo's URL in the change -- this is useful for
1954 # projects that have their source spread across multiple repos.
1955 remote_url = self.GetGitBaseUrlFromConfig()
1956 if not remote_url:
1957 if settings.GetIsGitSvn():
1958 remote_url = self.GetGitSvnRemoteUrl()
1959 else:
1960 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
1961 remote_url = '%s@%s' % (self.GetRemoteUrl(),
1962 self.GetUpstreamBranch().split('/')[-1])
1963 if remote_url:
1964 upload_args.extend(['--base_url', remote_url])
1965 remote, remote_branch = self.GetRemoteBranch()
1966 target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
1967 settings.GetPendingRefPrefix())
1968 if target_ref:
1969 upload_args.extend(['--target_ref', target_ref])
1970
1971 # Look for dependent patchsets. See crbug.com/480453 for more details.
1972 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
1973 upstream_branch = ShortBranchName(upstream_branch)
1974 if remote is '.':
1975 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001976 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001977 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07001978 print()
1979 print('Skipping dependency patchset upload because git config '
1980 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
1981 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001982 else:
1983 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001984 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001985 auth_config=auth_config)
1986 branch_cl_issue_url = branch_cl.GetIssueURL()
1987 branch_cl_issue = branch_cl.GetIssue()
1988 branch_cl_patchset = branch_cl.GetPatchset()
1989 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
1990 upload_args.extend(
1991 ['--depends_on_patchset', '%s:%s' % (
1992 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001993 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001994 '\n'
1995 'The current branch (%s) is tracking a local branch (%s) with '
1996 'an associated CL.\n'
1997 'Adding %s/#ps%s as a dependency patchset.\n'
1998 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
1999 branch_cl_patchset))
2000
2001 project = settings.GetProject()
2002 if project:
2003 upload_args.extend(['--project', project])
2004
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002005 try:
2006 upload_args = ['upload'] + upload_args + args
2007 logging.info('upload.RealMain(%s)', upload_args)
2008 issue, patchset = upload.RealMain(upload_args)
2009 issue = int(issue)
2010 patchset = int(patchset)
2011 except KeyboardInterrupt:
2012 sys.exit(1)
2013 except:
2014 # If we got an exception after the user typed a description for their
2015 # change, back up the description before re-raising.
2016 if change_desc:
2017 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
2018 print('\nGot exception while uploading -- saving description to %s\n' %
2019 backup_path)
2020 backup_file = open(backup_path, 'w')
2021 backup_file.write(change_desc.description)
2022 backup_file.close()
2023 raise
2024
2025 if not self.GetIssue():
2026 self.SetIssue(issue)
2027 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002028 return 0
2029
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002030
2031class _GerritChangelistImpl(_ChangelistCodereviewBase):
2032 def __init__(self, changelist, auth_config=None):
2033 # auth_config is Rietveld thing, kept here to preserve interface only.
2034 super(_GerritChangelistImpl, self).__init__(changelist)
2035 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002036 # Lazily cached values.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002037 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002038 self._gerrit_host = None # e.g. chromium-review.googlesource.com
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002039
2040 def _GetGerritHost(self):
2041 # Lazy load of configs.
2042 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002043 if self._gerrit_host and '.' not in self._gerrit_host:
2044 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2045 # This happens for internal stuff http://crbug.com/614312.
2046 parsed = urlparse.urlparse(self.GetRemoteUrl())
2047 if parsed.scheme == 'sso':
2048 print('WARNING: using non https URLs for remote is likely broken\n'
2049 ' Your current remote is: %s' % self.GetRemoteUrl())
2050 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2051 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002052 return self._gerrit_host
2053
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002054 def _GetGitHost(self):
2055 """Returns git host to be used when uploading change to Gerrit."""
2056 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2057
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002058 def GetCodereviewServer(self):
2059 if not self._gerrit_server:
2060 # If we're on a branch then get the server potentially associated
2061 # with that branch.
2062 if self.GetIssue():
2063 gerrit_server_setting = self.GetCodereviewServerSetting()
2064 if gerrit_server_setting:
2065 self._gerrit_server = RunGit(['config', gerrit_server_setting],
2066 error_ok=True).strip()
2067 if self._gerrit_server:
2068 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
2069 if not self._gerrit_server:
2070 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2071 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002072 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002073 parts[0] = parts[0] + '-review'
2074 self._gerrit_host = '.'.join(parts)
2075 self._gerrit_server = 'https://%s' % self._gerrit_host
2076 return self._gerrit_server
2077
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002078 @classmethod
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00002079 def IssueSettingSuffix(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002080 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002081
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002082 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002083 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002084 if settings.GetGerritSkipEnsureAuthenticated():
2085 # For projects with unusual authentication schemes.
2086 # See http://crbug.com/603378.
2087 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002088 # Lazy-loader to identify Gerrit and Git hosts.
2089 if gerrit_util.GceAuthenticator.is_gce():
2090 return
2091 self.GetCodereviewServer()
2092 git_host = self._GetGitHost()
2093 assert self._gerrit_server and self._gerrit_host
2094 cookie_auth = gerrit_util.CookiesAuthenticator()
2095
2096 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2097 git_auth = cookie_auth.get_auth_header(git_host)
2098 if gerrit_auth and git_auth:
2099 if gerrit_auth == git_auth:
2100 return
2101 print((
2102 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2103 ' Check your %s or %s file for credentials of hosts:\n'
2104 ' %s\n'
2105 ' %s\n'
2106 ' %s') %
2107 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2108 git_host, self._gerrit_host,
2109 cookie_auth.get_new_password_message(git_host)))
2110 if not force:
2111 ask_for_data('If you know what you are doing, press Enter to continue, '
2112 'Ctrl+C to abort.')
2113 return
2114 else:
2115 missing = (
2116 [] if gerrit_auth else [self._gerrit_host] +
2117 [] if git_auth else [git_host])
2118 DieWithError('Credentials for the following hosts are required:\n'
2119 ' %s\n'
2120 'These are read from %s (or legacy %s)\n'
2121 '%s' % (
2122 '\n '.join(missing),
2123 cookie_auth.get_gitcookies_path(),
2124 cookie_auth.get_netrc_path(),
2125 cookie_auth.get_new_password_message(git_host)))
2126
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002127
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002128 def PatchsetSetting(self):
2129 """Return the git setting that stores this change's most recent patchset."""
2130 return 'branch.%s.gerritpatchset' % self.GetBranch()
2131
2132 def GetCodereviewServerSetting(self):
2133 """Returns the git setting that stores this change's Gerrit server."""
2134 branch = self.GetBranch()
2135 if branch:
2136 return 'branch.%s.gerritserver' % branch
2137 return None
2138
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002139 def _PostUnsetIssueProperties(self):
2140 """Which branch-specific properties to erase when unsetting issue."""
2141 return [
2142 'gerritserver',
2143 'gerritsquashhash',
2144 ]
2145
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002146 def GetRieveldObjForPresubmit(self):
2147 class ThisIsNotRietveldIssue(object):
2148 def __nonzero__(self):
2149 # This is a hack to make presubmit_support think that rietveld is not
2150 # defined, yet still ensure that calls directly result in a decent
2151 # exception message below.
2152 return False
2153
2154 def __getattr__(self, attr):
2155 print(
2156 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2157 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2158 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2159 'or use Rietveld for codereview.\n'
2160 'See also http://crbug.com/579160.' % attr)
2161 raise NotImplementedError()
2162 return ThisIsNotRietveldIssue()
2163
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002164 def GetGerritObjForPresubmit(self):
2165 return presubmit_support.GerritAccessor(self._GetGerritHost())
2166
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002167 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002168 """Apply a rough heuristic to give a simple summary of an issue's review
2169 or CQ status, assuming adherence to a common workflow.
2170
2171 Returns None if no issue for this branch, or one of the following keywords:
2172 * 'error' - error from review tool (including deleted issues)
2173 * 'unsent' - no reviewers added
2174 * 'waiting' - waiting for review
2175 * 'reply' - waiting for owner to reply to review
2176 * 'not lgtm' - Code-Review -2 from at least one approved reviewer
2177 * 'lgtm' - Code-Review +2 from at least one approved reviewer
2178 * 'commit' - in the commit queue
2179 * 'closed' - abandoned
2180 """
2181 if not self.GetIssue():
2182 return None
2183
2184 try:
2185 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
2186 except httplib.HTTPException:
2187 return 'error'
2188
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002189 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002190 return 'closed'
2191
2192 cq_label = data['labels'].get('Commit-Queue', {})
2193 if cq_label:
2194 # Vote value is a stringified integer, which we expect from 0 to 2.
2195 vote_value = cq_label.get('value', '0')
2196 vote_text = cq_label.get('values', {}).get(vote_value, '')
2197 if vote_text.lower() == 'commit':
2198 return 'commit'
2199
2200 lgtm_label = data['labels'].get('Code-Review', {})
2201 if lgtm_label:
2202 if 'rejected' in lgtm_label:
2203 return 'not lgtm'
2204 if 'approved' in lgtm_label:
2205 return 'lgtm'
2206
2207 if not data.get('reviewers', {}).get('REVIEWER', []):
2208 return 'unsent'
2209
2210 messages = data.get('messages', [])
2211 if messages:
2212 owner = data['owner'].get('_account_id')
2213 last_message_author = messages[-1].get('author', {}).get('_account_id')
2214 if owner != last_message_author:
2215 # Some reply from non-owner.
2216 return 'reply'
2217
2218 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002219
2220 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002221 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002222 return data['revisions'][data['current_revision']]['_number']
2223
2224 def FetchDescription(self):
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002225 data = self._GetChangeDetail(['CURRENT_REVISION'])
2226 current_rev = data['current_revision']
2227 url = data['revisions'][current_rev]['fetch']['http']['url']
2228 return gerrit_util.GetChangeDescriptionFromGitiles(url, current_rev)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002229
2230 def UpdateDescriptionRemote(self, description):
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002231 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
2232 description)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002233
2234 def CloseIssue(self):
2235 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2236
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002237 def GetApprovingReviewers(self):
2238 """Returns a list of reviewers approving the change.
2239
2240 Note: not necessarily committers.
2241 """
2242 raise NotImplementedError()
2243
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002244 def SubmitIssue(self, wait_for_merge=True):
2245 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2246 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002247
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002248 def _GetChangeDetail(self, options=None, issue=None):
2249 options = options or []
2250 issue = issue or self.GetIssue()
2251 assert issue, 'issue required to query Gerrit'
tandrii@chromium.org11a899e2016-04-13 12:45:44 +00002252 return gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
2253 options)
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002254
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002255 def CMDLand(self, force, bypass_hooks, verbose):
2256 if git_common.is_dirty_git_tree('land'):
2257 return 1
tandriid60367b2016-06-22 05:25:12 -07002258 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2259 if u'Commit-Queue' in detail.get('labels', {}):
2260 if not force:
2261 ask_for_data('\nIt seems this repository has a Commit Queue, '
2262 'which can test and land changes for you. '
2263 'Are you sure you wish to bypass it?\n'
2264 'Press Enter to continue, Ctrl+C to abort.')
2265
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002266 differs = True
2267 last_upload = RunGit(['config',
2268 'branch.%s.gerritsquashhash' % self.GetBranch()],
2269 error_ok=True).strip()
2270 # Note: git diff outputs nothing if there is no diff.
2271 if not last_upload or RunGit(['diff', last_upload]).strip():
2272 print('WARNING: some changes from local branch haven\'t been uploaded')
2273 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002274 if detail['current_revision'] == last_upload:
2275 differs = False
2276 else:
2277 print('WARNING: local branch contents differ from latest uploaded '
2278 'patchset')
2279 if differs:
2280 if not force:
2281 ask_for_data(
2282 'Do you want to submit latest Gerrit patchset and bypass hooks?')
2283 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2284 elif not bypass_hooks:
2285 hook_results = self.RunHook(
2286 committing=True,
2287 may_prompt=not force,
2288 verbose=verbose,
2289 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2290 if not hook_results.should_continue():
2291 return 1
2292
2293 self.SubmitIssue(wait_for_merge=True)
2294 print('Issue %s has been submitted.' % self.GetIssueURL())
2295 return 0
2296
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002297 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2298 directory):
2299 assert not reject
2300 assert not nocommit
2301 assert not directory
2302 assert parsed_issue_arg.valid
2303
2304 self._changelist.issue = parsed_issue_arg.issue
2305
2306 if parsed_issue_arg.hostname:
2307 self._gerrit_host = parsed_issue_arg.hostname
2308 self._gerrit_server = 'https://%s' % self._gerrit_host
2309
2310 detail = self._GetChangeDetail(['ALL_REVISIONS'])
2311
2312 if not parsed_issue_arg.patchset:
2313 # Use current revision by default.
2314 revision_info = detail['revisions'][detail['current_revision']]
2315 patchset = int(revision_info['_number'])
2316 else:
2317 patchset = parsed_issue_arg.patchset
2318 for revision_info in detail['revisions'].itervalues():
2319 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2320 break
2321 else:
2322 DieWithError('Couldn\'t find patchset %i in issue %i' %
2323 (parsed_issue_arg.patchset, self.GetIssue()))
2324
2325 fetch_info = revision_info['fetch']['http']
2326 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
2327 RunGit(['cherry-pick', 'FETCH_HEAD'])
2328 self.SetIssue(self.GetIssue())
2329 self.SetPatchset(patchset)
2330 print('Committed patch for issue %i pathset %i locally' %
2331 (self.GetIssue(), self.GetPatchset()))
2332 return 0
2333
2334 @staticmethod
2335 def ParseIssueURL(parsed_url):
2336 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2337 return None
2338 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2339 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2340 # Short urls like https://domain/<issue_number> can be used, but don't allow
2341 # specifying the patchset (you'd 404), but we allow that here.
2342 if parsed_url.path == '/':
2343 part = parsed_url.fragment
2344 else:
2345 part = parsed_url.path
2346 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2347 if match:
2348 return _ParsedIssueNumberArgument(
2349 issue=int(match.group(2)),
2350 patchset=int(match.group(4)) if match.group(4) else None,
2351 hostname=parsed_url.netloc)
2352 return None
2353
tandrii16e0b4e2016-06-07 10:34:28 -07002354 def _GerritCommitMsgHookCheck(self, offer_removal):
2355 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2356 if not os.path.exists(hook):
2357 return
2358 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2359 # custom developer made one.
2360 data = gclient_utils.FileRead(hook)
2361 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2362 return
2363 print('Warning: you have Gerrit commit-msg hook installed.\n'
2364 'It is not neccessary for uploading with git cl in squash mode, '
2365 'and may interfere with it in subtle ways.\n'
2366 'We recommend you remove the commit-msg hook.')
2367 if offer_removal:
2368 reply = ask_for_data('Do you want to remove it now? [Yes/No]')
2369 if reply.lower().startswith('y'):
2370 gclient_utils.rm_file_or_tree(hook)
2371 print('Gerrit commit-msg hook removed.')
2372 else:
2373 print('OK, will keep Gerrit commit-msg hook in place.')
2374
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002375 def CMDUploadChange(self, options, args, change):
2376 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002377 if options.squash and options.no_squash:
2378 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002379
2380 if not options.squash and not options.no_squash:
2381 # Load default for user, repo, squash=true, in this order.
2382 options.squash = settings.GetSquashGerritUploads()
2383 elif options.no_squash:
2384 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002385
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002386 # We assume the remote called "origin" is the one we want.
2387 # It is probably not worthwhile to support different workflows.
2388 gerrit_remote = 'origin'
2389
2390 remote, remote_branch = self.GetRemoteBranch()
2391 branch = GetTargetRef(remote, remote_branch, options.target_branch,
2392 pending_prefix='')
2393
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002394 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002395 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002396 if self.GetIssue():
2397 # Try to get the message from a previous upload.
2398 message = self.GetDescription()
2399 if not message:
2400 DieWithError(
2401 'failed to fetch description from current Gerrit issue %d\n'
2402 '%s' % (self.GetIssue(), self.GetIssueURL()))
2403 change_id = self._GetChangeDetail()['change_id']
2404 while True:
2405 footer_change_ids = git_footers.get_footer_change_id(message)
2406 if footer_change_ids == [change_id]:
2407 break
2408 if not footer_change_ids:
2409 message = git_footers.add_footer_change_id(message, change_id)
2410 print('WARNING: appended missing Change-Id to issue description')
2411 continue
2412 # There is already a valid footer but with different or several ids.
2413 # Doing this automatically is non-trivial as we don't want to lose
2414 # existing other footers, yet we want to append just 1 desired
2415 # Change-Id. Thus, just create a new footer, but let user verify the
2416 # new description.
2417 message = '%s\n\nChange-Id: %s' % (message, change_id)
2418 print(
2419 'WARNING: issue %s has Change-Id footer(s):\n'
2420 ' %s\n'
2421 'but issue has Change-Id %s, according to Gerrit.\n'
2422 'Please, check the proposed correction to the description, '
2423 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2424 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2425 change_id))
2426 ask_for_data('Press enter to edit now, Ctrl+C to abort')
2427 if not options.force:
2428 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002429 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002430 message = change_desc.description
2431 if not message:
2432 DieWithError("Description is empty. Aborting...")
2433 # Continue the while loop.
2434 # Sanity check of this code - we should end up with proper message
2435 # footer.
2436 assert [change_id] == git_footers.get_footer_change_id(message)
2437 change_desc = ChangeDescription(message)
2438 else:
2439 change_desc = ChangeDescription(
2440 options.message or CreateDescriptionFromLog(args))
2441 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002442 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002443 if not change_desc.description:
2444 DieWithError("Description is empty. Aborting...")
2445 message = change_desc.description
2446 change_ids = git_footers.get_footer_change_id(message)
2447 if len(change_ids) > 1:
2448 DieWithError('too many Change-Id footers, at most 1 allowed.')
2449 if not change_ids:
2450 # Generate the Change-Id automatically.
2451 message = git_footers.add_footer_change_id(
2452 message, GenerateGerritChangeId(message))
2453 change_desc.set_description(message)
2454 change_ids = git_footers.get_footer_change_id(message)
2455 assert len(change_ids) == 1
2456 change_id = change_ids[0]
2457
2458 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2459 if remote is '.':
2460 # If our upstream branch is local, we base our squashed commit on its
2461 # squashed version.
2462 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2463 # Check the squashed hash of the parent.
2464 parent = RunGit(['config',
2465 'branch.%s.gerritsquashhash' % upstream_branch_name],
2466 error_ok=True).strip()
2467 # Verify that the upstream branch has been uploaded too, otherwise
2468 # Gerrit will create additional CLs when uploading.
2469 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2470 RunGitSilent(['rev-parse', parent + ':'])):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002471 DieWithError(
2472 'Upload upstream branch %s first.\n'
tandrii2bdadf12016-07-12 12:27:54 -07002473 'Note: maybe you\'ve uploaded it with --no-squash. '
2474 'If so, then re-upload it with:\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002475 ' git cl upload --squash\n' % upstream_branch_name)
2476 else:
2477 parent = self.GetCommonAncestorWithUpstream()
2478
2479 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2480 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2481 '-m', message]).strip()
2482 else:
2483 change_desc = ChangeDescription(
2484 options.message or CreateDescriptionFromLog(args))
2485 if not change_desc.description:
2486 DieWithError("Description is empty. Aborting...")
2487
2488 if not git_footers.get_footer_change_id(change_desc.description):
2489 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002490 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2491 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002492 ref_to_push = 'HEAD'
2493 parent = '%s/%s' % (gerrit_remote, branch)
2494 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2495
2496 assert change_desc
2497 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2498 ref_to_push)]).splitlines()
2499 if len(commits) > 1:
2500 print('WARNING: This will upload %d commits. Run the following command '
2501 'to see which commits will be uploaded: ' % len(commits))
2502 print('git log %s..%s' % (parent, ref_to_push))
2503 print('You can also use `git squash-branch` to squash these into a '
2504 'single commit.')
2505 ask_for_data('About to upload; enter to confirm.')
2506
2507 if options.reviewers or options.tbr_owners:
2508 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2509 change)
2510
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002511 # Extra options that can be specified at push time. Doc:
2512 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2513 refspec_opts = []
2514 if options.title:
2515 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2516 # reverse on its side.
2517 if '_' in options.title:
2518 print('WARNING: underscores in title will be converted to spaces.')
2519 refspec_opts.append('m=' + options.title.replace(' ', '_'))
2520
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002521 if options.send_mail:
2522 if not change_desc.get_reviewers():
2523 DieWithError('Must specify reviewers to send email.')
2524 refspec_opts.append('notify=ALL')
2525 else:
2526 refspec_opts.append('notify=NONE')
2527
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002528 cc = self.GetCCList().split(',')
2529 if options.cc:
2530 cc.extend(options.cc)
2531 cc = filter(None, cc)
2532 if cc:
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00002533 refspec_opts.extend('cc=' + email.strip() for email in cc)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002534
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002535 if change_desc.get_reviewers():
2536 refspec_opts.extend('r=' + email.strip()
2537 for email in change_desc.get_reviewers())
2538
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002539 refspec_suffix = ''
2540 if refspec_opts:
2541 refspec_suffix = '%' + ','.join(refspec_opts)
2542 assert ' ' not in refspec_suffix, (
2543 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002544 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002545
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002546 push_stdout = gclient_utils.CheckCallAndFilter(
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002547 ['git', 'push', gerrit_remote, refspec],
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002548 print_stdout=True,
2549 # Flush after every line: useful for seeing progress when running as
2550 # recipe.
2551 filter_fn=lambda _: sys.stdout.flush())
2552
2553 if options.squash:
2554 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2555 change_numbers = [m.group(1)
2556 for m in map(regex.match, push_stdout.splitlines())
2557 if m]
2558 if len(change_numbers) != 1:
2559 DieWithError(
2560 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
2561 'Change-Id: %s') % (len(change_numbers), change_id))
2562 self.SetIssue(change_numbers[0])
2563 RunGit(['config', 'branch.%s.gerritsquashhash' % self.GetBranch(),
2564 ref_to_push])
2565 return 0
2566
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002567 def _AddChangeIdToCommitMessage(self, options, args):
2568 """Re-commits using the current message, assumes the commit hook is in
2569 place.
2570 """
2571 log_desc = options.message or CreateDescriptionFromLog(args)
2572 git_command = ['commit', '--amend', '-m', log_desc]
2573 RunGit(git_command)
2574 new_log_desc = CreateDescriptionFromLog(args)
2575 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002576 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002577 return new_log_desc
2578 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002579 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002580
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002581 def SetCQState(self, new_state):
2582 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002583 vote_map = {
2584 _CQState.NONE: 0,
2585 _CQState.DRY_RUN: 1,
2586 _CQState.COMMIT : 2,
2587 }
2588 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2589 labels={'Commit-Queue': vote_map[new_state]})
2590
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002591
2592_CODEREVIEW_IMPLEMENTATIONS = {
2593 'rietveld': _RietveldChangelistImpl,
2594 'gerrit': _GerritChangelistImpl,
2595}
2596
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002597
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002598def _add_codereview_select_options(parser):
2599 """Appends --gerrit and --rietveld options to force specific codereview."""
2600 parser.codereview_group = optparse.OptionGroup(
2601 parser, 'EXPERIMENTAL! Codereview override options')
2602 parser.add_option_group(parser.codereview_group)
2603 parser.codereview_group.add_option(
2604 '--gerrit', action='store_true',
2605 help='Force the use of Gerrit for codereview')
2606 parser.codereview_group.add_option(
2607 '--rietveld', action='store_true',
2608 help='Force the use of Rietveld for codereview')
2609
2610
2611def _process_codereview_select_options(parser, options):
2612 if options.gerrit and options.rietveld:
2613 parser.error('Options --gerrit and --rietveld are mutually exclusive')
2614 options.forced_codereview = None
2615 if options.gerrit:
2616 options.forced_codereview = 'gerrit'
2617 elif options.rietveld:
2618 options.forced_codereview = 'rietveld'
2619
2620
tandriif9aefb72016-07-01 09:06:51 -07002621def _get_bug_line_values(default_project, bugs):
2622 """Given default_project and comma separated list of bugs, yields bug line
2623 values.
2624
2625 Each bug can be either:
2626 * a number, which is combined with default_project
2627 * string, which is left as is.
2628
2629 This function may produce more than one line, because bugdroid expects one
2630 project per line.
2631
2632 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2633 ['v8:123', 'chromium:789']
2634 """
2635 default_bugs = []
2636 others = []
2637 for bug in bugs.split(','):
2638 bug = bug.strip()
2639 if bug:
2640 try:
2641 default_bugs.append(int(bug))
2642 except ValueError:
2643 others.append(bug)
2644
2645 if default_bugs:
2646 default_bugs = ','.join(map(str, default_bugs))
2647 if default_project:
2648 yield '%s:%s' % (default_project, default_bugs)
2649 else:
2650 yield default_bugs
2651 for other in sorted(others):
2652 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2653 yield other
2654
2655
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002656class ChangeDescription(object):
2657 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002658 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
agable@chromium.org42c20792013-09-12 17:34:49 +00002659 BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002660
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002661 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002662 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002663
agable@chromium.org42c20792013-09-12 17:34:49 +00002664 @property # www.logilab.org/ticket/89786
2665 def description(self): # pylint: disable=E0202
2666 return '\n'.join(self._description_lines)
2667
2668 def set_description(self, desc):
2669 if isinstance(desc, basestring):
2670 lines = desc.splitlines()
2671 else:
2672 lines = [line.rstrip() for line in desc]
2673 while lines and not lines[0]:
2674 lines.pop(0)
2675 while lines and not lines[-1]:
2676 lines.pop(-1)
2677 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002678
piman@chromium.org336f9122014-09-04 02:16:55 +00002679 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00002680 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002681 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00002682 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002683 return
agable@chromium.org42c20792013-09-12 17:34:49 +00002684 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002685
agable@chromium.org42c20792013-09-12 17:34:49 +00002686 # Get the set of R= and TBR= lines and remove them from the desciption.
2687 regexp = re.compile(self.R_LINE)
2688 matches = [regexp.match(line) for line in self._description_lines]
2689 new_desc = [l for i, l in enumerate(self._description_lines)
2690 if not matches[i]]
2691 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002692
agable@chromium.org42c20792013-09-12 17:34:49 +00002693 # Construct new unified R= and TBR= lines.
2694 r_names = []
2695 tbr_names = []
2696 for match in matches:
2697 if not match:
2698 continue
2699 people = cleanup_list([match.group(2).strip()])
2700 if match.group(1) == 'TBR':
2701 tbr_names.extend(people)
2702 else:
2703 r_names.extend(people)
2704 for name in r_names:
2705 if name not in reviewers:
2706 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00002707 if add_owners_tbr:
2708 owners_db = owners.Database(change.RepositoryRoot(),
dtu944b6052016-07-14 14:48:21 -07002709 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00002710 all_reviewers = set(tbr_names + reviewers)
2711 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
2712 all_reviewers)
2713 tbr_names.extend(owners_db.reviewers_for(missing_files,
2714 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00002715 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
2716 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
2717
2718 # Put the new lines in the description where the old first R= line was.
2719 line_loc = next((i for i, match in enumerate(matches) if match), -1)
2720 if 0 <= line_loc < len(self._description_lines):
2721 if new_tbr_line:
2722 self._description_lines.insert(line_loc, new_tbr_line)
2723 if new_r_line:
2724 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002725 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00002726 if new_r_line:
2727 self.append_footer(new_r_line)
2728 if new_tbr_line:
2729 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002730
tandriif9aefb72016-07-01 09:06:51 -07002731 def prompt(self, bug=None):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002732 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002733 self.set_description([
2734 '# Enter a description of the change.',
2735 '# This will be displayed on the codereview site.',
2736 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00002737 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00002738 '--------------------',
2739 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002740
agable@chromium.org42c20792013-09-12 17:34:49 +00002741 regexp = re.compile(self.BUG_LINE)
2742 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07002743 prefix = settings.GetBugPrefix()
2744 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
2745 for value in values:
2746 # TODO(tandrii): change this to 'Bug: xxx' to be a proper Gerrit footer.
2747 self.append_footer('BUG=%s' % value)
2748
agable@chromium.org42c20792013-09-12 17:34:49 +00002749 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00002750 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002751 if not content:
2752 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00002753 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002754
2755 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00002756 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
2757 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00002758 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00002759 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002760
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002761 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002762 """Adds a footer line to the description.
2763
2764 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
2765 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
2766 that Gerrit footers are always at the end.
2767 """
2768 parsed_footer_line = git_footers.parse_footer(line)
2769 if parsed_footer_line:
2770 # Line is a gerrit footer in the form: Footer-Key: any value.
2771 # Thus, must be appended observing Gerrit footer rules.
2772 self.set_description(
2773 git_footers.add_footer(self.description,
2774 key=parsed_footer_line[0],
2775 value=parsed_footer_line[1]))
2776 return
2777
2778 if not self._description_lines:
2779 self._description_lines.append(line)
2780 return
2781
2782 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
2783 if gerrit_footers:
2784 # git_footers.split_footers ensures that there is an empty line before
2785 # actual (gerrit) footers, if any. We have to keep it that way.
2786 assert top_lines and top_lines[-1] == ''
2787 top_lines, separator = top_lines[:-1], top_lines[-1:]
2788 else:
2789 separator = [] # No need for separator if there are no gerrit_footers.
2790
2791 prev_line = top_lines[-1] if top_lines else ''
2792 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
2793 not presubmit_support.Change.TAG_LINE_RE.match(line)):
2794 top_lines.append('')
2795 top_lines.append(line)
2796 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002797
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002798 def get_reviewers(self):
2799 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00002800 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
2801 reviewers = [match.group(2).strip() for match in matches if match]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002802 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002803
2804
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002805def get_approving_reviewers(props):
2806 """Retrieves the reviewers that approved a CL from the issue properties with
2807 messages.
2808
2809 Note that the list may contain reviewers that are not committer, thus are not
2810 considered by the CQ.
2811 """
2812 return sorted(
2813 set(
2814 message['sender']
2815 for message in props['messages']
2816 if message['approval'] and message['sender'] in props['reviewers']
2817 )
2818 )
2819
2820
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002821def FindCodereviewSettingsFile(filename='codereview.settings'):
2822 """Finds the given file starting in the cwd and going up.
2823
2824 Only looks up to the top of the repository unless an
2825 'inherit-review-settings-ok' file exists in the root of the repository.
2826 """
2827 inherit_ok_file = 'inherit-review-settings-ok'
2828 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002829 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002830 if os.path.isfile(os.path.join(root, inherit_ok_file)):
2831 root = '/'
2832 while True:
2833 if filename in os.listdir(cwd):
2834 if os.path.isfile(os.path.join(cwd, filename)):
2835 return open(os.path.join(cwd, filename))
2836 if cwd == root:
2837 break
2838 cwd = os.path.dirname(cwd)
2839
2840
2841def LoadCodereviewSettingsFromFile(fileobj):
2842 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00002843 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002844
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002845 def SetProperty(name, setting, unset_error_ok=False):
2846 fullname = 'rietveld.' + name
2847 if setting in keyvals:
2848 RunGit(['config', fullname, keyvals[setting]])
2849 else:
2850 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
2851
2852 SetProperty('server', 'CODE_REVIEW_SERVER')
2853 # Only server setting is required. Other settings can be absent.
2854 # In that case, we ignore errors raised during option deletion attempt.
2855 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00002856 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002857 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
2858 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00002859 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002860 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00002861 SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL',
2862 unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00002863 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00002864 SetProperty('project', 'PROJECT', unset_error_ok=True)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002865 SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00002866 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
2867 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002868
ukai@chromium.org7044efc2013-11-28 01:51:21 +00002869 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00002870 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00002871
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002872 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07002873 RunGit(['config', 'gerrit.squash-uploads',
2874 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00002875
tandrii@chromium.org28253532016-04-14 13:46:56 +00002876 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00002877 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00002878 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
2879
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002880 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
2881 #should be of the form
2882 #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
2883 #ORIGIN_URL_CONFIG: http://src.chromium.org/git
2884 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
2885 keyvals['ORIGIN_URL_CONFIG']])
2886
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002887
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002888def urlretrieve(source, destination):
2889 """urllib is broken for SSL connections via a proxy therefore we
2890 can't use urllib.urlretrieve()."""
2891 with open(destination, 'w') as f:
2892 f.write(urllib2.urlopen(source).read())
2893
2894
ukai@chromium.org712d6102013-11-27 00:52:58 +00002895def hasSheBang(fname):
2896 """Checks fname is a #! script."""
2897 with open(fname) as f:
2898 return f.read(2).startswith('#!')
2899
2900
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00002901# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
2902def DownloadHooks(*args, **kwargs):
2903 pass
2904
2905
tandrii@chromium.org18630d62016-03-04 12:06:02 +00002906def DownloadGerritHook(force):
2907 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002908
2909 Args:
2910 force: True to update hooks. False to install hooks if not present.
2911 """
2912 if not settings.GetIsGerrit():
2913 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00002914 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002915 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2916 if not os.access(dst, os.X_OK):
2917 if os.path.exists(dst):
2918 if not force:
2919 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002920 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00002921 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002922 if not hasSheBang(dst):
2923 DieWithError('Not a script: %s\n'
2924 'You need to download from\n%s\n'
2925 'into .git/hooks/commit-msg and '
2926 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002927 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
2928 except Exception:
2929 if os.path.exists(dst):
2930 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00002931 DieWithError('\nFailed to download hooks.\n'
2932 'You need to download from\n%s\n'
2933 'into .git/hooks/commit-msg and '
2934 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00002935
2936
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00002937
2938def GetRietveldCodereviewSettingsInteractively():
2939 """Prompt the user for settings."""
2940 server = settings.GetDefaultServerUrl(error_ok=True)
2941 prompt = 'Rietveld server (host[:port])'
2942 prompt += ' [%s]' % (server or DEFAULT_SERVER)
2943 newserver = ask_for_data(prompt + ':')
2944 if not server and not newserver:
2945 newserver = DEFAULT_SERVER
2946 if newserver:
2947 newserver = gclient_utils.UpgradeToHttps(newserver)
2948 if newserver != server:
2949 RunGit(['config', 'rietveld.server', newserver])
2950
2951 def SetProperty(initial, caption, name, is_url):
2952 prompt = caption
2953 if initial:
2954 prompt += ' ("x" to clear) [%s]' % initial
2955 new_val = ask_for_data(prompt + ':')
2956 if new_val == 'x':
2957 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
2958 elif new_val:
2959 if is_url:
2960 new_val = gclient_utils.UpgradeToHttps(new_val)
2961 if new_val != initial:
2962 RunGit(['config', 'rietveld.' + name, new_val])
2963
2964 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
2965 SetProperty(settings.GetDefaultPrivateFlag(),
2966 'Private flag (rietveld only)', 'private', False)
2967 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
2968 'tree-status-url', False)
2969 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
2970 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
2971 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
2972 'run-post-upload-hook', False)
2973
maruel@chromium.org0633fb42013-08-16 20:06:14 +00002974@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002975def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00002976 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002977
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00002978 print('WARNING: git cl config works for Rietveld only.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002979 'For Gerrit, see http://crbug.com/603116.')
2980 # TODO(tandrii): add Gerrit support as part of http://crbug.com/603116.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00002981 parser.add_option('--activate-update', action='store_true',
2982 help='activate auto-updating [rietveld] section in '
2983 '.git/config')
2984 parser.add_option('--deactivate-update', action='store_true',
2985 help='deactivate auto-updating [rietveld] section in '
2986 '.git/config')
2987 options, args = parser.parse_args(args)
2988
2989 if options.deactivate_update:
2990 RunGit(['config', 'rietveld.autoupdate', 'false'])
2991 return
2992
2993 if options.activate_update:
2994 RunGit(['config', '--unset', 'rietveld.autoupdate'])
2995 return
2996
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002997 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00002998 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002999 return 0
3000
3001 url = args[0]
3002 if not url.endswith('codereview.settings'):
3003 url = os.path.join(url, 'codereview.settings')
3004
3005 # Load code review settings and download hooks (if available).
3006 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3007 return 0
3008
3009
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003010def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003011 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003012 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3013 branch = ShortBranchName(branchref)
3014 _, args = parser.parse_args(args)
3015 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003016 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003017 return RunGit(['config', 'branch.%s.base-url' % branch],
3018 error_ok=False).strip()
3019 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003020 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003021 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3022 error_ok=False).strip()
3023
3024
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003025def color_for_status(status):
3026 """Maps a Changelist status to color, for CMDstatus and other tools."""
3027 return {
3028 'unsent': Fore.RED,
3029 'waiting': Fore.BLUE,
3030 'reply': Fore.YELLOW,
3031 'lgtm': Fore.GREEN,
3032 'commit': Fore.MAGENTA,
3033 'closed': Fore.CYAN,
3034 'error': Fore.WHITE,
3035 }.get(status, Fore.WHITE)
3036
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003037
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003038def get_cl_statuses(changes, fine_grained, max_processes=None):
3039 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003040
3041 If fine_grained is true, this will fetch CL statuses from the server.
3042 Otherwise, simply indicate if there's a matching url for the given branches.
3043
3044 If max_processes is specified, it is used as the maximum number of processes
3045 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3046 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003047
3048 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003049 """
3050 # Silence upload.py otherwise it becomes unwieldly.
3051 upload.verbosity = 0
3052
3053 if fine_grained:
3054 # Process one branch synchronously to work through authentication, then
3055 # spawn processes to process all the other branches in parallel.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003056 if changes:
3057 fetch = lambda cl: (cl, cl.GetStatus())
3058 yield fetch(changes[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003059
kmarshall3bff56b2016-06-06 18:31:47 -07003060 if not changes:
3061 # Exit early if there was only one branch to fetch.
3062 return
3063
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003064 changes_to_fetch = changes[1:]
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003065 pool = ThreadPool(
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003066 min(max_processes, len(changes_to_fetch))
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003067 if max_processes is not None
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003068 else len(changes_to_fetch))
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003069
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003070 fetched_cls = set()
3071 it = pool.imap_unordered(fetch, changes_to_fetch).__iter__()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003072 while True:
3073 try:
3074 row = it.next(timeout=5)
3075 except multiprocessing.TimeoutError:
3076 break
3077
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003078 fetched_cls.add(row[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003079 yield row
3080
3081 # Add any branches that failed to fetch.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003082 for cl in set(changes_to_fetch) - fetched_cls:
3083 yield (cl, 'error')
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003084
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003085 else:
3086 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003087 for cl in changes:
3088 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003089
rmistry@google.com2dd99862015-06-22 12:22:18 +00003090
3091def upload_branch_deps(cl, args):
3092 """Uploads CLs of local branches that are dependents of the current branch.
3093
3094 If the local branch dependency tree looks like:
3095 test1 -> test2.1 -> test3.1
3096 -> test3.2
3097 -> test2.2 -> test3.3
3098
3099 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3100 run on the dependent branches in this order:
3101 test2.1, test3.1, test3.2, test2.2, test3.3
3102
3103 Note: This function does not rebase your local dependent branches. Use it when
3104 you make a change to the parent branch that will not conflict with its
3105 dependent branches, and you would like their dependencies updated in
3106 Rietveld.
3107 """
3108 if git_common.is_dirty_git_tree('upload-branch-deps'):
3109 return 1
3110
3111 root_branch = cl.GetBranch()
3112 if root_branch is None:
3113 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3114 'Get on a branch!')
3115 if not cl.GetIssue() or not cl.GetPatchset():
3116 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3117 'patchset dependencies without an uploaded CL.')
3118
3119 branches = RunGit(['for-each-ref',
3120 '--format=%(refname:short) %(upstream:short)',
3121 'refs/heads'])
3122 if not branches:
3123 print('No local branches found.')
3124 return 0
3125
3126 # Create a dictionary of all local branches to the branches that are dependent
3127 # on it.
3128 tracked_to_dependents = collections.defaultdict(list)
3129 for b in branches.splitlines():
3130 tokens = b.split()
3131 if len(tokens) == 2:
3132 branch_name, tracked = tokens
3133 tracked_to_dependents[tracked].append(branch_name)
3134
vapiera7fbd5a2016-06-16 09:17:49 -07003135 print()
3136 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003137 dependents = []
3138 def traverse_dependents_preorder(branch, padding=''):
3139 dependents_to_process = tracked_to_dependents.get(branch, [])
3140 padding += ' '
3141 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003142 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003143 dependents.append(dependent)
3144 traverse_dependents_preorder(dependent, padding)
3145 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003146 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003147
3148 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003149 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003150 return 0
3151
vapiera7fbd5a2016-06-16 09:17:49 -07003152 print('This command will checkout all dependent branches and run '
3153 '"git cl upload".')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003154 ask_for_data('[Press enter to continue or ctrl-C to quit]')
3155
andybons@chromium.org962f9462016-02-03 20:00:42 +00003156 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003157 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003158 args.extend(['-t', 'Updated patchset dependency'])
3159
rmistry@google.com2dd99862015-06-22 12:22:18 +00003160 # Record all dependents that failed to upload.
3161 failures = {}
3162 # Go through all dependents, checkout the branch and upload.
3163 try:
3164 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003165 print()
3166 print('--------------------------------------')
3167 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003168 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003169 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003170 try:
3171 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003172 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003173 failures[dependent_branch] = 1
3174 except: # pylint: disable=W0702
3175 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003176 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003177 finally:
3178 # Swap back to the original root branch.
3179 RunGit(['checkout', '-q', root_branch])
3180
vapiera7fbd5a2016-06-16 09:17:49 -07003181 print()
3182 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003183 for dependent_branch in dependents:
3184 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003185 print(' %s : %s' % (dependent_branch, upload_status))
3186 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003187
3188 return 0
3189
3190
kmarshall3bff56b2016-06-06 18:31:47 -07003191def CMDarchive(parser, args):
3192 """Archives and deletes branches associated with closed changelists."""
3193 parser.add_option(
3194 '-j', '--maxjobs', action='store', type=int,
3195 help='The maximum number of jobs to use when retrieving review status')
3196 parser.add_option(
3197 '-f', '--force', action='store_true',
3198 help='Bypasses the confirmation prompt.')
3199
3200 auth.add_auth_options(parser)
3201 options, args = parser.parse_args(args)
3202 if args:
3203 parser.error('Unsupported args: %s' % ' '.join(args))
3204 auth_config = auth.extract_auth_config_from_options(options)
3205
3206 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3207 if not branches:
3208 return 0
3209
vapiera7fbd5a2016-06-16 09:17:49 -07003210 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07003211 changes = [Changelist(branchref=b, auth_config=auth_config)
3212 for b in branches.splitlines()]
3213 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3214 statuses = get_cl_statuses(changes,
3215 fine_grained=True,
3216 max_processes=options.maxjobs)
3217 proposal = [(cl.GetBranch(),
3218 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3219 for cl, status in statuses
3220 if status == 'closed']
3221 proposal.sort()
3222
3223 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003224 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003225 return 0
3226
3227 current_branch = GetCurrentBranch()
3228
vapiera7fbd5a2016-06-16 09:17:49 -07003229 print('\nBranches with closed issues that will be archived:\n')
3230 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
kmarshall3bff56b2016-06-06 18:31:47 -07003231 for next_item in proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003232 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003233
3234 if any(branch == current_branch for branch, _ in proposal):
3235 print('You are currently on a branch \'%s\' which is associated with a '
3236 'closed codereview issue, so archive cannot proceed. Please '
3237 'checkout another branch and run this command again.' %
3238 current_branch)
3239 return 1
3240
3241 if not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003242 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3243 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003244 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003245 return 1
3246
3247 for branch, tagname in proposal:
3248 RunGit(['tag', tagname, branch])
3249 RunGit(['branch', '-D', branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003250 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003251
3252 return 0
3253
3254
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003255def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003256 """Show status of changelists.
3257
3258 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003259 - Red not sent for review or broken
3260 - Blue waiting for review
3261 - Yellow waiting for you to reply to review
3262 - Green LGTM'ed
3263 - Magenta in the commit queue
3264 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003265
3266 Also see 'git cl comments'.
3267 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003268 parser.add_option('--field',
3269 help='print only specific field (desc|id|patch|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003270 parser.add_option('-f', '--fast', action='store_true',
3271 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003272 parser.add_option(
3273 '-j', '--maxjobs', action='store', type=int,
3274 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003275
3276 auth.add_auth_options(parser)
3277 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003278 if args:
3279 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003280 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003281
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003282 if options.field:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003283 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003284 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003285 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003286 elif options.field == 'id':
3287 issueid = cl.GetIssue()
3288 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003289 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003290 elif options.field == 'patch':
3291 patchset = cl.GetPatchset()
3292 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003293 print(patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003294 elif options.field == 'url':
3295 url = cl.GetIssueURL()
3296 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003297 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003298 return 0
3299
3300 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3301 if not branches:
3302 print('No local branch found.')
3303 return 0
3304
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003305 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003306 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003307 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003308 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003309 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003310 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003311 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003312
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003313 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003314 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
3315 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3316 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003317 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003318 c, status = output.next()
3319 branch_statuses[c.GetBranch()] = status
3320 status = branch_statuses.pop(branch)
3321 url = cl.GetIssueURL()
3322 if url and (not status or status == 'error'):
3323 # The issue probably doesn't exist anymore.
3324 url += ' (broken)'
3325
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003326 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003327 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003328 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003329 color = ''
3330 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003331 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07003332 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003333 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07003334 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003335
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003336 cl = Changelist(auth_config=auth_config)
vapiera7fbd5a2016-06-16 09:17:49 -07003337 print()
3338 print('Current branch:',)
3339 print(cl.GetBranch())
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003340 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003341 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003342 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003343 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003344 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003345 print('Issue description:')
3346 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003347 return 0
3348
3349
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003350def colorize_CMDstatus_doc():
3351 """To be called once in main() to add colors to git cl status help."""
3352 colors = [i for i in dir(Fore) if i[0].isupper()]
3353
3354 def colorize_line(line):
3355 for color in colors:
3356 if color in line.upper():
3357 # Extract whitespaces first and the leading '-'.
3358 indent = len(line) - len(line.lstrip(' ')) + 1
3359 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3360 return line
3361
3362 lines = CMDstatus.__doc__.splitlines()
3363 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3364
3365
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003366@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003367def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003368 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003369
3370 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003371 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003372 parser.add_option('-r', '--reverse', action='store_true',
3373 help='Lookup the branch(es) for the specified issues. If '
3374 'no issues are specified, all branches with mapped '
3375 'issues will be listed.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003376 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003377 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003378 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003379
dnj@chromium.org406c4402015-03-03 17:22:28 +00003380 if options.reverse:
3381 branches = RunGit(['for-each-ref', 'refs/heads',
3382 '--format=%(refname:short)']).splitlines()
3383
3384 # Reverse issue lookup.
3385 issue_branch_map = {}
3386 for branch in branches:
3387 cl = Changelist(branchref=branch)
3388 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
3389 if not args:
3390 args = sorted(issue_branch_map.iterkeys())
3391 for issue in args:
3392 if not issue:
3393 continue
vapiera7fbd5a2016-06-16 09:17:49 -07003394 print('Branch for issue number %s: %s' % (
3395 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
dnj@chromium.org406c4402015-03-03 17:22:28 +00003396 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003397 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003398 if len(args) > 0:
3399 try:
3400 issue = int(args[0])
3401 except ValueError:
3402 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003403 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003404 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07003405 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003406 return 0
3407
3408
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003409def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003410 """Shows or posts review comments for any changelist."""
3411 parser.add_option('-a', '--add-comment', dest='comment',
3412 help='comment to add to an issue')
3413 parser.add_option('-i', dest='issue',
3414 help="review issue id (defaults to current issue)")
smut@google.comc85ac942015-09-15 16:34:43 +00003415 parser.add_option('-j', '--json-file',
3416 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003417 auth.add_auth_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003418 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003419 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003420
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003421 issue = None
3422 if options.issue:
3423 try:
3424 issue = int(options.issue)
3425 except ValueError:
3426 DieWithError('A review issue id is expected to be a number')
3427
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00003428 cl = Changelist(issue=issue, codereview='rietveld', auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003429
3430 if options.comment:
3431 cl.AddComment(options.comment)
3432 return 0
3433
3434 data = cl.GetIssueProperties()
smut@google.comc85ac942015-09-15 16:34:43 +00003435 summary = []
maruel@chromium.org5cab2d32014-11-11 18:32:41 +00003436 for message in sorted(data.get('messages', []), key=lambda x: x['date']):
smut@google.comc85ac942015-09-15 16:34:43 +00003437 summary.append({
3438 'date': message['date'],
3439 'lgtm': False,
3440 'message': message['text'],
3441 'not_lgtm': False,
3442 'sender': message['sender'],
3443 })
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003444 if message['disapproval']:
3445 color = Fore.RED
smut@google.comc85ac942015-09-15 16:34:43 +00003446 summary[-1]['not lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003447 elif message['approval']:
3448 color = Fore.GREEN
smut@google.comc85ac942015-09-15 16:34:43 +00003449 summary[-1]['lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003450 elif message['sender'] == data['owner_email']:
3451 color = Fore.MAGENTA
3452 else:
3453 color = Fore.BLUE
vapiera7fbd5a2016-06-16 09:17:49 -07003454 print('\n%s%s %s%s' % (
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003455 color, message['date'].split('.', 1)[0], message['sender'],
vapiera7fbd5a2016-06-16 09:17:49 -07003456 Fore.RESET))
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003457 if message['text'].strip():
vapiera7fbd5a2016-06-16 09:17:49 -07003458 print('\n'.join(' ' + l for l in message['text'].splitlines()))
smut@google.comc85ac942015-09-15 16:34:43 +00003459 if options.json_file:
3460 with open(options.json_file, 'wb') as f:
3461 json.dump(summary, f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003462 return 0
3463
3464
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003465@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003466def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003467 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003468 parser.add_option('-d', '--display', action='store_true',
3469 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003470 parser.add_option('-n', '--new-description',
3471 help='New description to set for this issue (- for stdin)')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003472
3473 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003474 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003475 options, args = parser.parse_args(args)
3476 _process_codereview_select_options(parser, options)
3477
3478 target_issue = None
3479 if len(args) > 0:
martiniss6eda05f2016-06-30 10:18:35 -07003480 target_issue = ParseIssueNumberArgument(args[0])
3481 if not target_issue.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003482 parser.print_help()
3483 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003484
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003485 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003486
martiniss6eda05f2016-06-30 10:18:35 -07003487 kwargs = {
3488 'auth_config': auth_config,
3489 'codereview': options.forced_codereview,
3490 }
3491 if target_issue:
3492 kwargs['issue'] = target_issue.issue
3493 if options.forced_codereview == 'rietveld':
3494 kwargs['rietveld_server'] = target_issue.hostname
3495
3496 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003497
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003498 if not cl.GetIssue():
3499 DieWithError('This branch has no associated changelist.')
3500 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003501
smut@google.com34fb6b12015-07-13 20:03:26 +00003502 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003503 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003504 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003505
3506 if options.new_description:
3507 text = options.new_description
3508 if text == '-':
3509 text = '\n'.join(l.rstrip() for l in sys.stdin)
3510
3511 description.set_description(text)
3512 else:
3513 description.prompt()
3514
wychen@chromium.org063e4e52015-04-03 06:51:44 +00003515 if cl.GetDescription() != description.description:
3516 cl.UpdateDescription(description.description)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003517 return 0
3518
3519
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003520def CreateDescriptionFromLog(args):
3521 """Pulls out the commit log to use as a base for the CL description."""
3522 log_args = []
3523 if len(args) == 1 and not args[0].endswith('.'):
3524 log_args = [args[0] + '..']
3525 elif len(args) == 1 and args[0].endswith('...'):
3526 log_args = [args[0][:-1]]
3527 elif len(args) == 2:
3528 log_args = [args[0] + '..' + args[1]]
3529 else:
3530 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00003531 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003532
3533
thestig@chromium.org44202a22014-03-11 19:22:18 +00003534def CMDlint(parser, args):
3535 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003536 parser.add_option('--filter', action='append', metavar='-x,+y',
3537 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003538 auth.add_auth_options(parser)
3539 options, args = parser.parse_args(args)
3540 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003541
3542 # Access to a protected member _XX of a client class
3543 # pylint: disable=W0212
3544 try:
3545 import cpplint
3546 import cpplint_chromium
3547 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003548 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003549 return 1
3550
3551 # Change the current working directory before calling lint so that it
3552 # shows the correct base.
3553 previous_cwd = os.getcwd()
3554 os.chdir(settings.GetRoot())
3555 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003556 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003557 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
3558 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003559 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003560 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003561 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003562
3563 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003564 command = args + files
3565 if options.filter:
3566 command = ['--filter=' + ','.join(options.filter)] + command
3567 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003568
3569 white_regex = re.compile(settings.GetLintRegex())
3570 black_regex = re.compile(settings.GetLintIgnoreRegex())
3571 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3572 for filename in filenames:
3573 if white_regex.match(filename):
3574 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003575 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003576 else:
3577 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3578 extra_check_functions)
3579 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003580 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003581 finally:
3582 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003583 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003584 if cpplint._cpplint_state.error_count != 0:
3585 return 1
3586 return 0
3587
3588
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003589def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003590 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003591 parser.add_option('-u', '--upload', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003592 help='Run upload hook instead of the push/dcommit hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003593 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003594 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003595 auth.add_auth_options(parser)
3596 options, args = parser.parse_args(args)
3597 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003598
sbc@chromium.org71437c02015-04-09 19:29:40 +00003599 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07003600 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003601 return 1
3602
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003603 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003604 if args:
3605 base_branch = args[0]
3606 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00003607 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003608 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003609
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00003610 cl.RunHook(
3611 committing=not options.upload,
3612 may_prompt=False,
3613 verbose=options.verbose,
3614 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00003615 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003616
3617
tandrii@chromium.org65874e12016-03-04 12:03:02 +00003618def GenerateGerritChangeId(message):
3619 """Returns Ixxxxxx...xxx change id.
3620
3621 Works the same way as
3622 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
3623 but can be called on demand on all platforms.
3624
3625 The basic idea is to generate git hash of a state of the tree, original commit
3626 message, author/committer info and timestamps.
3627 """
3628 lines = []
3629 tree_hash = RunGitSilent(['write-tree'])
3630 lines.append('tree %s' % tree_hash.strip())
3631 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
3632 if code == 0:
3633 lines.append('parent %s' % parent.strip())
3634 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
3635 lines.append('author %s' % author.strip())
3636 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
3637 lines.append('committer %s' % committer.strip())
3638 lines.append('')
3639 # Note: Gerrit's commit-hook actually cleans message of some lines and
3640 # whitespace. This code is not doing this, but it clearly won't decrease
3641 # entropy.
3642 lines.append(message)
3643 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
3644 stdin='\n'.join(lines))
3645 return 'I%s' % change_hash.strip()
3646
3647
wittman@chromium.org455dc922015-01-26 20:15:50 +00003648def GetTargetRef(remote, remote_branch, target_branch, pending_prefix):
3649 """Computes the remote branch ref to use for the CL.
3650
3651 Args:
3652 remote (str): The git remote for the CL.
3653 remote_branch (str): The git remote branch for the CL.
3654 target_branch (str): The target branch specified by the user.
3655 pending_prefix (str): The pending prefix from the settings.
3656 """
3657 if not (remote and remote_branch):
3658 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003659
wittman@chromium.org455dc922015-01-26 20:15:50 +00003660 if target_branch:
3661 # Cannonicalize branch references to the equivalent local full symbolic
3662 # refs, which are then translated into the remote full symbolic refs
3663 # below.
3664 if '/' not in target_branch:
3665 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
3666 else:
3667 prefix_replacements = (
3668 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
3669 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
3670 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
3671 )
3672 match = None
3673 for regex, replacement in prefix_replacements:
3674 match = re.search(regex, target_branch)
3675 if match:
3676 remote_branch = target_branch.replace(match.group(0), replacement)
3677 break
3678 if not match:
3679 # This is a branch path but not one we recognize; use as-is.
3680 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00003681 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
3682 # Handle the refs that need to land in different refs.
3683 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003684
wittman@chromium.org455dc922015-01-26 20:15:50 +00003685 # Create the true path to the remote branch.
3686 # Does the following translation:
3687 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
3688 # * refs/remotes/origin/master -> refs/heads/master
3689 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
3690 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
3691 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
3692 elif remote_branch.startswith('refs/remotes/%s/' % remote):
3693 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
3694 'refs/heads/')
3695 elif remote_branch.startswith('refs/remotes/branch-heads'):
3696 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
3697 # If a pending prefix exists then replace refs/ with it.
3698 if pending_prefix:
3699 remote_branch = remote_branch.replace('refs/', pending_prefix)
3700 return remote_branch
3701
3702
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003703def cleanup_list(l):
3704 """Fixes a list so that comma separated items are put as individual items.
3705
3706 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
3707 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
3708 """
3709 items = sum((i.split(',') for i in l), [])
3710 stripped_items = (i.strip() for i in items)
3711 return sorted(filter(None, stripped_items))
3712
3713
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003714@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003715def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00003716 """Uploads the current changelist to codereview.
3717
3718 Can skip dependency patchset uploads for a branch by running:
3719 git config branch.branch_name.skip-deps-uploads True
3720 To unset run:
3721 git config --unset branch.branch_name.skip-deps-uploads
3722 Can also set the above globally by using the --global flag.
3723 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00003724 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3725 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00003726 parser.add_option('--bypass-watchlists', action='store_true',
3727 dest='bypass_watchlists',
3728 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003729 parser.add_option('-f', action='store_true', dest='force',
3730 help="force yes to questions (don't prompt)")
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00003731 parser.add_option('-m', dest='message', help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07003732 parser.add_option('-b', '--bug',
3733 help='pre-populate the bug number(s) for this issue. '
3734 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07003735 parser.add_option('--message-file', dest='message_file',
3736 help='file which contains message for patchset')
andybons@chromium.org962f9462016-02-03 20:00:42 +00003737 parser.add_option('-t', dest='title',
3738 help='title for patchset (Rietveld only)')
ukai@chromium.orge8077812012-02-03 03:41:46 +00003739 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003740 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003741 help='reviewer email addresses')
3742 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003743 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00003744 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00003745 parser.add_option('-s', '--send-mail', action='store_true',
ukai@chromium.orge8077812012-02-03 03:41:46 +00003746 help='send email to reviewer immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003747 parser.add_option('--emulate_svn_auto_props',
3748 '--emulate-svn-auto-props',
3749 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00003750 dest="emulate_svn_auto_props",
3751 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00003752 parser.add_option('-c', '--use-commit-queue', action='store_true',
3753 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003754 parser.add_option('--private', action='store_true',
3755 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00003756 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00003757 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00003758 metavar='TARGET',
3759 help='Apply CL to remote ref TARGET. ' +
3760 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00003761 parser.add_option('--squash', action='store_true',
3762 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003763 parser.add_option('--no-squash', action='store_true',
3764 help='Don\'t squash multiple commits into one ' +
3765 '(Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00003766 parser.add_option('--email', default=None,
3767 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00003768 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
3769 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00003770 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
3771 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00003772 help='Send the patchset to do a CQ dry run right after '
3773 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003774 parser.add_option('--dependencies', action='store_true',
3775 help='Uploads CLs of all the local branches that depend on '
3776 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00003777
rmistry@google.com2dd99862015-06-22 12:22:18 +00003778 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00003779 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003780 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003781 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003782 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003783 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003784 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003785
sbc@chromium.org71437c02015-04-09 19:29:40 +00003786 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00003787 return 1
3788
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00003789 options.reviewers = cleanup_list(options.reviewers)
3790 options.cc = cleanup_list(options.cc)
3791
tandriib80458a2016-06-23 12:20:07 -07003792 if options.message_file:
3793 if options.message:
3794 parser.error('only one of --message and --message-file allowed.')
3795 options.message = gclient_utils.FileRead(options.message_file)
3796 options.message_file = None
3797
tandrii4d0545a2016-07-06 03:56:49 -07003798 if options.cq_dry_run and options.use_commit_queue:
3799 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
3800
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00003801 # For sanity of test expectations, do this otherwise lazy-loading *now*.
3802 settings.GetIsGerrit()
3803
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003804 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00003805 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00003806
3807
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003808def IsSubmoduleMergeCommit(ref):
3809 # When submodules are added to the repo, we expect there to be a single
3810 # non-git-svn merge commit at remote HEAD with a signature comment.
3811 pattern = '^SVN changes up to revision [0-9]*$'
szager@chromium.orge84b7542012-06-15 21:26:58 +00003812 cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003813 return RunGit(cmd) != ''
3814
3815
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003816def SendUpstream(parser, args, cmd):
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00003817 """Common code for CMDland and CmdDCommit
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003818
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003819 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
3820 upstream and closes the issue automatically and atomically.
3821
3822 Otherwise (in case of Rietveld):
3823 Squashes branch into a single commit.
3824 Updates changelog with metadata (e.g. pointer to review).
3825 Pushes/dcommits the code upstream.
3826 Updates review and closes.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003827 """
3828 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
3829 help='bypass upload presubmit hook')
3830 parser.add_option('-m', dest='message',
3831 help="override review description")
3832 parser.add_option('-f', action='store_true', dest='force',
3833 help="force yes to questions (don't prompt)")
3834 parser.add_option('-c', dest='contributor',
3835 help="external contributor for patch (appended to " +
3836 "description and used as author for git). Should be " +
3837 "formatted as 'First Last <email@example.com>'")
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00003838 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003839 auth.add_auth_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003840 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003841 auth_config = auth.extract_auth_config_from_options(options)
3842
3843 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003844
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00003845 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
3846 if cl.IsGerrit():
3847 if options.message:
3848 # This could be implemented, but it requires sending a new patch to
3849 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
3850 # Besides, Gerrit has the ability to change the commit message on submit
3851 # automatically, thus there is no need to support this option (so far?).
3852 parser.error('-m MESSAGE option is not supported for Gerrit.')
3853 if options.contributor:
3854 parser.error(
3855 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
3856 'Before uploading a commit to Gerrit, ensure it\'s author field is '
3857 'the contributor\'s "name <email>". If you can\'t upload such a '
3858 'commit for review, contact your repository admin and request'
3859 '"Forge-Author" permission.')
3860 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
3861 options.verbose)
3862
iannucci@chromium.org5724c962014-04-11 09:32:56 +00003863 current = cl.GetBranch()
3864 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
3865 if not settings.GetIsGitSvn() and remote == '.':
vapiera7fbd5a2016-06-16 09:17:49 -07003866 print()
3867 print('Attempting to push branch %r into another local branch!' % current)
3868 print()
3869 print('Either reparent this branch on top of origin/master:')
3870 print(' git reparent-branch --root')
3871 print()
3872 print('OR run `git rebase-update` if you think the parent branch is ')
3873 print('already committed.')
3874 print()
3875 print(' Current parent: %r' % upstream_branch)
iannucci@chromium.org5724c962014-04-11 09:32:56 +00003876 return 1
3877
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003878 if not args or cmd == 'land':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003879 # Default to merging against our best guess of the upstream branch.
3880 args = [cl.GetUpstreamBranch()]
3881
maruel@chromium.org13f623c2011-07-22 16:02:23 +00003882 if options.contributor:
3883 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
vapiera7fbd5a2016-06-16 09:17:49 -07003884 print("Please provide contibutor as 'First Last <email@example.com>'")
maruel@chromium.org13f623c2011-07-22 16:02:23 +00003885 return 1
3886
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003887 base_branch = args[0]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003888 base_has_submodules = IsSubmoduleMergeCommit(base_branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003889
sbc@chromium.org71437c02015-04-09 19:29:40 +00003890 if git_common.is_dirty_git_tree(cmd):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003891 return 1
3892
3893 # This rev-list syntax means "show all commits not in my branch that
3894 # are in base_branch".
3895 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
3896 base_branch]).splitlines()
3897 if upstream_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07003898 print('Base branch "%s" has %d commits '
3899 'not in this branch.' % (base_branch, len(upstream_commits)))
3900 print('Run "git merge %s" before attempting to %s.' % (base_branch, cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003901 return 1
3902
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003903 # This is the revision `svn dcommit` will commit on top of.
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003904 svn_head = None
3905 if cmd == 'dcommit' or base_has_submodules:
3906 svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
3907 '--pretty=format:%H'])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003908
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003909 if cmd == 'dcommit':
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003910 # If the base_head is a submodule merge commit, the first parent of the
3911 # base_head should be a git-svn commit, which is what we're interested in.
3912 base_svn_head = base_branch
3913 if base_has_submodules:
3914 base_svn_head += '^1'
3915
3916 extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003917 if extra_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07003918 print('This branch has %d additional commits not upstreamed yet.'
3919 % len(extra_commits.splitlines()))
3920 print('Upstream "%s" or rebase this branch on top of the upstream trunk '
3921 'before attempting to %s.' % (base_branch, cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003922 return 1
3923
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003924 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003925 if not options.bypass_hooks:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00003926 author = None
3927 if options.contributor:
3928 author = re.search(r'\<(.*)\>', options.contributor).group(1)
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003929 hook_results = cl.RunHook(
3930 committing=True,
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003931 may_prompt=not options.force,
3932 verbose=options.verbose,
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003933 change=cl.GetChange(merge_base, author))
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00003934 if not hook_results.should_continue():
3935 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003936
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003937 # Check the tree status if the tree status URL is set.
3938 status = GetTreeStatus()
3939 if 'closed' == status:
3940 print('The tree is closed. Please wait for it to reopen. Use '
3941 '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
3942 return 1
3943 elif 'unknown' == status:
3944 print('Unable to determine tree status. Please verify manually and '
3945 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
3946 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003947
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003948 change_desc = ChangeDescription(options.message)
3949 if not change_desc.description and cl.GetIssue():
3950 change_desc = ChangeDescription(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003951
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003952 if not change_desc.description:
erg@chromium.org1a173982012-08-29 20:43:05 +00003953 if not cl.GetIssue() and options.bypass_hooks:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003954 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
erg@chromium.org1a173982012-08-29 20:43:05 +00003955 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003956 print('No description set.')
3957 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
erg@chromium.org1a173982012-08-29 20:43:05 +00003958 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003959
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003960 # Keep a separate copy for the commit message, because the commit message
3961 # contains the link to the Rietveld issue, while the Rietveld message contains
3962 # the commit viewvc url.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003963 # Keep a separate copy for the commit message.
3964 if cl.GetIssue():
maruel@chromium.orgcf087782013-07-23 13:08:48 +00003965 change_desc.update_reviewers(cl.GetApprovingReviewers())
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003966
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003967 commit_desc = ChangeDescription(change_desc.description)
maruel@chromium.orgcc73ad62011-07-06 17:39:26 +00003968 if cl.GetIssue():
smut@google.com4c61dcc2015-06-08 22:31:29 +00003969 # Xcode won't linkify this URL unless there is a non-whitespace character
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +00003970 # after it. Add a period on a new line to circumvent this. Also add a space
3971 # before the period to make sure that Gitiles continues to correctly resolve
3972 # the URL.
3973 commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003974 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003975 commit_desc.append_footer('Patch from %s.' % options.contributor)
3976
agable@chromium.orgeec3ea32013-08-15 20:31:39 +00003977 print('Description:')
3978 print(commit_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003979
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00003980 branches = [merge_base, cl.GetBranchRef()]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003981 if not options.force:
iannucci@chromium.org79540052012-10-19 23:15:26 +00003982 print_stats(options.similarity, options.find_copies, branches)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003983
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003984 # We want to squash all this branch's commits into one commit with the proper
3985 # description. We do this by doing a "reset --soft" to the base branch (which
3986 # keeps the working copy the same), then dcommitting that. If origin/master
3987 # has a submodule merge commit, we'll also need to cherry-pick the squashed
3988 # commit onto a branch based on the git-svn head.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003989 MERGE_BRANCH = 'git-cl-commit'
szager@chromium.org9bb85e22012-06-13 20:28:23 +00003990 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
3991 # Delete the branches if they exist.
3992 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
3993 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
3994 result = RunGitWithCode(showref_cmd)
3995 if result[0] == 0:
3996 RunGit(['branch', '-D', branch])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003997
3998 # We might be in a directory that's present in this branch but not in the
3999 # trunk. Move up to the top of the tree so that git commands that expect a
4000 # valid CWD won't fail after we check out the merge branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004001 rel_base_path = settings.GetRelativeRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002 if rel_base_path:
4003 os.chdir(rel_base_path)
4004
4005 # Stuff our change into the merge branch.
4006 # We wrap in a try...finally block so if anything goes wrong,
4007 # we clean up the branches.
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004008 retcode = -1
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004009 pushed_to_pending = False
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004010 pending_ref = None
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004011 revision = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004012 try:
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00004013 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004014 RunGit(['reset', '--soft', merge_base])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004015 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004016 RunGit(
4017 [
4018 'commit', '--author', options.contributor,
4019 '-m', commit_desc.description,
4020 ])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004021 else:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004022 RunGit(['commit', '-m', commit_desc.description])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004023 if base_has_submodules:
4024 cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip()
4025 RunGit(['branch', CHERRY_PICK_BRANCH, svn_head])
4026 RunGit(['checkout', CHERRY_PICK_BRANCH])
4027 RunGit(['cherry-pick', cherry_pick_commit])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004028 if cmd == 'land':
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004029 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004030 mirror = settings.GetGitMirror(remote)
4031 pushurl = mirror.url if mirror else remote
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004032 pending_prefix = settings.GetPendingRefPrefix()
4033 if not pending_prefix or branch.startswith(pending_prefix):
4034 # If not using refs/pending/heads/* at all, or target ref is already set
4035 # to pending, then push to the target ref directly.
4036 retcode, output = RunGitWithCode(
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004037 ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004038 pushed_to_pending = pending_prefix and branch.startswith(pending_prefix)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004039 else:
4040 # Cherry-pick the change on top of pending ref and then push it.
4041 assert branch.startswith('refs/'), branch
4042 assert pending_prefix[-1] == '/', pending_prefix
4043 pending_ref = pending_prefix + branch[len('refs/'):]
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004044 retcode, output = PushToGitPending(pushurl, pending_ref, branch)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004045 pushed_to_pending = (retcode == 0)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004046 if retcode == 0:
4047 revision = RunGit(['rev-parse', 'HEAD']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004048 else:
4049 # dcommit the merge branch.
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00004050 cmd_args = [
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00004051 'svn', 'dcommit',
4052 '-C%s' % options.similarity,
4053 '--no-rebase', '--rmdir',
4054 ]
4055 if settings.GetForceHttpsCommitUrl():
4056 # Allow forcing https commit URLs for some projects that don't allow
4057 # committing to http URLs (like Google Code).
4058 remote_url = cl.GetGitSvnRemoteUrl()
4059 if urlparse.urlparse(remote_url).scheme == 'http':
4060 remote_url = remote_url.replace('http://', 'https://')
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00004061 cmd_args.append('--commit-url=%s' % remote_url)
4062 _, output = RunGitWithCode(cmd_args)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004063 if 'Committed r' in output:
4064 revision = re.match(
4065 '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
4066 logging.debug(output)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004067 finally:
4068 # And then swap back to the original branch and clean up.
4069 RunGit(['checkout', '-q', cl.GetBranch()])
4070 RunGit(['branch', '-D', MERGE_BRANCH])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004071 if base_has_submodules:
4072 RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004073
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004074 if not revision:
vapiera7fbd5a2016-06-16 09:17:49 -07004075 print('Failed to push. If this persists, please file a bug.')
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004076 return 1
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004077
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004078 killed = False
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004079 if pushed_to_pending:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004080 try:
4081 revision = WaitForRealCommit(remote, revision, base_branch, branch)
4082 # We set pushed_to_pending to False, since it made it all the way to the
4083 # real ref.
4084 pushed_to_pending = False
4085 except KeyboardInterrupt:
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004086 killed = True
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004087
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004088 if cl.GetIssue():
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004089 to_pending = ' to pending queue' if pushed_to_pending else ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004090 viewvc_url = settings.GetViewVCUrl()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004091 if not to_pending:
4092 if viewvc_url and revision:
4093 change_desc.append_footer(
4094 'Committed: %s%s' % (viewvc_url, revision))
4095 elif revision:
4096 change_desc.append_footer('Committed: %s' % (revision,))
vapiera7fbd5a2016-06-16 09:17:49 -07004097 print('Closing issue '
4098 '(you may be prompted for your codereview password)...')
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004099 cl.UpdateDescription(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004100 cl.CloseIssue()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004101 props = cl.GetIssueProperties()
sadrul@chromium.org34b5d822013-02-18 01:39:24 +00004102 patch_num = len(props['patchsets'])
rmistry@google.com52d224a2014-08-27 14:44:41 +00004103 comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
mark@chromium.org782570c2014-09-26 21:48:02 +00004104 patch_num, props['patchsets'][-1], to_pending, revision)
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004105 if options.bypass_hooks:
4106 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4107 else:
4108 comment += ' (presubmit successful).'
iannucci@chromium.orgb85a3162013-01-26 01:11:13 +00004109 cl.RpcServer().add_comment(cl.GetIssue(), comment)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004110
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004111 if pushed_to_pending:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004112 _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
vapiera7fbd5a2016-06-16 09:17:49 -07004113 print('The commit is in the pending queue (%s).' % pending_ref)
4114 print('It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
4115 'footer.' % branch)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004116
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004117 hook = POSTUPSTREAM_HOOK_PATTERN % cmd
4118 if os.path.isfile(hook):
4119 RunCommand([hook, merge_base], error_ok=True)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004120
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004121 return 1 if killed else 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004122
4123
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004124def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
vapiera7fbd5a2016-06-16 09:17:49 -07004125 print()
4126 print('Waiting for commit to be landed on %s...' % real_ref)
4127 print('(If you are impatient, you may Ctrl-C once without harm)')
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004128 target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
4129 current_rev = RunGit(['rev-parse', local_base_ref]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004130 mirror = settings.GetGitMirror(remote)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004131
4132 loop = 0
4133 while True:
4134 sys.stdout.write('fetching (%d)... \r' % loop)
4135 sys.stdout.flush()
4136 loop += 1
4137
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004138 if mirror:
4139 mirror.populate()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004140 RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID)
4141 to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
4142 commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)])
4143 for commit in commits.splitlines():
4144 if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree:
vapiera7fbd5a2016-06-16 09:17:49 -07004145 print('Found commit on %s' % real_ref)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004146 return commit
4147
4148 current_rev = to_rev
4149
4150
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004151def PushToGitPending(remote, pending_ref, upstream_ref):
4152 """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
4153
4154 Returns:
4155 (retcode of last operation, output log of last operation).
4156 """
4157 assert pending_ref.startswith('refs/'), pending_ref
4158 local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):]
4159 cherry = RunGit(['rev-parse', 'HEAD']).strip()
4160 code = 0
4161 out = ''
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004162 max_attempts = 3
4163 attempts_left = max_attempts
4164 while attempts_left:
4165 if attempts_left != max_attempts:
vapiera7fbd5a2016-06-16 09:17:49 -07004166 print('Retrying, %d attempts left...' % (attempts_left - 1,))
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004167 attempts_left -= 1
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004168
4169 # Fetch. Retry fetch errors.
vapiera7fbd5a2016-06-16 09:17:49 -07004170 print('Fetching pending ref %s...' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004171 code, out = RunGitWithCode(
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004172 ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004173 if code:
vapiera7fbd5a2016-06-16 09:17:49 -07004174 print('Fetch failed with exit code %d.' % code)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004175 if out.strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004176 print(out.strip())
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004177 continue
4178
4179 # Try to cherry pick. Abort on merge conflicts.
vapiera7fbd5a2016-06-16 09:17:49 -07004180 print('Cherry-picking commit on top of pending ref...')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004181 RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004182 code, out = RunGitWithCode(['cherry-pick', cherry])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004183 if code:
vapiera7fbd5a2016-06-16 09:17:49 -07004184 print('Your patch doesn\'t apply cleanly to ref \'%s\', '
4185 'the following files have merge conflicts:' % pending_ref)
4186 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
4187 print('Please rebase your patch and try again.')
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004188 RunGitWithCode(['cherry-pick', '--abort'])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004189 return code, out
4190
4191 # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
vapiera7fbd5a2016-06-16 09:17:49 -07004192 print('Pushing commit to %s... It can take a while.' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004193 code, out = RunGitWithCode(
4194 ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
4195 if code == 0:
4196 # Success.
vapiera7fbd5a2016-06-16 09:17:49 -07004197 print('Commit pushed to pending ref successfully!')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004198 return code, out
4199
vapiera7fbd5a2016-06-16 09:17:49 -07004200 print('Push failed with exit code %d.' % code)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004201 if out.strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004202 print(out.strip())
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004203 if IsFatalPushFailure(out):
vapiera7fbd5a2016-06-16 09:17:49 -07004204 print('Fatal push error. Make sure your .netrc credentials and git '
4205 'user.email are correct and you have push access to the repo.')
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004206 return code, out
4207
vapiera7fbd5a2016-06-16 09:17:49 -07004208 print('All attempts to push to pending ref failed.')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004209 return code, out
4210
4211
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004212def IsFatalPushFailure(push_stdout):
4213 """True if retrying push won't help."""
4214 return '(prohibited by Gerrit)' in push_stdout
4215
4216
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004217@subcommand.usage('[upstream branch to apply against]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004218def CMDdcommit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004219 """Commits the current changelist via git-svn."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004220 if not settings.GetIsGitSvn():
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004221 if git_footers.get_footer_svn_id():
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004222 # If it looks like previous commits were mirrored with git-svn.
4223 message = """This repository appears to be a git-svn mirror, but no
4224upstream SVN master is set. You probably need to run 'git auto-svn' once."""
4225 else:
4226 message = """This doesn't appear to be an SVN repository.
4227If your project has a true, writeable git repository, you probably want to run
4228'git cl land' instead.
4229If your project has a git mirror of an upstream SVN master, you probably need
4230to run 'git svn init'.
4231
4232Using the wrong command might cause your commit to appear to succeed, and the
4233review to be closed, without actually landing upstream. If you choose to
4234proceed, please verify that the commit lands upstream as expected."""
thakis@chromium.orgcde3bb62011-01-20 01:16:14 +00004235 print(message)
maruel@chromium.org90541732011-04-01 17:54:18 +00004236 ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
tandrii3bb82ff2016-06-17 07:36:36 -07004237 # TODO(tandrii): kill this post SVN migration with
4238 # https://codereview.chromium.org/2076683002
4239 print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n'
4240 'Please let us know of this project you are committing to:'
4241 ' http://crbug.com/600451')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004242 return SendUpstream(parser, args, 'dcommit')
4243
4244
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004245@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004246def CMDland(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004247 """Commits the current changelist via git."""
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004248 if settings.GetIsGitSvn() or git_footers.get_footer_svn_id():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004249 print('This appears to be an SVN repository.')
4250 print('Are you sure you didn\'t mean \'git cl dcommit\'?')
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004251 print('(Ignore if this is the first commit after migrating from svn->git)')
maruel@chromium.org90541732011-04-01 17:54:18 +00004252 ask_for_data('[Press enter to push or ctrl-C to quit]')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004253 return SendUpstream(parser, args, 'land')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004254
4255
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004256@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004257def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004258 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004259 parser.add_option('-b', dest='newbranch',
4260 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004261 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004262 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004263 parser.add_option('-d', '--directory', action='store', metavar='DIR',
4264 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004265 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004266 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004267 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004268 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004269 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004270 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004271
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004272
4273 group = optparse.OptionGroup(
4274 parser,
4275 'Options for continuing work on the current issue uploaded from a '
4276 'different clone (e.g. different machine). Must be used independently '
4277 'from the other options. No issue number should be specified, and the '
4278 'branch must have an issue number associated with it')
4279 group.add_option('--reapply', action='store_true', dest='reapply',
4280 help='Reset the branch and reapply the issue.\n'
4281 'CAUTION: This will undo any local changes in this '
4282 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004283
4284 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004285 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004286 parser.add_option_group(group)
4287
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004288 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004289 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004290 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004291 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004292 auth_config = auth.extract_auth_config_from_options(options)
4293
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004294
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004295 if options.reapply :
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004296 if options.newbranch:
4297 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004298 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004299 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004300
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004301 cl = Changelist(auth_config=auth_config,
4302 codereview=options.forced_codereview)
4303 if not cl.GetIssue():
4304 parser.error('current branch must have an associated issue')
4305
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004306 upstream = cl.GetUpstreamBranch()
4307 if upstream == None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004308 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004309
4310 RunGit(['reset', '--hard', upstream])
4311 if options.pull:
4312 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004313
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004314 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4315 options.directory)
4316
4317 if len(args) != 1 or not args[0]:
4318 parser.error('Must specify issue number or url')
4319
4320 # We don't want uncommitted changes mixed up with the patch.
4321 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004322 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004323
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004324 if options.newbranch:
4325 if options.force:
4326 RunGit(['branch', '-D', options.newbranch],
4327 stderr=subprocess2.PIPE, error_ok=True)
4328 RunGit(['new-branch', options.newbranch])
4329
4330 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
4331
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004332 if cl.IsGerrit():
4333 if options.reject:
4334 parser.error('--reject is not supported with Gerrit codereview.')
4335 if options.nocommit:
4336 parser.error('--nocommit is not supported with Gerrit codereview.')
4337 if options.directory:
4338 parser.error('--directory is not supported with Gerrit codereview.')
4339
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004340 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004341 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004342
4343
4344def CMDrebase(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004345 """Rebases current branch on top of svn repo."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004346 # Provide a wrapper for git svn rebase to help avoid accidental
4347 # git svn dcommit.
4348 # It's the only command that doesn't use parser at all since we just defer
4349 # execution to git-svn.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00004350
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004351 return RunGitWithCode(['svn', 'rebase'] + args)[1]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004352
4353
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004354def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004355 """Fetches the tree status and returns either 'open', 'closed',
4356 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004357 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004358 if url:
4359 status = urllib2.urlopen(url).read().lower()
4360 if status.find('closed') != -1 or status == '0':
4361 return 'closed'
4362 elif status.find('open') != -1 or status == '1':
4363 return 'open'
4364 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004365 return 'unset'
4366
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004367
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004368def GetTreeStatusReason():
4369 """Fetches the tree status from a json url and returns the message
4370 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004371 url = settings.GetTreeStatusUrl()
4372 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004373 connection = urllib2.urlopen(json_url)
4374 status = json.loads(connection.read())
4375 connection.close()
4376 return status['message']
4377
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004378
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00004379def GetBuilderMaster(bot_list):
4380 """For a given builder, fetch the master from AE if available."""
4381 map_url = 'https://builders-map.appspot.com/'
4382 try:
4383 master_map = json.load(urllib2.urlopen(map_url))
4384 except urllib2.URLError as e:
4385 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
4386 (map_url, e))
4387 except ValueError as e:
4388 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
4389 if not master_map:
4390 return None, 'Failed to build master map.'
4391
4392 result_master = ''
4393 for bot in bot_list:
4394 builder = bot.split(':', 1)[0]
4395 master_list = master_map.get(builder, [])
4396 if not master_list:
4397 return None, ('No matching master for builder %s.' % builder)
4398 elif len(master_list) > 1:
4399 return None, ('The builder name %s exists in multiple masters %s.' %
4400 (builder, master_list))
4401 else:
4402 cur_master = master_list[0]
4403 if not result_master:
4404 result_master = cur_master
4405 elif result_master != cur_master:
4406 return None, 'The builders do not belong to the same master.'
4407 return result_master, None
4408
4409
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004410def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004411 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004412 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004413 status = GetTreeStatus()
4414 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004415 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004416 return 2
4417
vapiera7fbd5a2016-06-16 09:17:49 -07004418 print('The tree is %s' % status)
4419 print()
4420 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004421 if status != 'open':
4422 return 1
4423 return 0
4424
4425
maruel@chromium.org15192402012-09-06 12:38:29 +00004426def CMDtry(parser, args):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004427 """Triggers try jobs through BuildBucket."""
maruel@chromium.org15192402012-09-06 12:38:29 +00004428 group = optparse.OptionGroup(parser, "Try job options")
4429 group.add_option(
4430 "-b", "--bot", action="append",
4431 help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple "
4432 "times to specify multiple builders. ex: "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004433 "'-b win_rel -b win_layout'. See "
maruel@chromium.org15192402012-09-06 12:38:29 +00004434 "the try server waterfall for the builders name and the tests "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004435 "available."))
maruel@chromium.org15192402012-09-06 12:38:29 +00004436 group.add_option(
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004437 "-m", "--master", default='',
iannucci@chromium.org9e849272014-04-04 00:31:55 +00004438 help=("Specify a try master where to run the tries."))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004439 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00004440 "-r", "--revision",
4441 help="Revision to use for the try job; default: the "
4442 "revision will be determined by the try server; see "
4443 "its waterfall for more info")
4444 group.add_option(
4445 "-c", "--clobber", action="store_true", default=False,
4446 help="Force a clobber before building; e.g. don't do an "
4447 "incremental build")
4448 group.add_option(
4449 "--project",
4450 help="Override which project to use. Projects are defined "
4451 "server-side to define what default bot set to use")
4452 group.add_option(
machenbach@chromium.org45453142015-09-15 08:45:22 +00004453 "-p", "--property", dest="properties", action="append", default=[],
4454 help="Specify generic properties in the form -p key1=value1 -p "
4455 "key2=value2 etc (buildbucket only). The value will be treated as "
4456 "json if decodable, or as string otherwise.")
4457 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00004458 "-n", "--name", help="Try job name; default to current branch name")
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004459 group.add_option(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004460 "--use-rietveld", action="store_true", default=False,
4461 help="Use Rietveld to trigger try jobs.")
4462 group.add_option(
4463 "--buildbucket-host", default='cr-buildbucket.appspot.com',
4464 help="Host of buildbucket. The default host is %default.")
maruel@chromium.org15192402012-09-06 12:38:29 +00004465 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004466 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004467 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004468 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004469
machenbach@chromium.org45453142015-09-15 08:45:22 +00004470 if options.use_rietveld and options.properties:
4471 parser.error('Properties can only be specified with buildbucket')
4472
4473 # Make sure that all properties are prop=value pairs.
4474 bad_params = [x for x in options.properties if '=' not in x]
4475 if bad_params:
4476 parser.error('Got properties with missing "=": %s' % bad_params)
4477
maruel@chromium.org15192402012-09-06 12:38:29 +00004478 if args:
4479 parser.error('Unknown arguments: %s' % args)
4480
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004481 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00004482 if not cl.GetIssue():
4483 parser.error('Need to upload first')
4484
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004485 if cl.IsGerrit():
4486 parser.error(
4487 'Not yet supported for Gerrit (http://crbug.com/599931).\n'
4488 'If your project has Commit Queue, dry run is a workaround:\n'
4489 ' git cl set-commit --dry-run')
4490 # Code below assumes Rietveld issue.
4491 # TODO(tandrii): actually implement for Gerrit http://crbug.com/599931.
4492
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004493 props = cl.GetIssueProperties()
agable@chromium.org787e3062014-08-20 16:31:19 +00004494 if props.get('closed'):
4495 parser.error('Cannot send tryjobs for a closed CL')
4496
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004497 if props.get('private'):
4498 parser.error('Cannot use trybots with private issue')
4499
maruel@chromium.org15192402012-09-06 12:38:29 +00004500 if not options.name:
4501 options.name = cl.GetBranch()
4502
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004503 if options.bot and not options.master:
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00004504 options.master, err_msg = GetBuilderMaster(options.bot)
4505 if err_msg:
4506 parser.error('Tryserver master cannot be found because: %s\n'
4507 'Please manually specify the tryserver master'
4508 ', e.g. "-m tryserver.chromium.linux".' % err_msg)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004509
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004510 def GetMasterMap():
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004511 # Process --bot.
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004512 if not options.bot:
4513 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
maruel@chromium.org15192402012-09-06 12:38:29 +00004514
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004515 # Get try masters from PRESUBMIT.py files.
4516 masters = presubmit_support.DoGetTryMasters(
4517 change,
4518 change.LocalPaths(),
4519 settings.GetRoot(),
4520 None,
4521 None,
4522 options.verbose,
4523 sys.stdout)
4524 if masters:
4525 return masters
stip@chromium.org43064fd2013-12-18 20:07:44 +00004526
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004527 # Fall back to deprecated method: get try slaves from PRESUBMIT.py files.
4528 options.bot = presubmit_support.DoGetTrySlaves(
4529 change,
4530 change.LocalPaths(),
4531 settings.GetRoot(),
4532 None,
4533 None,
4534 options.verbose,
4535 sys.stdout)
tandrii@chromium.org71184c02016-01-13 15:18:44 +00004536
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004537 if not options.bot:
tandrii9de9ec62016-07-13 03:01:59 -07004538 return {}
maruel@chromium.org15192402012-09-06 12:38:29 +00004539
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004540 builders_and_tests = {}
4541 # TODO(machenbach): The old style command-line options don't support
4542 # multiple try masters yet.
4543 old_style = filter(lambda x: isinstance(x, basestring), options.bot)
4544 new_style = filter(lambda x: isinstance(x, tuple), options.bot)
4545
4546 for bot in old_style:
4547 if ':' in bot:
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00004548 parser.error('Specifying testfilter is no longer supported')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004549 elif ',' in bot:
4550 parser.error('Specify one bot per --bot flag')
4551 else:
tandrii@chromium.org3764fa22015-10-21 16:40:40 +00004552 builders_and_tests.setdefault(bot, [])
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004553
4554 for bot, tests in new_style:
4555 builders_and_tests.setdefault(bot, []).extend(tests)
4556
4557 # Return a master map with one master to be backwards compatible. The
4558 # master name defaults to an empty string, which will cause the master
4559 # not to be set on rietveld (deprecated).
4560 return {options.master: builders_and_tests}
4561
4562 masters = GetMasterMap()
tandrii9de9ec62016-07-13 03:01:59 -07004563 if not masters:
4564 # Default to triggering Dry Run (see http://crbug.com/625697).
4565 if options.verbose:
4566 print('git cl try with no bots now defaults to CQ Dry Run.')
4567 try:
4568 cl.SetCQState(_CQState.DRY_RUN)
4569 print('scheduled CQ Dry Run on %s' % cl.GetIssueURL())
4570 return 0
4571 except KeyboardInterrupt:
4572 raise
4573 except:
4574 print('WARNING: failed to trigger CQ Dry Run.\n'
4575 'Either:\n'
4576 ' * your project has no CQ\n'
4577 ' * you don\'t have permission to trigger Dry Run\n'
4578 ' * bug in this code (see stack trace below).\n'
4579 'Consider specifying which bots to trigger manually '
4580 'or asking your project owners for permissions '
4581 'or contacting Chrome Infrastructure team at '
4582 'https://www.chromium.org/infra\n\n')
4583 # Still raise exception so that stack trace is printed.
4584 raise
stip@chromium.org43064fd2013-12-18 20:07:44 +00004585
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004586 for builders in masters.itervalues():
4587 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004588 print('ERROR You are trying to send a job to a triggered bot. This type '
4589 'of bot requires an\ninitial job from a parent (usually a builder).'
4590 ' Instead send your job to the parent.\n'
4591 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004592 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004593
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004594 patchset = cl.GetMostRecentPatchset()
4595 if patchset and patchset != cl.GetPatchset():
4596 print(
4597 '\nWARNING Mismatch between local config and server. Did a previous '
4598 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
4599 'Continuing using\npatchset %s.\n' % patchset)
nodirabb9b222016-07-29 14:23:20 -07004600 if not options.use_rietveld:
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004601 try:
4602 trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
4603 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004604 print('ERROR: %s' % ex)
fischman@chromium.orgd246c972013-12-21 22:47:38 +00004605 return 1
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004606 except Exception as e:
4607 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
vapiera7fbd5a2016-06-16 09:17:49 -07004608 print('ERROR: Exception when trying to trigger tryjobs: %s\n%s' %
4609 (e, stacktrace))
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004610 return 1
4611 else:
4612 try:
4613 cl.RpcServer().trigger_distributed_try_jobs(
4614 cl.GetIssue(), patchset, options.name, options.clobber,
4615 options.revision, masters)
4616 except urllib2.HTTPError as e:
4617 if e.code == 404:
4618 print('404 from rietveld; '
4619 'did you mean to use "git try" instead of "git cl try"?')
4620 return 1
4621 print('Tried jobs on:')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004622
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004623 for (master, builders) in sorted(masters.iteritems()):
4624 if master:
vapiera7fbd5a2016-06-16 09:17:49 -07004625 print('Master: %s' % master)
sheyang@google.com6ebaf782015-05-12 19:17:54 +00004626 length = max(len(builder) for builder in builders)
4627 for builder in sorted(builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004628 print(' %*s: %s' % (length, builder, ','.join(builders[builder])))
maruel@chromium.org15192402012-09-06 12:38:29 +00004629 return 0
4630
4631
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004632def CMDtry_results(parser, args):
4633 group = optparse.OptionGroup(parser, "Try job results options")
4634 group.add_option(
4635 "-p", "--patchset", type=int, help="patchset number if not current.")
4636 group.add_option(
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004637 "--print-master", action='store_true', help="print master name as well.")
4638 group.add_option(
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00004639 "--color", action='store_true', default=setup_color.IS_TTY,
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004640 help="force color output, useful when piping output.")
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004641 group.add_option(
4642 "--buildbucket-host", default='cr-buildbucket.appspot.com',
4643 help="Host of buildbucket. The default host is %default.")
4644 parser.add_option_group(group)
4645 auth.add_auth_options(parser)
4646 options, args = parser.parse_args(args)
4647 if args:
4648 parser.error('Unrecognized args: %s' % ' '.join(args))
4649
4650 auth_config = auth.extract_auth_config_from_options(options)
4651 cl = Changelist(auth_config=auth_config)
4652 if not cl.GetIssue():
4653 parser.error('Need to upload first')
4654
4655 if not options.patchset:
4656 options.patchset = cl.GetMostRecentPatchset()
4657 if options.patchset and options.patchset != cl.GetPatchset():
4658 print(
4659 '\nWARNING Mismatch between local config and server. Did a previous '
4660 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
4661 'Continuing using\npatchset %s.\n' % options.patchset)
4662 try:
4663 jobs = fetch_try_jobs(auth_config, cl, options)
4664 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004665 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004666 return 1
4667 except Exception as e:
4668 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
vapiera7fbd5a2016-06-16 09:17:49 -07004669 print('ERROR: Exception when trying to fetch tryjobs: %s\n%s' %
4670 (e, stacktrace))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004671 return 1
4672 print_tryjobs(options, jobs)
4673 return 0
4674
4675
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004676@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004677def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004678 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004679 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004680 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004681 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004682
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004683 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004684 if args:
4685 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004686 branch = cl.GetBranch()
4687 RunGit(['branch', '--set-upstream', branch, args[0]])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004688 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004689 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004690
4691 # Clear configured merge-base, if there is one.
4692 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004693 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004694 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004695 return 0
4696
4697
thestig@chromium.org00858c82013-12-02 23:08:03 +00004698def CMDweb(parser, args):
4699 """Opens the current CL in the web browser."""
4700 _, args = parser.parse_args(args)
4701 if args:
4702 parser.error('Unrecognized args: %s' % ' '.join(args))
4703
4704 issue_url = Changelist().GetIssueURL()
4705 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004706 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004707 return 1
4708
4709 webbrowser.open(issue_url)
4710 return 0
4711
4712
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004713def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004714 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004715 parser.add_option('-d', '--dry-run', action='store_true',
4716 help='trigger in dry run mode')
4717 parser.add_option('-c', '--clear', action='store_true',
4718 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004719 auth.add_auth_options(parser)
4720 options, args = parser.parse_args(args)
4721 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004722 if args:
4723 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004724 if options.dry_run and options.clear:
4725 parser.error('Make up your mind: both --dry-run and --clear not allowed')
4726
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004727 cl = Changelist(auth_config=auth_config)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004728 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07004729 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004730 elif options.dry_run:
4731 state = _CQState.DRY_RUN
4732 else:
4733 state = _CQState.COMMIT
4734 if not cl.GetIssue():
4735 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07004736 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004737 return 0
4738
4739
groby@chromium.org411034a2013-02-26 15:12:01 +00004740def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004741 """Closes the issue."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004742 auth.add_auth_options(parser)
4743 options, args = parser.parse_args(args)
4744 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00004745 if args:
4746 parser.error('Unrecognized args: %s' % ' '.join(args))
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004747 cl = Changelist(auth_config=auth_config)
groby@chromium.org411034a2013-02-26 15:12:01 +00004748 # Ensure there actually is an issue to close.
4749 cl.GetDescription()
4750 cl.CloseIssue()
4751 return 0
4752
4753
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004754def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004755 """Shows differences between local tree and last upload."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004756 auth.add_auth_options(parser)
4757 options, args = parser.parse_args(args)
4758 auth_config = auth.extract_auth_config_from_options(options)
4759 if args:
4760 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004761
4762 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004763 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004764 # Staged changes would be committed along with the patch from last
4765 # upload, hence counted toward the "last upload" side in the final
4766 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00004767 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00004768 return 1
4769
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004770 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004771 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004772 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00004773 if not issue:
4774 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004775 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004776 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004777
4778 # Create a new branch based on the merge-base
4779 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00004780 # Clear cached branch in cl object, to avoid overwriting original CL branch
4781 # properties.
4782 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004783 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004784 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004785 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00004786 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004787 return rtn
4788
wychen@chromium.org06928532015-02-03 02:11:29 +00004789 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004790 # branch containing the latest rietveld patch.
wychen@chromium.org06928532015-02-03 02:11:29 +00004791 subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch, '--'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00004792 finally:
4793 RunGit(['checkout', '-q', branch])
4794 RunGit(['branch', '-D', TMP_BRANCH])
4795
4796 return 0
4797
4798
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004799def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00004800 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004801 parser.add_option(
4802 '--no-color',
4803 action='store_true',
4804 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004805 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004806 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004807 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004808
4809 author = RunGit(['config', 'user.email']).strip() or None
4810
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004811 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004812
4813 if args:
4814 if len(args) > 1:
4815 parser.error('Unknown args')
4816 base_branch = args[0]
4817 else:
4818 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004819 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004820
4821 change = cl.GetChange(base_branch, None)
4822 return owners_finder.OwnersFinder(
4823 [f.LocalPath() for f in
4824 cl.GetChange(base_branch, None).AffectedFiles()],
4825 change.RepositoryRoot(), author,
dtu944b6052016-07-14 14:48:21 -07004826 fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00004827 disable_color=options.no_color).run()
4828
4829
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004830def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004831 """Generates a diff command."""
4832 # Generate diff for the current branch's changes.
4833 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
4834 upstream_commit, '--' ]
4835
4836 if args:
4837 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004838 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004839 diff_cmd.append(arg)
4840 else:
4841 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004842
4843 return diff_cmd
4844
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004845def MatchingFileType(file_name, extensions):
4846 """Returns true if the file name ends with one of the given extensions."""
4847 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004848
enne@chromium.org555cfe42014-01-29 18:21:39 +00004849@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004850def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004851 """Runs auto-formatting tools (clang-format etc.) on the diff."""
zengsterbf470142016-07-07 16:43:00 -07004852 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07004853 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00004854 parser.add_option('--full', action='store_true',
4855 help='Reformat the full content of all touched files')
4856 parser.add_option('--dry-run', action='store_true',
4857 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004858 parser.add_option('--python', action='store_true',
4859 help='Format python code with yapf (experimental).')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00004860 parser.add_option('--diff', action='store_true',
4861 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004862 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004863
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004864 # git diff generates paths against the root of the repository. Change
4865 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004866 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00004867 if rel_base_path:
4868 os.chdir(rel_base_path)
4869
digit@chromium.org29e47272013-05-17 17:01:46 +00004870 # Grab the merge-base commit, i.e. the upstream commit of the current
4871 # branch when it was created or the last time it was rebased. This is
4872 # to cover the case where the user may have called "git fetch origin",
4873 # moving the origin branch to a newer commit, but hasn't rebased yet.
4874 upstream_commit = None
4875 cl = Changelist()
4876 upstream_branch = cl.GetUpstreamBranch()
4877 if upstream_branch:
4878 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
4879 upstream_commit = upstream_commit.strip()
4880
4881 if not upstream_commit:
4882 DieWithError('Could not find base commit for this branch. '
4883 'Are you in detached state?')
4884
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004885 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
4886 diff_output = RunGit(changed_files_cmd)
4887 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00004888 # Filter out files deleted by this CL
4889 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004890
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004891 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
4892 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
4893 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004894 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00004895
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00004896 top_dir = os.path.normpath(
4897 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
4898
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004899 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
4900 # formatted. This is used to block during the presubmit.
4901 return_value = 0
4902
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004903 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00004904 # Locate the clang-format binary in the checkout
4905 try:
4906 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07004907 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00004908 DieWithError(e)
4909
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004910 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004911 cmd = [clang_format_tool]
4912 if not opts.dry_run and not opts.diff:
4913 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004914 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004915 if opts.diff:
4916 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004917 else:
4918 env = os.environ.copy()
4919 env['PATH'] = str(os.path.dirname(clang_format_tool))
4920 try:
4921 script = clang_format.FindClangFormatScriptInChromiumTree(
4922 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07004923 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004924 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00004925
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004926 cmd = [sys.executable, script, '-p0']
4927 if not opts.dry_run and not opts.diff:
4928 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00004929
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004930 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
4931 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004932
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00004933 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
4934 if opts.diff:
4935 sys.stdout.write(stdout)
4936 if opts.dry_run and len(stdout) > 0:
4937 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004938
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004939 # Similar code to above, but using yapf on .py files rather than clang-format
4940 # on C/C++ files
4941 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004942 yapf_tool = gclient_utils.FindExecutable('yapf')
4943 if yapf_tool is None:
4944 DieWithError('yapf not found in PATH')
4945
4946 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004947 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004948 cmd = [yapf_tool]
4949 if not opts.dry_run and not opts.diff:
4950 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004951 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00004952 if opts.diff:
4953 sys.stdout.write(stdout)
4954 else:
4955 # TODO(sbc): yapf --lines mode still has some issues.
4956 # https://github.com/google/yapf/issues/154
4957 DieWithError('--python currently only works with --full')
4958
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004959 # Dart's formatter does not have the nice property of only operating on
4960 # modified chunks, so hard code full.
4961 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004962 try:
4963 command = [dart_format.FindDartFmtToolInChromiumTree()]
4964 if not opts.dry_run and not opts.diff:
4965 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00004966 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004967
ppi@chromium.org6593d932016-03-03 15:41:15 +00004968 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004969 if opts.dry_run and stdout:
4970 return_value = 2
4971 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07004972 print('Warning: Unable to check Dart code formatting. Dart SDK not '
4973 'found in this checkout. Files in other languages are still '
4974 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004975
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004976 # Format GN build files. Always run on full build files for canonical form.
4977 if gn_diff_files:
4978 cmd = ['gn', 'format']
4979 if not opts.dry_run and not opts.diff:
4980 cmd.append('--in-place')
4981 for gn_diff_file in gn_diff_files:
bsep@chromium.org627d9002016-04-29 00:00:52 +00004982 stdout = RunCommand(cmd + [gn_diff_file],
4983 shell=sys.platform == 'win32',
4984 cwd=top_dir)
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00004985 if opts.diff:
4986 sys.stdout.write(stdout)
4987
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00004988 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00004989
4990
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004991@subcommand.usage('<codereview url or issue id>')
4992def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00004993 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00004994 _, args = parser.parse_args(args)
4995
4996 if len(args) != 1:
4997 parser.print_help()
4998 return 1
4999
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005000 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005001 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005002 parser.print_help()
5003 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005004 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005005
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005006 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005007 output = RunGit(['config', '--local', '--get-regexp',
5008 r'branch\..*\.%s' % issueprefix],
5009 error_ok=True)
5010 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005011 if issue == target_issue:
5012 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005013
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005014 branches = []
5015 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii@chromium.orgd03bc632016-04-12 14:17:26 +00005016 branches.extend(find_issues(cls.IssueSettingSuffix()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005017 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005018 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005019 return 1
5020 if len(branches) == 1:
5021 RunGit(['checkout', branches[0]])
5022 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005023 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005024 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005025 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005026 which = raw_input('Choose by index: ')
5027 try:
5028 RunGit(['checkout', branches[int(which)]])
5029 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005030 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005031 return 1
5032
5033 return 0
5034
5035
maruel@chromium.org29404b52014-09-08 22:58:00 +00005036def CMDlol(parser, args):
5037 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005038 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005039 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5040 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5041 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005042 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005043 return 0
5044
5045
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005046class OptionParser(optparse.OptionParser):
5047 """Creates the option parse and add --verbose support."""
5048 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005049 optparse.OptionParser.__init__(
5050 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005051 self.add_option(
5052 '-v', '--verbose', action='count', default=0,
5053 help='Use 2 times for more debugging info')
5054
5055 def parse_args(self, args=None, values=None):
5056 options, args = optparse.OptionParser.parse_args(self, args, values)
5057 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
5058 logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
5059 return options, args
5060
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005061
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005062def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005063 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005064 print('\nYour python version %s is unsupported, please upgrade.\n' %
5065 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005066 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005067
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005068 # Reload settings.
5069 global settings
5070 settings = Settings()
5071
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005072 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005073 dispatcher = subcommand.CommandDispatcher(__name__)
5074 try:
5075 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005076 except auth.AuthenticationError as e:
5077 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005078 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005079 if e.code != 500:
5080 raise
5081 DieWithError(
5082 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5083 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005084 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005085
5086
5087if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005088 # These affect sys.stdout so do it outside of main() to simplify mocks in
5089 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005090 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005091 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005092 try:
5093 sys.exit(main(sys.argv[1:]))
5094 except KeyboardInterrupt:
5095 sys.stderr.write('interrupted\n')
5096 sys.exit(1)