blob: 28f99fad46fedb07fff7f23fbe602f957f03dee3 [file] [log] [blame]
maruel@chromium.org725f1c32011-04-01 20:24:54 +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
maruel@chromium.org725f1c32011-04-01 20:24:54 +00008"""A git-command for integrating reviews on Rietveld."""
9
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000010from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000011from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000012import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000013import collections
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +000014import glob
sheyang@google.com6ebaf782015-05-12 19:17:54 +000015import httplib
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000016import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000017import logging
18import optparse
19import os
maruel@chromium.org1033efd2013-07-23 23:25:09 +000020import Queue
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000021import re
ukai@chromium.org78c4b982012-02-14 02:20:26 +000022import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000023import sys
bauerb@chromium.org27386dd2015-02-16 10:45:39 +000024import tempfile
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000025import textwrap
sheyang@google.com6ebaf782015-05-12 19:17:54 +000026import time
27import traceback
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000029import urlparse
thestig@chromium.org00858c82013-12-02 23:08:03 +000030import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000031import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000032
33try:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000034 import readline # pylint: disable=F0401,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000035except ImportError:
36 pass
37
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000038from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000039from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000040from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000041import auth
maruel@chromium.org2a74d372011-03-29 19:05:50 +000042import breakpad # pylint: disable=W0611
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000043import clang_format
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000044import dart_format
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000045import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000046import gclient_utils
iannucci@chromium.org9e849272014-04-04 00:31:55 +000047import git_common
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +000048from git_footers import get_footer_svn_id
piman@chromium.org336f9122014-09-04 02:16:55 +000049import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000050import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000051import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000052import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000053import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000054import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000055import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import watchlists
57
maruel@chromium.org0633fb42013-08-16 20:06:14 +000058__version__ = '1.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000059
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +000060DEFAULT_SERVER = 'https://codereview.appspot.com'
maruel@chromium.org0ba7f962011-01-11 22:13:58 +000061POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000062DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +000063GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +000064CHANGE_ID = 'Change-Id:'
rmistry@google.comc68112d2015-03-03 12:48:06 +000065REFS_THAT_ALIAS_TO_OTHER_REFS = {
66 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
67 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
68}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000069
sheyang@google.com6ebaf782015-05-12 19:17:54 +000070# Buildbucket-related constants
71BUILDBUCKET_HOST = 'cr-buildbucket.appspot.com'
72
thestig@chromium.org44202a22014-03-11 19:22:18 +000073# Valid extensions for files we want to lint.
74DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
75DEFAULT_LINT_IGNORE_REGEX = r"$^"
76
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000077# Shortcut since it quickly becomes redundant.
78Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000079
maruel@chromium.orgddd59412011-11-30 14:20:38 +000080# Initialized in main()
81settings = None
82
83
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000084def DieWithError(message):
dpranke@chromium.org970c5222011-03-12 00:32:24 +000085 print >> sys.stderr, message
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000086 sys.exit(1)
87
88
thestig@chromium.org8b0553c2014-02-11 00:33:37 +000089def GetNoGitPagerEnv():
90 env = os.environ.copy()
91 # 'cat' is a magical git string that disables pagers on all platforms.
92 env['GIT_PAGER'] = 'cat'
93 return env
94
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +000095
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000096def RunCommand(args, error_ok=False, error_message=None, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000097 try:
maruel@chromium.org373af802012-05-25 21:07:33 +000098 return subprocess2.check_output(args, shell=False, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +000099 except subprocess2.CalledProcessError as e:
100 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000101 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000103 'Command "%s" failed.\n%s' % (
104 ' '.join(args), error_message or e.stdout or ''))
105 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000106
107
108def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000109 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000110 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
112
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000113def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000114 """Returns return code and stdout."""
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000115 try:
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000116 if suppress_stderr:
117 stderr = subprocess2.VOID
118 else:
119 stderr = sys.stderr
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000120 out, code = subprocess2.communicate(['git'] + args,
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000121 env=GetNoGitPagerEnv(),
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000122 stdout=subprocess2.PIPE,
123 stderr=stderr)
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000124 return code, out[0]
125 except ValueError:
126 # When the subprocess fails, it returns None. That triggers a ValueError
127 # when trying to unpack the return value into (out, code).
128 return 1, ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000129
130
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000131def RunGitSilent(args):
132 """Returns stdout, suppresses stderr and ingores the return code."""
133 return RunGitWithCode(args, suppress_stderr=True)[1]
134
135
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000136def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000137 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000138 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000139 return (version.startswith(prefix) and
140 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000141
142
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000143def BranchExists(branch):
144 """Return True if specified branch exists."""
145 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
146 suppress_stderr=True)
147 return not code
148
149
maruel@chromium.org90541732011-04-01 17:54:18 +0000150def ask_for_data(prompt):
151 try:
152 return raw_input(prompt)
153 except KeyboardInterrupt:
154 # Hide the exception.
155 sys.exit(1)
156
157
iannucci@chromium.org79540052012-10-19 23:15:26 +0000158def git_set_branch_value(key, value):
159 branch = Changelist().GetBranch()
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000160 if not branch:
161 return
162
163 cmd = ['config']
164 if isinstance(value, int):
165 cmd.append('--int')
166 git_key = 'branch.%s.%s' % (branch, key)
167 RunGit(cmd + [git_key, str(value)])
iannucci@chromium.org79540052012-10-19 23:15:26 +0000168
169
170def git_get_branch_default(key, default):
171 branch = Changelist().GetBranch()
172 if branch:
173 git_key = 'branch.%s.%s' % (branch, key)
174 (_, stdout) = RunGitWithCode(['config', '--int', '--get', git_key])
175 try:
176 return int(stdout.strip())
177 except ValueError:
178 pass
179 return default
180
181
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000182def add_git_similarity(parser):
183 parser.add_option(
iannucci@chromium.org79540052012-10-19 23:15:26 +0000184 '--similarity', metavar='SIM', type='int', action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000185 help='Sets the percentage that a pair of files need to match in order to'
186 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000187 parser.add_option(
188 '--find-copies', action='store_true',
189 help='Allows git to look for copies.')
190 parser.add_option(
191 '--no-find-copies', action='store_false', dest='find_copies',
192 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000193
194 old_parser_args = parser.parse_args
195 def Parse(args):
196 options, args = old_parser_args(args)
197
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000198 if options.similarity is None:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000199 options.similarity = git_get_branch_default('git-cl-similarity', 50)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000200 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000201 print('Note: Saving similarity of %d%% in git config.'
202 % options.similarity)
203 git_set_branch_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000204
iannucci@chromium.org79540052012-10-19 23:15:26 +0000205 options.similarity = max(0, min(options.similarity, 100))
206
207 if options.find_copies is None:
208 options.find_copies = bool(
209 git_get_branch_default('git-find-copies', True))
210 else:
211 git_set_branch_value('git-find-copies', int(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000212
213 print('Using %d%% similarity for rename/copy detection. '
214 'Override with --similarity.' % options.similarity)
215
216 return options, args
217 parser.parse_args = Parse
218
219
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000220def _prefix_master(master):
221 """Convert user-specified master name to full master name.
222
223 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
224 name, while the developers always use shortened master name
225 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
226 function does the conversion for buildbucket migration.
227 """
228 prefix = 'master.'
229 if master.startswith(prefix):
230 return master
231 return '%s%s' % (prefix, master)
232
233
machenbach@chromium.org79e43ff2015-05-15 05:56:13 +0000234def trigger_try_jobs(auth_config, changelist, options, masters, category,
235 override_properties=None):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000236 rietveld_url = settings.GetDefaultServerUrl()
237 rietveld_host = urlparse.urlparse(rietveld_url).hostname
238 authenticator = auth.get_authenticator_for_host(rietveld_host, auth_config)
239 http = authenticator.authorize(httplib2.Http())
240 http.force_exception_to_status_code = True
241 issue_props = changelist.GetIssueProperties()
242 issue = changelist.GetIssue()
243 patchset = changelist.GetMostRecentPatchset()
244
245 buildbucket_put_url = (
246 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
247 hostname=BUILDBUCKET_HOST))
248 buildset = 'patch/rietveld/{hostname}/{issue}/{patch}'.format(
249 hostname=rietveld_host,
250 issue=issue,
251 patch=patchset)
252
253 batch_req_body = {'builds': []}
254 print_text = []
255 print_text.append('Tried jobs on:')
256 for master, builders_and_tests in sorted(masters.iteritems()):
257 print_text.append('Master: %s' % master)
258 bucket = _prefix_master(master)
259 for builder, tests in sorted(builders_and_tests.iteritems()):
260 print_text.append(' %s: %s' % (builder, tests))
261 parameters = {
262 'builder_name': builder,
263 'changes': [
264 {'author': {'email': issue_props['owner_email']}},
265 ],
266 'properties': {
267 'category': category,
268 'issue': issue,
269 'master': master,
270 'patch_project': issue_props['project'],
271 'patch_storage': 'rietveld',
272 'patchset': patchset,
273 'reason': options.name,
274 'revision': options.revision,
275 'rietveld': rietveld_url,
276 'testfilter': tests,
277 },
278 }
machenbach@chromium.org79e43ff2015-05-15 05:56:13 +0000279 if override_properties:
280 parameters['properties'].update(override_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000281 if options.clobber:
282 parameters['properties']['clobber'] = True
283 batch_req_body['builds'].append(
284 {
285 'bucket': bucket,
286 'parameters_json': json.dumps(parameters),
287 'tags': ['builder:%s' % builder,
288 'buildset:%s' % buildset,
289 'master:%s' % master,
290 'user_agent:git_cl_try']
291 }
292 )
293
294 for try_count in xrange(3):
295 response, content = http.request(
296 buildbucket_put_url,
297 'PUT',
298 body=json.dumps(batch_req_body),
299 headers={'Content-Type': 'application/json'},
300 )
301 content_json = None
302 try:
303 content_json = json.loads(content)
304 except ValueError:
305 pass
306
307 # Buildbucket could return an error even if status==200.
308 if content_json and content_json.get('error'):
309 msg = 'Error in response. Code: %d. Reason: %s. Message: %s.' % (
310 content_json['error'].get('code', ''),
311 content_json['error'].get('reason', ''),
312 content_json['error'].get('message', ''))
313 raise BuildbucketResponseException(msg)
314
315 if response.status == 200:
316 if not content_json:
317 raise BuildbucketResponseException(
318 'Buildbucket returns invalid json content: %s.\n'
319 'Please file bugs at crbug.com, label "Infra-BuildBucket".' %
320 content)
321 break
322 if response.status < 500 or try_count >= 2:
323 raise httplib2.HttpLib2Error(content)
324
325 # status >= 500 means transient failures.
326 logging.debug('Transient errors when triggering tryjobs. Will retry.')
327 time.sleep(0.5 + 1.5*try_count)
328
329 print '\n'.join(print_text)
kjellander@chromium.org44424542015-06-02 18:35:29 +0000330
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000331
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000332def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
333 """Return the corresponding git ref if |base_url| together with |glob_spec|
334 matches the full |url|.
335
336 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
337 """
338 fetch_suburl, as_ref = glob_spec.split(':')
339 if allow_wildcards:
340 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
341 if glob_match:
342 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
343 # "branches/{472,597,648}/src:refs/remotes/svn/*".
344 branch_re = re.escape(base_url)
345 if glob_match.group(1):
346 branch_re += '/' + re.escape(glob_match.group(1))
347 wildcard = glob_match.group(2)
348 if wildcard == '*':
349 branch_re += '([^/]*)'
350 else:
351 # Escape and replace surrounding braces with parentheses and commas
352 # with pipe symbols.
353 wildcard = re.escape(wildcard)
354 wildcard = re.sub('^\\\\{', '(', wildcard)
355 wildcard = re.sub('\\\\,', '|', wildcard)
356 wildcard = re.sub('\\\\}$', ')', wildcard)
357 branch_re += wildcard
358 if glob_match.group(3):
359 branch_re += re.escape(glob_match.group(3))
360 match = re.match(branch_re, url)
361 if match:
362 return re.sub('\*$', match.group(1), as_ref)
363
364 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
365 if fetch_suburl:
366 full_url = base_url + '/' + fetch_suburl
367 else:
368 full_url = base_url
369 if full_url == url:
370 return as_ref
371 return None
372
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000373
iannucci@chromium.org79540052012-10-19 23:15:26 +0000374def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000375 """Prints statistics about the change to the user."""
376 # --no-ext-diff is broken in some versions of Git, so try to work around
377 # this by overriding the environment (but there is still a problem if the
378 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000379 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000380 if 'GIT_EXTERNAL_DIFF' in env:
381 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000382
383 if find_copies:
384 similarity_options = ['--find-copies-harder', '-l100000',
385 '-C%s' % similarity]
386 else:
387 similarity_options = ['-M%s' % similarity]
388
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000389 try:
390 stdout = sys.stdout.fileno()
391 except AttributeError:
392 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000393 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000394 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000395 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000396 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000397
398
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000399class BuildbucketResponseException(Exception):
400 pass
401
402
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000403class Settings(object):
404 def __init__(self):
405 self.default_server = None
406 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000407 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000408 self.is_git_svn = None
409 self.svn_branch = None
410 self.tree_status_url = None
411 self.viewvc_url = None
412 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000413 self.is_gerrit = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000414 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000415 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000416 self.force_https_commit_url = None
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000417 self.pending_ref_prefix = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000418
419 def LazyUpdateIfNeeded(self):
420 """Updates the settings from a codereview.settings file, if available."""
421 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000422 # The only value that actually changes the behavior is
423 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000424 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000425 error_ok=True
426 ).strip().lower()
427
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000428 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000429 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000430 LoadCodereviewSettingsFromFile(cr_settings_file)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000431 # set updated to True to avoid infinite calling loop
432 # through DownloadHooks
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000433 self.updated = True
434 DownloadHooks(False)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000435 self.updated = True
436
437 def GetDefaultServerUrl(self, error_ok=False):
438 if not self.default_server:
439 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000440 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000441 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000442 if error_ok:
443 return self.default_server
444 if not self.default_server:
445 error_message = ('Could not find settings file. You must configure '
446 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000447 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000448 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000449 return self.default_server
450
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000451 @staticmethod
452 def GetRelativeRoot():
453 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000454
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000455 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000456 if self.root is None:
457 self.root = os.path.abspath(self.GetRelativeRoot())
458 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000459
460 def GetIsGitSvn(self):
461 """Return true if this repo looks like it's using git-svn."""
462 if self.is_git_svn is None:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000463 if self.GetPendingRefPrefix():
464 # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what.
465 self.is_git_svn = False
466 else:
467 # If you have any "svn-remote.*" config keys, we think you're using svn.
468 self.is_git_svn = RunGitWithCode(
469 ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000470 return self.is_git_svn
471
472 def GetSVNBranch(self):
473 if self.svn_branch is None:
474 if not self.GetIsGitSvn():
475 DieWithError('Repo doesn\'t appear to be a git-svn repo.')
476
477 # Try to figure out which remote branch we're based on.
478 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000479 # 1) iterate through our branch history and find the svn URL.
480 # 2) find the svn-remote that fetches from the URL.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000481
482 # regexp matching the git-svn line that contains the URL.
483 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
484
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000485 # We don't want to go through all of history, so read a line from the
486 # pipe at a time.
487 # The -100 is an arbitrary limit so we don't search forever.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000488 cmd = ['git', 'log', '-100', '--pretty=medium']
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000489 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE,
490 env=GetNoGitPagerEnv())
maruel@chromium.org740f9d72011-06-10 18:33:10 +0000491 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000492 for line in proc.stdout:
493 match = git_svn_re.match(line)
494 if match:
495 url = match.group(1)
496 proc.stdout.close() # Cut pipe.
497 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000498
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000499 if url:
500 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
501 remotes = RunGit(['config', '--get-regexp',
502 r'^svn-remote\..*\.url']).splitlines()
503 for remote in remotes:
504 match = svn_remote_re.match(remote)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000505 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000506 remote = match.group(1)
507 base_url = match.group(2)
szager@chromium.org4ac25532013-12-16 22:07:02 +0000508 rewrite_root = RunGit(
509 ['config', 'svn-remote.%s.rewriteRoot' % remote],
510 error_ok=True).strip()
511 if rewrite_root:
512 base_url = rewrite_root
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000513 fetch_spec = RunGit(
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000514 ['config', 'svn-remote.%s.fetch' % remote],
515 error_ok=True).strip()
516 if fetch_spec:
517 self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
518 if self.svn_branch:
519 break
520 branch_spec = RunGit(
521 ['config', 'svn-remote.%s.branches' % remote],
522 error_ok=True).strip()
523 if branch_spec:
524 self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
525 if self.svn_branch:
526 break
527 tag_spec = RunGit(
528 ['config', 'svn-remote.%s.tags' % remote],
529 error_ok=True).strip()
530 if tag_spec:
531 self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
532 if self.svn_branch:
533 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000534
535 if not self.svn_branch:
536 DieWithError('Can\'t guess svn branch -- try specifying it on the '
537 'command line')
538
539 return self.svn_branch
540
541 def GetTreeStatusUrl(self, error_ok=False):
542 if not self.tree_status_url:
543 error_message = ('You must configure your tree status URL by running '
544 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000545 self.tree_status_url = self._GetRietveldConfig(
546 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000547 return self.tree_status_url
548
549 def GetViewVCUrl(self):
550 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000551 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000552 return self.viewvc_url
553
rmistry@google.com90752582014-01-14 21:04:50 +0000554 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000555 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000556
rmistry@google.com78948ed2015-07-08 23:09:57 +0000557 def GetIsSkipDependencyUpload(self, branch_name):
558 """Returns true if specified branch should skip dep uploads."""
559 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
560 error_ok=True)
561
rmistry@google.com5626a922015-02-26 14:03:30 +0000562 def GetRunPostUploadHook(self):
563 run_post_upload_hook = self._GetRietveldConfig(
564 'run-post-upload-hook', error_ok=True)
565 return run_post_upload_hook == "True"
566
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000567 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000568 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000569
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000570 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000571 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000572
ukai@chromium.orge8077812012-02-03 03:41:46 +0000573 def GetIsGerrit(self):
574 """Return true if this repo is assosiated with gerrit code review system."""
575 if self.is_gerrit is None:
576 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
577 return self.is_gerrit
578
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000579 def GetGitEditor(self):
580 """Return the editor specified in the git config, or None if none is."""
581 if self.git_editor is None:
582 self.git_editor = self._GetConfig('core.editor', error_ok=True)
583 return self.git_editor or None
584
thestig@chromium.org44202a22014-03-11 19:22:18 +0000585 def GetLintRegex(self):
586 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
587 DEFAULT_LINT_REGEX)
588
589 def GetLintIgnoreRegex(self):
590 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
591 DEFAULT_LINT_IGNORE_REGEX)
592
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000593 def GetProject(self):
594 if not self.project:
595 self.project = self._GetRietveldConfig('project', error_ok=True)
596 return self.project
597
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000598 def GetForceHttpsCommitUrl(self):
599 if not self.force_https_commit_url:
600 self.force_https_commit_url = self._GetRietveldConfig(
601 'force-https-commit-url', error_ok=True)
602 return self.force_https_commit_url
603
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000604 def GetPendingRefPrefix(self):
605 if not self.pending_ref_prefix:
606 self.pending_ref_prefix = self._GetRietveldConfig(
607 'pending-ref-prefix', error_ok=True)
608 return self.pending_ref_prefix
609
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000610 def _GetRietveldConfig(self, param, **kwargs):
611 return self._GetConfig('rietveld.' + param, **kwargs)
612
rmistry@google.com78948ed2015-07-08 23:09:57 +0000613 def _GetBranchConfig(self, branch_name, param, **kwargs):
614 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
615
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000616 def _GetConfig(self, param, **kwargs):
617 self.LazyUpdateIfNeeded()
618 return RunGit(['config', param], **kwargs).strip()
619
620
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000621def ShortBranchName(branch):
622 """Convert a name like 'refs/heads/foo' to just 'foo'."""
623 return branch.replace('refs/heads/', '')
624
625
626class Changelist(object):
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000627 def __init__(self, branchref=None, issue=None, auth_config=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000628 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +0000629 global settings
630 if not settings:
631 # Happens when git_cl.py is used as a utility library.
632 settings = Settings()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000633 settings.GetDefaultServerUrl()
634 self.branchref = branchref
635 if self.branchref:
636 self.branch = ShortBranchName(self.branchref)
637 else:
638 self.branch = None
639 self.rietveld_server = None
640 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000641 self.lookedup_issue = False
642 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000643 self.has_description = False
644 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000645 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000646 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000647 self.cc = None
648 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000649 self._auth_config = auth_config
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000650 self._props = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +0000651 self._remote = None
652 self._rpc_server = None
653
654 @property
655 def auth_config(self):
656 return self._auth_config
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000657
658 def GetCCList(self):
659 """Return the users cc'd on this CL.
660
661 Return is a string suitable for passing to gcl with the --cc flag.
662 """
663 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000664 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000665 more_cc = ','.join(self.watchers)
666 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
667 return self.cc
668
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000669 def GetCCListWithoutDefault(self):
670 """Return the users cc'd on this CL excluding default ones."""
671 if self.cc is None:
672 self.cc = ','.join(self.watchers)
673 return self.cc
674
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000675 def SetWatchers(self, watchers):
676 """Set the list of email addresses that should be cc'd based on the changed
677 files in this CL.
678 """
679 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000680
681 def GetBranch(self):
682 """Returns the short branch name, e.g. 'master'."""
683 if not self.branch:
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000684 branchref = RunGit(['symbolic-ref', 'HEAD'],
685 stderr=subprocess2.VOID, error_ok=True).strip()
686 if not branchref:
687 return None
688 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000689 self.branch = ShortBranchName(self.branchref)
690 return self.branch
691
692 def GetBranchRef(self):
693 """Returns the full branch name, e.g. 'refs/heads/master'."""
694 self.GetBranch() # Poke the lazy loader.
695 return self.branchref
696
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000697 @staticmethod
698 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +0000699 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000700 e.g. 'origin', 'refs/heads/master'
701 """
702 remote = '.'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000703 upstream_branch = RunGit(['config', 'branch.%s.merge' % branch],
704 error_ok=True).strip()
705 if upstream_branch:
706 remote = RunGit(['config', 'branch.%s.remote' % branch]).strip()
707 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000708 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
709 error_ok=True).strip()
710 if upstream_branch:
711 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000712 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000713 # Fall back on trying a git-svn upstream branch.
714 if settings.GetIsGitSvn():
715 upstream_branch = settings.GetSVNBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000716 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000717 # Else, try to guess the origin remote.
718 remote_branches = RunGit(['branch', '-r']).split()
719 if 'origin/master' in remote_branches:
720 # Fall back on origin/master if it exits.
721 remote = 'origin'
722 upstream_branch = 'refs/heads/master'
723 elif 'origin/trunk' in remote_branches:
724 # Fall back on origin/trunk if it exists. Generally a shared
725 # git-svn clone
726 remote = 'origin'
727 upstream_branch = 'refs/heads/trunk'
728 else:
729 DieWithError("""Unable to determine default branch to diff against.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000730Either pass complete "git diff"-style arguments, like
731 git cl upload origin/master
732or verify this branch is set up to track another (via the --track argument to
733"git checkout -b ...").""")
734
735 return remote, upstream_branch
736
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000737 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000738 upstream_branch = self.GetUpstreamBranch()
739 if not BranchExists(upstream_branch):
740 DieWithError('The upstream for the current branch (%s) does not exist '
741 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000742 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000743 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000744
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000745 def GetUpstreamBranch(self):
746 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000747 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000748 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +0000749 upstream_branch = upstream_branch.replace('refs/heads/',
750 'refs/remotes/%s/' % remote)
751 upstream_branch = upstream_branch.replace('refs/branch-heads/',
752 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000753 self.upstream_branch = upstream_branch
754 return self.upstream_branch
755
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000756 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +0000757 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000758 remote, branch = None, self.GetBranch()
759 seen_branches = set()
760 while branch not in seen_branches:
761 seen_branches.add(branch)
762 remote, branch = self.FetchUpstreamTuple(branch)
763 branch = ShortBranchName(branch)
764 if remote != '.' or branch.startswith('refs/remotes'):
765 break
766 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +0000767 remotes = RunGit(['remote'], error_ok=True).split()
768 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +0000770 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000771 remote = 'origin'
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +0000772 logging.warning('Could not determine which remote this change is '
773 'associated with, so defaulting to "%s". This may '
774 'not be what you want. You may prevent this message '
775 'by running "git svn info" as documented here: %s',
776 self._remote,
777 GIT_INSTRUCTIONS_URL)
778 else:
779 logging.warn('Could not determine which remote this change is '
780 'associated with. You may prevent this message by '
781 'running "git svn info" as documented here: %s',
782 GIT_INSTRUCTIONS_URL)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000783 branch = 'HEAD'
784 if branch.startswith('refs/remotes'):
785 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +0000786 elif branch.startswith('refs/branch-heads/'):
787 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000788 else:
789 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +0000790 return self._remote
791
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000792 def GitSanityChecks(self, upstream_git_obj):
793 """Checks git repo status and ensures diff is from local commits."""
794
sbc@chromium.org79706062015-01-14 21:18:12 +0000795 if upstream_git_obj is None:
796 if self.GetBranch() is None:
797 print >> sys.stderr, (
798 'ERROR: unable to dertermine current branch (detached HEAD?)')
799 else:
800 print >> sys.stderr, (
801 'ERROR: no upstream branch')
802 return False
803
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000804 # Verify the commit we're diffing against is in our current branch.
805 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
806 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
807 if upstream_sha != common_ancestor:
808 print >> sys.stderr, (
809 'ERROR: %s is not in the current branch. You may need to rebase '
810 'your tracking branch' % upstream_sha)
811 return False
812
813 # List the commits inside the diff, and verify they are all local.
814 commits_in_diff = RunGit(
815 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
816 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
817 remote_branch = remote_branch.strip()
818 if code != 0:
819 _, remote_branch = self.GetRemoteBranch()
820
821 commits_in_remote = RunGit(
822 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
823
824 common_commits = set(commits_in_diff) & set(commits_in_remote)
825 if common_commits:
826 print >> sys.stderr, (
827 'ERROR: Your diff contains %d commits already in %s.\n'
828 'Run "git log --oneline %s..HEAD" to get a list of commits in '
829 'the diff. If you are using a custom git flow, you can override'
830 ' the reference used for this check with "git config '
831 'gitcl.remotebranch <git-ref>".' % (
832 len(common_commits), remote_branch, upstream_git_obj))
833 return False
834 return True
835
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +0000836 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +0000837 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +0000838
839 Returns None if it is not set.
840 """
sheyang@chromium.orga656e702014-05-15 20:43:05 +0000841 return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()],
842 error_ok=True).strip()
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +0000843
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000844 def GetGitSvnRemoteUrl(self):
845 """Return the configured git-svn remote URL parsed from git svn info.
846
847 Returns None if it is not set.
848 """
849 # URL is dependent on the current directory.
850 data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
851 if data:
852 keys = dict(line.split(': ', 1) for line in data.splitlines()
853 if ': ' in line)
854 return keys.get('URL', None)
855 return None
856
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000857 def GetRemoteUrl(self):
858 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
859
860 Returns None if there is no remote.
861 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000862 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +0000863 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
864
865 # If URL is pointing to a local directory, it is probably a git cache.
866 if os.path.isdir(url):
867 url = RunGit(['config', 'remote.%s.url' % remote],
868 error_ok=True,
869 cwd=url).strip()
870 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000871
872 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +0000873 """Returns the issue number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000874 if self.issue is None and not self.lookedup_issue:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000875 issue = RunGit(['config', self._IssueSetting()], error_ok=True).strip()
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000876 self.issue = int(issue) or None if issue else None
877 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000878 return self.issue
879
880 def GetRietveldServer(self):
evan@chromium.org0af9b702012-02-11 00:42:16 +0000881 if not self.rietveld_server:
882 # If we're on a branch then get the server potentially associated
883 # with that branch.
884 if self.GetIssue():
szager@chromium.orgd62c61f2014-10-20 22:33:21 +0000885 rietveld_server_config = self._RietveldServer()
886 if rietveld_server_config:
887 self.rietveld_server = gclient_utils.UpgradeToHttps(RunGit(
888 ['config', rietveld_server_config], error_ok=True).strip())
evan@chromium.org0af9b702012-02-11 00:42:16 +0000889 if not self.rietveld_server:
890 self.rietveld_server = settings.GetDefaultServerUrl()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000891 return self.rietveld_server
892
893 def GetIssueURL(self):
894 """Get the URL for a particular issue."""
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +0000895 if not self.GetIssue():
896 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000897 return '%s/%s' % (self.GetRietveldServer(), self.GetIssue())
898
899 def GetDescription(self, pretty=False):
900 if not self.has_description:
901 if self.GetIssue():
maruel@chromium.org52424302012-08-29 15:14:30 +0000902 issue = self.GetIssue()
miket@chromium.org183df1a2012-01-04 19:44:55 +0000903 try:
904 self.description = self.RpcServer().get_description(issue).strip()
maruel@chromium.org85616e02014-07-28 15:37:55 +0000905 except urllib2.HTTPError as e:
miket@chromium.org183df1a2012-01-04 19:44:55 +0000906 if e.code == 404:
907 DieWithError(
908 ('\nWhile fetching the description for issue %d, received a '
909 '404 (not found)\n'
910 'error. It is likely that you deleted this '
911 'issue on the server. If this is the\n'
912 'case, please run\n\n'
913 ' git cl issue 0\n\n'
914 'to clear the association with the deleted issue. Then run '
915 'this command again.') % issue)
916 else:
917 DieWithError(
yujie.mao@intel.comdaee1d32013-12-18 11:55:03 +0000918 '\nFailed to fetch issue description. HTTP error %d' % e.code)
maruel@chromium.org85616e02014-07-28 15:37:55 +0000919 except urllib2.URLError as e:
920 print >> sys.stderr, (
921 'Warning: Failed to retrieve CL description due to network '
922 'failure.')
923 self.description = ''
924
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000925 self.has_description = True
926 if pretty:
927 wrapper = textwrap.TextWrapper()
928 wrapper.initial_indent = wrapper.subsequent_indent = ' '
929 return wrapper.fill(self.description)
930 return self.description
931
932 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +0000933 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000934 if self.patchset is None and not self.lookedup_patchset:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000935 patchset = RunGit(['config', self._PatchsetSetting()],
936 error_ok=True).strip()
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000937 self.patchset = int(patchset) or None if patchset else None
938 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000939 return self.patchset
940
941 def SetPatchset(self, patchset):
942 """Set this branch's patchset. If patchset=0, clears the patchset."""
943 if patchset:
944 RunGit(['config', self._PatchsetSetting(), str(patchset)])
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000945 self.patchset = patchset
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000946 else:
947 RunGit(['config', '--unset', self._PatchsetSetting()],
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000948 stderr=subprocess2.PIPE, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000949 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000950
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000951 def GetMostRecentPatchset(self):
952 return self.GetIssueProperties()['patchsets'][-1]
binji@chromium.org0281f522012-09-14 13:37:59 +0000953
954 def GetPatchSetDiff(self, issue, patchset):
maruel@chromium.org27bb3872011-05-30 20:33:19 +0000955 return self.RpcServer().get(
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +0000956 '/download/issue%s_%s.diff' % (issue, patchset))
957
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000958 def GetIssueProperties(self):
959 if self._props is None:
960 issue = self.GetIssue()
961 if not issue:
962 self._props = {}
963 else:
964 self._props = self.RpcServer().get_issue_properties(issue, True)
965 return self._props
966
maruel@chromium.orgcf087782013-07-23 13:08:48 +0000967 def GetApprovingReviewers(self):
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000968 return get_approving_reviewers(self.GetIssueProperties())
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000969
apavlov@chromium.orge4efd512014-11-05 09:05:29 +0000970 def AddComment(self, message):
971 return self.RpcServer().add_comment(self.GetIssue(), message)
972
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000973 def SetIssue(self, issue):
974 """Set this branch's issue. If issue=0, clears the issue."""
975 if issue:
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000976 self.issue = issue
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000977 RunGit(['config', self._IssueSetting(), str(issue)])
978 if self.rietveld_server:
979 RunGit(['config', self._RietveldServer(), self.rietveld_server])
980 else:
teravest@chromium.orgd79d4b82013-10-23 20:09:08 +0000981 current_issue = self.GetIssue()
982 if current_issue:
983 RunGit(['config', '--unset', self._IssueSetting()])
maruel@chromium.org1033efd2013-07-23 23:25:09 +0000984 self.issue = None
985 self.SetPatchset(None)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000986
asvitkine@chromium.org15169952011-09-27 14:30:53 +0000987 def GetChange(self, upstream_branch, author):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000988 if not self.GitSanityChecks(upstream_branch):
989 DieWithError('\nGit sanity check failure')
990
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000991 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000992 if not root:
993 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +0000994 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +0000995
996 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000997 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +0000998 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +0000999 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001000 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001001 except subprocess2.CalledProcessError:
1002 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001003 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001004 'This branch probably doesn\'t exist anymore. To reset the\n'
1005 'tracking branch, please run\n'
1006 ' git branch --set-upstream %s trunk\n'
1007 'replacing trunk with origin/master or the relevant branch') %
1008 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001009
maruel@chromium.org52424302012-08-29 15:14:30 +00001010 issue = self.GetIssue()
1011 patchset = self.GetPatchset()
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001012 if issue:
1013 description = self.GetDescription()
1014 else:
1015 # If the change was never uploaded, use the log messages of all commits
1016 # up to the branch point, as git cl upload will prefill the description
1017 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001018 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1019 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001020
1021 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001022 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001023 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001024 name,
1025 description,
1026 absroot,
1027 files,
1028 issue,
1029 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001030 author,
1031 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001032
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001033 def GetStatus(self):
1034 """Apply a rough heuristic to give a simple summary of an issue's review
1035 or CQ status, assuming adherence to a common workflow.
1036
1037 Returns None if no issue for this branch, or one of the following keywords:
1038 * 'error' - error from review tool (including deleted issues)
1039 * 'unsent' - not sent for review
1040 * 'waiting' - waiting for review
1041 * 'reply' - waiting for owner to reply to review
1042 * 'lgtm' - LGTM from at least one approved reviewer
1043 * 'commit' - in the commit queue
1044 * 'closed' - closed
1045 """
1046 if not self.GetIssue():
1047 return None
1048
1049 try:
1050 props = self.GetIssueProperties()
1051 except urllib2.HTTPError:
1052 return 'error'
1053
1054 if props.get('closed'):
1055 # Issue is closed.
1056 return 'closed'
1057 if props.get('commit'):
1058 # Issue is in the commit queue.
1059 return 'commit'
1060
1061 try:
1062 reviewers = self.GetApprovingReviewers()
1063 except urllib2.HTTPError:
1064 return 'error'
1065
1066 if reviewers:
1067 # Was LGTM'ed.
1068 return 'lgtm'
1069
1070 messages = props.get('messages') or []
1071
1072 if not messages:
1073 # No message was sent.
1074 return 'unsent'
1075 if messages[-1]['sender'] != props.get('owner_email'):
1076 # Non-LGTM reply from non-owner
1077 return 'reply'
1078 return 'waiting'
1079
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00001080 def RunHook(self, committing, may_prompt, verbose, change):
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001081 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001082
1083 try:
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00001084 return presubmit_support.DoPresubmitChecks(change, committing,
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001085 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
maruel@chromium.orgcc73ad62011-07-06 17:39:26 +00001086 default_presubmit=None, may_prompt=may_prompt,
maruel@chromium.org239f4112011-06-03 20:08:23 +00001087 rietveld_obj=self.RpcServer())
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001088 except presubmit_support.PresubmitFailure, e:
1089 DieWithError(
1090 ('%s\nMaybe your depot_tools is out of date?\n'
1091 'If all fails, contact maruel@') % e)
1092
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001093 def UpdateDescription(self, description):
1094 self.description = description
1095 return self.RpcServer().update_description(
1096 self.GetIssue(), self.description)
1097
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001098 def CloseIssue(self):
maruel@chromium.org607bb1b2011-06-01 23:43:11 +00001099 """Updates the description and closes the issue."""
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001100 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001101
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001102 def SetFlag(self, flag, value):
1103 """Patchset must match."""
1104 if not self.GetPatchset():
1105 DieWithError('The patchset needs to match. Send another patchset.')
1106 try:
1107 return self.RpcServer().set_flag(
maruel@chromium.org52424302012-08-29 15:14:30 +00001108 self.GetIssue(), self.GetPatchset(), flag, value)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00001109 except urllib2.HTTPError, e:
1110 if e.code == 404:
1111 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
1112 if e.code == 403:
1113 DieWithError(
1114 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
1115 'match?') % (self.GetIssue(), self.GetPatchset()))
1116 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001117
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00001118 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001119 """Returns an upload.RpcServer() to access this review's rietveld instance.
1120 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001121 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00001122 self._rpc_server = rietveld.CachingRietveld(
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001123 self.GetRietveldServer(),
1124 self._auth_config or auth.make_auth_config())
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00001125 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001126
1127 def _IssueSetting(self):
1128 """Return the git setting that stores this change's issue."""
1129 return 'branch.%s.rietveldissue' % self.GetBranch()
1130
1131 def _PatchsetSetting(self):
1132 """Return the git setting that stores this change's most recent patchset."""
1133 return 'branch.%s.rietveldpatchset' % self.GetBranch()
1134
1135 def _RietveldServer(self):
1136 """Returns the git setting that stores this change's rietveld server."""
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001137 branch = self.GetBranch()
1138 if branch:
1139 return 'branch.%s.rietveldserver' % branch
1140 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001141
1142
1143def GetCodereviewSettingsInteractively():
1144 """Prompt the user for settings."""
ukai@chromium.orge8077812012-02-03 03:41:46 +00001145 # TODO(ukai): ask code review system is rietveld or gerrit?
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001146 server = settings.GetDefaultServerUrl(error_ok=True)
1147 prompt = 'Rietveld server (host[:port])'
1148 prompt += ' [%s]' % (server or DEFAULT_SERVER)
maruel@chromium.org90541732011-04-01 17:54:18 +00001149 newserver = ask_for_data(prompt + ':')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001150 if not server and not newserver:
1151 newserver = DEFAULT_SERVER
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00001152 if newserver:
1153 newserver = gclient_utils.UpgradeToHttps(newserver)
1154 if newserver != server:
1155 RunGit(['config', 'rietveld.server', newserver])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001156
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00001157 def SetProperty(initial, caption, name, is_url):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001158 prompt = caption
1159 if initial:
1160 prompt += ' ("x" to clear) [%s]' % initial
maruel@chromium.org90541732011-04-01 17:54:18 +00001161 new_val = ask_for_data(prompt + ':')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001162 if new_val == 'x':
1163 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00001164 elif new_val:
1165 if is_url:
1166 new_val = gclient_utils.UpgradeToHttps(new_val)
1167 if new_val != initial:
1168 RunGit(['config', 'rietveld.' + name, new_val])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001169
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00001170 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00001171 SetProperty(settings.GetDefaultPrivateFlag(),
1172 'Private flag (rietveld only)', 'private', False)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001173 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00001174 'tree-status-url', False)
1175 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
rmistry@google.com90752582014-01-14 21:04:50 +00001176 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
rmistry@google.com5626a922015-02-26 14:03:30 +00001177 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
1178 'run-post-upload-hook', False)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001179
1180 # TODO: configure a default branch to diff against, rather than this
1181 # svn-based hackery.
1182
1183
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001184class ChangeDescription(object):
1185 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001186 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
agable@chromium.org42c20792013-09-12 17:34:49 +00001187 BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001188
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001189 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00001190 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001191
agable@chromium.org42c20792013-09-12 17:34:49 +00001192 @property # www.logilab.org/ticket/89786
1193 def description(self): # pylint: disable=E0202
1194 return '\n'.join(self._description_lines)
1195
1196 def set_description(self, desc):
1197 if isinstance(desc, basestring):
1198 lines = desc.splitlines()
1199 else:
1200 lines = [line.rstrip() for line in desc]
1201 while lines and not lines[0]:
1202 lines.pop(0)
1203 while lines and not lines[-1]:
1204 lines.pop(-1)
1205 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001206
piman@chromium.org336f9122014-09-04 02:16:55 +00001207 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00001208 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001209 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00001210 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001211 return
agable@chromium.org42c20792013-09-12 17:34:49 +00001212 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001213
agable@chromium.org42c20792013-09-12 17:34:49 +00001214 # Get the set of R= and TBR= lines and remove them from the desciption.
1215 regexp = re.compile(self.R_LINE)
1216 matches = [regexp.match(line) for line in self._description_lines]
1217 new_desc = [l for i, l in enumerate(self._description_lines)
1218 if not matches[i]]
1219 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001220
agable@chromium.org42c20792013-09-12 17:34:49 +00001221 # Construct new unified R= and TBR= lines.
1222 r_names = []
1223 tbr_names = []
1224 for match in matches:
1225 if not match:
1226 continue
1227 people = cleanup_list([match.group(2).strip()])
1228 if match.group(1) == 'TBR':
1229 tbr_names.extend(people)
1230 else:
1231 r_names.extend(people)
1232 for name in r_names:
1233 if name not in reviewers:
1234 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00001235 if add_owners_tbr:
1236 owners_db = owners.Database(change.RepositoryRoot(),
1237 fopen=file, os_path=os.path, glob=glob.glob)
1238 all_reviewers = set(tbr_names + reviewers)
1239 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
1240 all_reviewers)
1241 tbr_names.extend(owners_db.reviewers_for(missing_files,
1242 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00001243 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
1244 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
1245
1246 # Put the new lines in the description where the old first R= line was.
1247 line_loc = next((i for i, match in enumerate(matches) if match), -1)
1248 if 0 <= line_loc < len(self._description_lines):
1249 if new_tbr_line:
1250 self._description_lines.insert(line_loc, new_tbr_line)
1251 if new_r_line:
1252 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001253 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00001254 if new_r_line:
1255 self.append_footer(new_r_line)
1256 if new_tbr_line:
1257 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001258
1259 def prompt(self):
1260 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00001261 self.set_description([
1262 '# Enter a description of the change.',
1263 '# This will be displayed on the codereview site.',
1264 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00001265 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00001266 '--------------------',
1267 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001268
agable@chromium.org42c20792013-09-12 17:34:49 +00001269 regexp = re.compile(self.BUG_LINE)
1270 if not any((regexp.match(line) for line in self._description_lines)):
rmistry@google.com90752582014-01-14 21:04:50 +00001271 self.append_footer('BUG=%s' % settings.GetBugPrefix())
agable@chromium.org42c20792013-09-12 17:34:49 +00001272 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00001273 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00001274 if not content:
1275 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00001276 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001277
1278 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00001279 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
1280 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00001281 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00001282 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001283
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001284 def append_footer(self, line):
agable@chromium.org42c20792013-09-12 17:34:49 +00001285 if self._description_lines:
1286 # Add an empty line if either the last line or the new line isn't a tag.
1287 last_line = self._description_lines[-1]
1288 if (not presubmit_support.Change.TAG_LINE_RE.match(last_line) or
1289 not presubmit_support.Change.TAG_LINE_RE.match(line)):
1290 self._description_lines.append('')
1291 self._description_lines.append(line)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001292
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001293 def get_reviewers(self):
1294 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00001295 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
1296 reviewers = [match.group(2).strip() for match in matches if match]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001297 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00001298
1299
maruel@chromium.orge52678e2013-04-26 18:34:44 +00001300def get_approving_reviewers(props):
1301 """Retrieves the reviewers that approved a CL from the issue properties with
1302 messages.
1303
1304 Note that the list may contain reviewers that are not committer, thus are not
1305 considered by the CQ.
1306 """
1307 return sorted(
1308 set(
1309 message['sender']
1310 for message in props['messages']
1311 if message['approval'] and message['sender'] in props['reviewers']
1312 )
1313 )
1314
1315
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001316def FindCodereviewSettingsFile(filename='codereview.settings'):
1317 """Finds the given file starting in the cwd and going up.
1318
1319 Only looks up to the top of the repository unless an
1320 'inherit-review-settings-ok' file exists in the root of the repository.
1321 """
1322 inherit_ok_file = 'inherit-review-settings-ok'
1323 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001324 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001325 if os.path.isfile(os.path.join(root, inherit_ok_file)):
1326 root = '/'
1327 while True:
1328 if filename in os.listdir(cwd):
1329 if os.path.isfile(os.path.join(cwd, filename)):
1330 return open(os.path.join(cwd, filename))
1331 if cwd == root:
1332 break
1333 cwd = os.path.dirname(cwd)
1334
1335
1336def LoadCodereviewSettingsFromFile(fileobj):
1337 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00001338 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001339
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001340 def SetProperty(name, setting, unset_error_ok=False):
1341 fullname = 'rietveld.' + name
1342 if setting in keyvals:
1343 RunGit(['config', fullname, keyvals[setting]])
1344 else:
1345 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
1346
1347 SetProperty('server', 'CODE_REVIEW_SERVER')
1348 # Only server setting is required. Other settings can be absent.
1349 # In that case, we ignore errors raised during option deletion attempt.
1350 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00001351 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001352 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
1353 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00001354 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00001355 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00001356 SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL',
1357 unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00001358 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00001359 SetProperty('project', 'PROJECT', unset_error_ok=True)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00001360 SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00001361 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
1362 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001363
ukai@chromium.org7044efc2013-11-28 01:51:21 +00001364 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00001365 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00001366
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001367 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
1368 #should be of the form
1369 #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
1370 #ORIGIN_URL_CONFIG: http://src.chromium.org/git
1371 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
1372 keyvals['ORIGIN_URL_CONFIG']])
1373
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001374
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00001375def urlretrieve(source, destination):
1376 """urllib is broken for SSL connections via a proxy therefore we
1377 can't use urllib.urlretrieve()."""
1378 with open(destination, 'w') as f:
1379 f.write(urllib2.urlopen(source).read())
1380
1381
ukai@chromium.org712d6102013-11-27 00:52:58 +00001382def hasSheBang(fname):
1383 """Checks fname is a #! script."""
1384 with open(fname) as f:
1385 return f.read(2).startswith('#!')
1386
1387
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001388def DownloadHooks(force):
1389 """downloads hooks
1390
1391 Args:
1392 force: True to update hooks. False to install hooks if not present.
1393 """
1394 if not settings.GetIsGerrit():
1395 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00001396 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001397 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
1398 if not os.access(dst, os.X_OK):
1399 if os.path.exists(dst):
1400 if not force:
1401 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001402 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00001403 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00001404 if not hasSheBang(dst):
1405 DieWithError('Not a script: %s\n'
1406 'You need to download from\n%s\n'
1407 'into .git/hooks/commit-msg and '
1408 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001409 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
1410 except Exception:
1411 if os.path.exists(dst):
1412 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00001413 DieWithError('\nFailed to download hooks.\n'
1414 'You need to download from\n%s\n'
1415 'into .git/hooks/commit-msg and '
1416 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001417
1418
maruel@chromium.org0633fb42013-08-16 20:06:14 +00001419@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001420def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001421 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001422
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00001423 parser.add_option('--activate-update', action='store_true',
1424 help='activate auto-updating [rietveld] section in '
1425 '.git/config')
1426 parser.add_option('--deactivate-update', action='store_true',
1427 help='deactivate auto-updating [rietveld] section in '
1428 '.git/config')
1429 options, args = parser.parse_args(args)
1430
1431 if options.deactivate_update:
1432 RunGit(['config', 'rietveld.autoupdate', 'false'])
1433 return
1434
1435 if options.activate_update:
1436 RunGit(['config', '--unset', 'rietveld.autoupdate'])
1437 return
1438
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001439 if len(args) == 0:
1440 GetCodereviewSettingsInteractively()
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001441 DownloadHooks(True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001442 return 0
1443
1444 url = args[0]
1445 if not url.endswith('codereview.settings'):
1446 url = os.path.join(url, 'codereview.settings')
1447
1448 # Load code review settings and download hooks (if available).
1449 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00001450 DownloadHooks(True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001451 return 0
1452
1453
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001454def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001455 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001456 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
1457 branch = ShortBranchName(branchref)
1458 _, args = parser.parse_args(args)
1459 if not args:
1460 print("Current base-url:")
1461 return RunGit(['config', 'branch.%s.base-url' % branch],
1462 error_ok=False).strip()
1463 else:
1464 print("Setting base-url to %s" % args[0])
1465 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
1466 error_ok=False).strip()
1467
1468
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001469def color_for_status(status):
1470 """Maps a Changelist status to color, for CMDstatus and other tools."""
1471 return {
1472 'unsent': Fore.RED,
1473 'waiting': Fore.BLUE,
1474 'reply': Fore.YELLOW,
1475 'lgtm': Fore.GREEN,
1476 'commit': Fore.MAGENTA,
1477 'closed': Fore.CYAN,
1478 'error': Fore.WHITE,
1479 }.get(status, Fore.WHITE)
1480
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001481def fetch_cl_status(branch, auth_config=None):
1482 """Fetches information for an issue and returns (branch, issue, status)."""
1483 cl = Changelist(branchref=branch, auth_config=auth_config)
1484 url = cl.GetIssueURL()
1485 status = cl.GetStatus()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001486
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001487 if url and (not status or status == 'error'):
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001488 # The issue probably doesn't exist anymore.
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001489 url += ' (broken)'
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001490
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001491 return (branch, url, status)
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001492
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001493def get_cl_statuses(
1494 branches, fine_grained, max_processes=None, auth_config=None):
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001495 """Returns a blocking iterable of (branch, issue, color) for given branches.
1496
1497 If fine_grained is true, this will fetch CL statuses from the server.
1498 Otherwise, simply indicate if there's a matching url for the given branches.
1499
1500 If max_processes is specified, it is used as the maximum number of processes
1501 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
1502 spawned.
1503 """
1504 # Silence upload.py otherwise it becomes unwieldly.
1505 upload.verbosity = 0
1506
1507 if fine_grained:
1508 # Process one branch synchronously to work through authentication, then
1509 # spawn processes to process all the other branches in parallel.
1510 if branches:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001511 fetch = lambda branch: fetch_cl_status(branch, auth_config=auth_config)
1512 yield fetch(branches[0])
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001513
1514 branches_to_fetch = branches[1:]
1515 pool = ThreadPool(
1516 min(max_processes, len(branches_to_fetch))
1517 if max_processes is not None
1518 else len(branches_to_fetch))
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001519 for x in pool.imap_unordered(fetch, branches_to_fetch):
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001520 yield x
1521 else:
1522 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
1523 for b in branches:
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001524 cl = Changelist(branchref=b, auth_config=auth_config)
1525 url = cl.GetIssueURL()
1526 yield (b, url, 'waiting' if url else 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001527
rmistry@google.com2dd99862015-06-22 12:22:18 +00001528
1529def upload_branch_deps(cl, args):
1530 """Uploads CLs of local branches that are dependents of the current branch.
1531
1532 If the local branch dependency tree looks like:
1533 test1 -> test2.1 -> test3.1
1534 -> test3.2
1535 -> test2.2 -> test3.3
1536
1537 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
1538 run on the dependent branches in this order:
1539 test2.1, test3.1, test3.2, test2.2, test3.3
1540
1541 Note: This function does not rebase your local dependent branches. Use it when
1542 you make a change to the parent branch that will not conflict with its
1543 dependent branches, and you would like their dependencies updated in
1544 Rietveld.
1545 """
1546 if git_common.is_dirty_git_tree('upload-branch-deps'):
1547 return 1
1548
1549 root_branch = cl.GetBranch()
1550 if root_branch is None:
1551 DieWithError('Can\'t find dependent branches from detached HEAD state. '
1552 'Get on a branch!')
1553 if not cl.GetIssue() or not cl.GetPatchset():
1554 DieWithError('Current branch does not have an uploaded CL. We cannot set '
1555 'patchset dependencies without an uploaded CL.')
1556
1557 branches = RunGit(['for-each-ref',
1558 '--format=%(refname:short) %(upstream:short)',
1559 'refs/heads'])
1560 if not branches:
1561 print('No local branches found.')
1562 return 0
1563
1564 # Create a dictionary of all local branches to the branches that are dependent
1565 # on it.
1566 tracked_to_dependents = collections.defaultdict(list)
1567 for b in branches.splitlines():
1568 tokens = b.split()
1569 if len(tokens) == 2:
1570 branch_name, tracked = tokens
1571 tracked_to_dependents[tracked].append(branch_name)
1572
1573 print
1574 print 'The dependent local branches of %s are:' % root_branch
1575 dependents = []
1576 def traverse_dependents_preorder(branch, padding=''):
1577 dependents_to_process = tracked_to_dependents.get(branch, [])
1578 padding += ' '
1579 for dependent in dependents_to_process:
1580 print '%s%s' % (padding, dependent)
1581 dependents.append(dependent)
1582 traverse_dependents_preorder(dependent, padding)
1583 traverse_dependents_preorder(root_branch)
1584 print
1585
1586 if not dependents:
1587 print 'There are no dependent local branches for %s' % root_branch
1588 return 0
1589
1590 print ('This command will checkout all dependent branches and run '
1591 '"git cl upload".')
1592 ask_for_data('[Press enter to continue or ctrl-C to quit]')
1593
1594 # Add a default patchset title to all upload calls.
1595 args.extend(['-t', 'Updated patchset dependency'])
1596 # Record all dependents that failed to upload.
1597 failures = {}
1598 # Go through all dependents, checkout the branch and upload.
1599 try:
1600 for dependent_branch in dependents:
1601 print
1602 print '--------------------------------------'
1603 print 'Running "git cl upload" from %s:' % dependent_branch
1604 RunGit(['checkout', '-q', dependent_branch])
1605 print
1606 try:
1607 if CMDupload(OptionParser(), args) != 0:
1608 print 'Upload failed for %s!' % dependent_branch
1609 failures[dependent_branch] = 1
1610 except: # pylint: disable=W0702
1611 failures[dependent_branch] = 1
1612 print
1613 finally:
1614 # Swap back to the original root branch.
1615 RunGit(['checkout', '-q', root_branch])
1616
1617 print
1618 print 'Upload complete for dependent branches!'
1619 for dependent_branch in dependents:
1620 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
1621 print ' %s : %s' % (dependent_branch, upload_status)
1622 print
1623
1624 return 0
1625
1626
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001627def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001628 """Show status of changelists.
1629
1630 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00001631 - Red not sent for review or broken
1632 - Blue waiting for review
1633 - Yellow waiting for you to reply to review
1634 - Green LGTM'ed
1635 - Magenta in the commit queue
1636 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001637
1638 Also see 'git cl comments'.
1639 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001640 parser.add_option('--field',
1641 help='print only specific field (desc|id|patch|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001642 parser.add_option('-f', '--fast', action='store_true',
1643 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001644 parser.add_option(
1645 '-j', '--maxjobs', action='store', type=int,
1646 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001647
1648 auth.add_auth_options(parser)
1649 options, args = parser.parse_args(args)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00001650 if args:
1651 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001652 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001653
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001654 if options.field:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001655 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001656 if options.field.startswith('desc'):
1657 print cl.GetDescription()
1658 elif options.field == 'id':
1659 issueid = cl.GetIssue()
1660 if issueid:
1661 print issueid
1662 elif options.field == 'patch':
1663 patchset = cl.GetPatchset()
1664 if patchset:
1665 print patchset
1666 elif options.field == 'url':
1667 url = cl.GetIssueURL()
1668 if url:
1669 print url
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00001670 return 0
1671
1672 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
1673 if not branches:
1674 print('No local branch found.')
1675 return 0
1676
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001677 changes = (
1678 Changelist(branchref=b, auth_config=auth_config)
1679 for b in branches.splitlines())
jrobbins@chromium.orga4c03052014-04-25 19:06:36 +00001680 branches = [c.GetBranch() for c in changes]
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00001681 alignment = max(5, max(len(b) for b in branches))
1682 print 'Branches associated with reviews:'
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001683 output = get_cl_statuses(branches,
1684 fine_grained=not options.fast,
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001685 max_processes=options.maxjobs,
1686 auth_config=auth_config)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001687
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001688 branch_statuses = {}
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001689 alignment = max(5, max(len(ShortBranchName(b)) for b in branches))
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00001690 for branch in sorted(branches):
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00001691 while branch not in branch_statuses:
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001692 b, i, status = output.next()
1693 branch_statuses[b] = (i, status)
1694 issue_url, status = branch_statuses.pop(branch)
1695 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00001696 reset = Fore.RESET
1697 if not sys.stdout.isatty():
1698 color = ''
1699 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00001700 status_str = '(%s)' % status if status else ''
1701 print ' %*s : %s%s %s%s' % (
1702 alignment, ShortBranchName(branch), color, issue_url, status_str,
1703 reset)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001704
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001705 cl = Changelist(auth_config=auth_config)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00001706 print
1707 print 'Current branch:',
1708 if not cl.GetIssue():
1709 print 'no issue assigned.'
1710 return 0
1711 print cl.GetBranch()
1712 print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
maruel@chromium.org85616e02014-07-28 15:37:55 +00001713 if not options.fast:
1714 print 'Issue description:'
1715 print cl.GetDescription(pretty=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001716 return 0
1717
1718
maruel@chromium.org39c0b222013-08-17 16:57:01 +00001719def colorize_CMDstatus_doc():
1720 """To be called once in main() to add colors to git cl status help."""
1721 colors = [i for i in dir(Fore) if i[0].isupper()]
1722
1723 def colorize_line(line):
1724 for color in colors:
1725 if color in line.upper():
1726 # Extract whitespaces first and the leading '-'.
1727 indent = len(line) - len(line.lstrip(' ')) + 1
1728 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
1729 return line
1730
1731 lines = CMDstatus.__doc__.splitlines()
1732 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
1733
1734
maruel@chromium.org0633fb42013-08-16 20:06:14 +00001735@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001736def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001737 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001738
1739 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001740 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00001741 parser.add_option('-r', '--reverse', action='store_true',
1742 help='Lookup the branch(es) for the specified issues. If '
1743 'no issues are specified, all branches with mapped '
1744 'issues will be listed.')
1745 options, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001746
dnj@chromium.org406c4402015-03-03 17:22:28 +00001747 if options.reverse:
1748 branches = RunGit(['for-each-ref', 'refs/heads',
1749 '--format=%(refname:short)']).splitlines()
1750
1751 # Reverse issue lookup.
1752 issue_branch_map = {}
1753 for branch in branches:
1754 cl = Changelist(branchref=branch)
1755 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
1756 if not args:
1757 args = sorted(issue_branch_map.iterkeys())
1758 for issue in args:
1759 if not issue:
1760 continue
1761 print 'Branch for issue number %s: %s' % (
1762 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',)))
1763 else:
1764 cl = Changelist()
1765 if len(args) > 0:
1766 try:
1767 issue = int(args[0])
1768 except ValueError:
1769 DieWithError('Pass a number to set the issue or none to list it.\n'
1770 'Maybe you want to run git cl status?')
1771 cl.SetIssue(issue)
1772 print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001773 return 0
1774
1775
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00001776def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00001777 """Shows or posts review comments for any changelist."""
1778 parser.add_option('-a', '--add-comment', dest='comment',
1779 help='comment to add to an issue')
1780 parser.add_option('-i', dest='issue',
1781 help="review issue id (defaults to current issue)")
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001782 auth.add_auth_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00001783 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001784 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00001785
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00001786 issue = None
1787 if options.issue:
1788 try:
1789 issue = int(options.issue)
1790 except ValueError:
1791 DieWithError('A review issue id is expected to be a number')
1792
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001793 cl = Changelist(issue=issue, auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00001794
1795 if options.comment:
1796 cl.AddComment(options.comment)
1797 return 0
1798
1799 data = cl.GetIssueProperties()
maruel@chromium.org5cab2d32014-11-11 18:32:41 +00001800 for message in sorted(data.get('messages', []), key=lambda x: x['date']):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00001801 if message['disapproval']:
1802 color = Fore.RED
1803 elif message['approval']:
1804 color = Fore.GREEN
1805 elif message['sender'] == data['owner_email']:
1806 color = Fore.MAGENTA
1807 else:
1808 color = Fore.BLUE
1809 print '\n%s%s %s%s' % (
1810 color, message['date'].split('.', 1)[0], message['sender'],
1811 Fore.RESET)
1812 if message['text'].strip():
1813 print '\n'.join(' ' + l for l in message['text'].splitlines())
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00001814 return 0
1815
1816
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00001817def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001818 """Brings up the editor for the current CL's description."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001819 auth.add_auth_options(parser)
1820 options, _ = parser.parse_args(args)
1821 auth_config = auth.extract_auth_config_from_options(options)
1822 cl = Changelist(auth_config=auth_config)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00001823 if not cl.GetIssue():
1824 DieWithError('This branch has no associated changelist.')
1825 description = ChangeDescription(cl.GetDescription())
1826 description.prompt()
wychen@chromium.org063e4e52015-04-03 06:51:44 +00001827 if cl.GetDescription() != description.description:
1828 cl.UpdateDescription(description.description)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00001829 return 0
1830
1831
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001832def CreateDescriptionFromLog(args):
1833 """Pulls out the commit log to use as a base for the CL description."""
1834 log_args = []
1835 if len(args) == 1 and not args[0].endswith('.'):
1836 log_args = [args[0] + '..']
1837 elif len(args) == 1 and args[0].endswith('...'):
1838 log_args = [args[0][:-1]]
1839 elif len(args) == 2:
1840 log_args = [args[0] + '..' + args[1]]
1841 else:
1842 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00001843 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001844
1845
thestig@chromium.org44202a22014-03-11 19:22:18 +00001846def CMDlint(parser, args):
1847 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00001848 parser.add_option('--filter', action='append', metavar='-x,+y',
1849 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001850 auth.add_auth_options(parser)
1851 options, args = parser.parse_args(args)
1852 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00001853
1854 # Access to a protected member _XX of a client class
1855 # pylint: disable=W0212
1856 try:
1857 import cpplint
1858 import cpplint_chromium
1859 except ImportError:
1860 print "Your depot_tools is missing cpplint.py and/or cpplint_chromium.py."
1861 return 1
1862
1863 # Change the current working directory before calling lint so that it
1864 # shows the correct base.
1865 previous_cwd = os.getcwd()
1866 os.chdir(settings.GetRoot())
1867 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001868 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00001869 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
1870 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00001871 if not files:
1872 print "Cannot lint an empty CL"
1873 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00001874
1875 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00001876 command = args + files
1877 if options.filter:
1878 command = ['--filter=' + ','.join(options.filter)] + command
1879 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00001880
1881 white_regex = re.compile(settings.GetLintRegex())
1882 black_regex = re.compile(settings.GetLintIgnoreRegex())
1883 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
1884 for filename in filenames:
1885 if white_regex.match(filename):
1886 if black_regex.match(filename):
1887 print "Ignoring file %s" % filename
1888 else:
1889 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
1890 extra_check_functions)
1891 else:
1892 print "Skipping file %s" % filename
1893 finally:
1894 os.chdir(previous_cwd)
1895 print "Total errors found: %d\n" % cpplint._cpplint_state.error_count
1896 if cpplint._cpplint_state.error_count != 0:
1897 return 1
1898 return 0
1899
1900
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001901def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00001902 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00001903 parser.add_option('-u', '--upload', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001904 help='Run upload hook instead of the push/dcommit hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00001905 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00001906 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001907 auth.add_auth_options(parser)
1908 options, args = parser.parse_args(args)
1909 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001910
sbc@chromium.org71437c02015-04-09 19:29:40 +00001911 if not options.force and git_common.is_dirty_git_tree('presubmit'):
ukai@chromium.org259e4682012-10-25 07:36:33 +00001912 print 'use --force to check even if tree is dirty.'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001913 return 1
1914
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001915 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001916 if args:
1917 base_branch = args[0]
1918 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001919 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001920 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001921
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00001922 cl.RunHook(
1923 committing=not options.upload,
1924 may_prompt=False,
1925 verbose=options.verbose,
1926 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00001927 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001928
1929
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001930def AddChangeIdToCommitMessage(options, args):
1931 """Re-commits using the current message, assumes the commit hook is in
1932 place.
1933 """
1934 log_desc = options.message or CreateDescriptionFromLog(args)
1935 git_command = ['commit', '--amend', '-m', log_desc]
1936 RunGit(git_command)
1937 new_log_desc = CreateDescriptionFromLog(args)
1938 if CHANGE_ID in new_log_desc:
1939 print 'git-cl: Added Change-Id to commit message.'
1940 else:
1941 print >> sys.stderr, 'ERROR: Gerrit commit-msg hook not available.'
1942
1943
piman@chromium.org336f9122014-09-04 02:16:55 +00001944def GerritUpload(options, args, cl, change):
ukai@chromium.orge8077812012-02-03 03:41:46 +00001945 """upload the current branch to gerrit."""
1946 # We assume the remote called "origin" is the one we want.
1947 # It is probably not worthwhile to support different workflows.
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001948 gerrit_remote = 'origin'
luqui@chromium.org609f3952015-05-04 22:47:04 +00001949
1950 remote, remote_branch = cl.GetRemoteBranch()
1951 branch = GetTargetRef(remote, remote_branch, options.target_branch,
1952 pending_prefix='')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001953
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001954 change_desc = ChangeDescription(
1955 options.message or CreateDescriptionFromLog(args))
1956 if not change_desc.description:
ukai@chromium.orge8077812012-02-03 03:41:46 +00001957 print "Description is empty; aborting."
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001958 return 1
bauerb@chromium.orgf75c2302014-05-01 08:19:30 +00001959
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001960 if options.squash:
1961 # Try to get the message from a previous upload.
1962 shadow_branch = 'refs/heads/git_cl_uploads/' + cl.GetBranch()
1963 message = RunGitSilent(['show', '--format=%s\n\n%b', '-s', shadow_branch])
1964 if not message:
1965 if not options.force:
1966 change_desc.prompt()
1967
1968 if CHANGE_ID not in change_desc.description:
1969 # Run the commit-msg hook without modifying the head commit by writing
1970 # the commit message to a temporary file and running the hook over it,
1971 # then reading the file back in.
1972 commit_msg_hook = os.path.join(settings.GetRoot(), '.git', 'hooks',
1973 'commit-msg')
1974 file_handle, msg_file = tempfile.mkstemp(text=True,
1975 prefix='commit_msg')
1976 try:
1977 try:
1978 with os.fdopen(file_handle, 'w') as fileobj:
1979 fileobj.write(change_desc.description)
1980 finally:
1981 os.close(file_handle)
1982 RunCommand([commit_msg_hook, msg_file])
1983 change_desc.set_description(gclient_utils.FileRead(msg_file))
1984 finally:
1985 os.remove(msg_file)
1986
1987 if not change_desc.description:
1988 print "Description is empty; aborting."
1989 return 1
1990
1991 message = change_desc.description
1992
1993 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
1994 if remote is '.':
1995 # If our upstream branch is local, we base our squashed commit on its
1996 # squashed version.
1997 parent = ('refs/heads/git_cl_uploads/' +
1998 scm.GIT.ShortBranchName(upstream_branch))
1999
2000 # Verify that the upstream branch has been uploaded too, otherwise Gerrit
2001 # will create additional CLs when uploading.
2002 if (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2003 RunGitSilent(['rev-parse', parent + ':'])):
2004 print 'Upload upstream branch ' + upstream_branch + ' first.'
2005 return 1
2006 else:
2007 parent = cl.GetCommonAncestorWithUpstream()
2008
2009 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2010 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2011 '-m', message]).strip()
2012 else:
2013 if CHANGE_ID not in change_desc.description:
2014 AddChangeIdToCommitMessage(options, args)
2015 ref_to_push = 'HEAD'
2016 parent = '%s/%s' % (gerrit_remote, branch)
2017
2018 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2019 ref_to_push)]).splitlines()
bauerb@chromium.orgf75c2302014-05-01 08:19:30 +00002020 if len(commits) > 1:
2021 print('WARNING: This will upload %d commits. Run the following command '
2022 'to see which commits will be uploaded: ' % len(commits))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002023 print('git log %s..%s' % (parent, ref_to_push))
2024 print('You can also use `git squash-branch` to squash these into a single '
bauerb@chromium.orgf75c2302014-05-01 08:19:30 +00002025 'commit.')
2026 ask_for_data('About to upload; enter to confirm.')
2027
piman@chromium.org336f9122014-09-04 02:16:55 +00002028 if options.reviewers or options.tbr_owners:
2029 change_desc.update_reviewers(options.reviewers, options.tbr_owners, change)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002030
ukai@chromium.orge8077812012-02-03 03:41:46 +00002031 receive_options = []
2032 cc = cl.GetCCList().split(',')
2033 if options.cc:
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00002034 cc.extend(options.cc)
ukai@chromium.orge8077812012-02-03 03:41:46 +00002035 cc = filter(None, cc)
2036 if cc:
2037 receive_options += ['--cc=' + email for email in cc]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002038 if change_desc.get_reviewers():
2039 receive_options.extend(
2040 '--reviewer=' + email for email in change_desc.get_reviewers())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002041
ukai@chromium.orge8077812012-02-03 03:41:46 +00002042 git_command = ['push']
2043 if receive_options:
ukai@chromium.org19bbfa22012-02-03 16:18:11 +00002044 git_command.append('--receive-pack=git receive-pack %s' %
ukai@chromium.orge8077812012-02-03 03:41:46 +00002045 ' '.join(receive_options))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002046 git_command += [gerrit_remote, ref_to_push + ':refs/for/' + branch]
ukai@chromium.orge8077812012-02-03 03:41:46 +00002047 RunGit(git_command)
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002048
2049 if options.squash:
2050 head = RunGit(['rev-parse', 'HEAD']).strip()
2051 RunGit(['update-ref', '-m', 'Uploaded ' + head, shadow_branch, ref_to_push])
2052
ukai@chromium.orge8077812012-02-03 03:41:46 +00002053 # TODO(ukai): parse Change-Id: and set issue number?
2054 return 0
dpranke@chromium.org970c5222011-03-12 00:32:24 +00002055
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002056
wittman@chromium.org455dc922015-01-26 20:15:50 +00002057def GetTargetRef(remote, remote_branch, target_branch, pending_prefix):
2058 """Computes the remote branch ref to use for the CL.
2059
2060 Args:
2061 remote (str): The git remote for the CL.
2062 remote_branch (str): The git remote branch for the CL.
2063 target_branch (str): The target branch specified by the user.
2064 pending_prefix (str): The pending prefix from the settings.
2065 """
2066 if not (remote and remote_branch):
2067 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002068
wittman@chromium.org455dc922015-01-26 20:15:50 +00002069 if target_branch:
2070 # Cannonicalize branch references to the equivalent local full symbolic
2071 # refs, which are then translated into the remote full symbolic refs
2072 # below.
2073 if '/' not in target_branch:
2074 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
2075 else:
2076 prefix_replacements = (
2077 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
2078 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
2079 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
2080 )
2081 match = None
2082 for regex, replacement in prefix_replacements:
2083 match = re.search(regex, target_branch)
2084 if match:
2085 remote_branch = target_branch.replace(match.group(0), replacement)
2086 break
2087 if not match:
2088 # This is a branch path but not one we recognize; use as-is.
2089 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00002090 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
2091 # Handle the refs that need to land in different refs.
2092 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002093
wittman@chromium.org455dc922015-01-26 20:15:50 +00002094 # Create the true path to the remote branch.
2095 # Does the following translation:
2096 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
2097 # * refs/remotes/origin/master -> refs/heads/master
2098 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
2099 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
2100 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
2101 elif remote_branch.startswith('refs/remotes/%s/' % remote):
2102 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
2103 'refs/heads/')
2104 elif remote_branch.startswith('refs/remotes/branch-heads'):
2105 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
2106 # If a pending prefix exists then replace refs/ with it.
2107 if pending_prefix:
2108 remote_branch = remote_branch.replace('refs/', pending_prefix)
2109 return remote_branch
2110
2111
piman@chromium.org336f9122014-09-04 02:16:55 +00002112def RietveldUpload(options, args, cl, change):
ukai@chromium.orge8077812012-02-03 03:41:46 +00002113 """upload the patch to rietveld."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002114 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2115 upload_args.extend(['--server', cl.GetRietveldServer()])
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002116 upload_args.extend(auth.auth_config_to_command_options(cl.auth_config))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002117 if options.emulate_svn_auto_props:
2118 upload_args.append('--emulate_svn_auto_props')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002119
2120 change_desc = None
2121
pgervais@chromium.org91141372014-01-09 23:27:20 +00002122 if options.email is not None:
2123 upload_args.extend(['--email', options.email])
2124
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002125 if cl.GetIssue():
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00002126 if options.title:
2127 upload_args.extend(['--title', options.title])
rogerta@chromium.orgafadfca2013-05-29 14:15:53 +00002128 if options.message:
2129 upload_args.extend(['--message', options.message])
maruel@chromium.org52424302012-08-29 15:14:30 +00002130 upload_args.extend(['--issue', str(cl.GetIssue())])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002131 print ("This branch is associated with issue %s. "
2132 "Adding patch to that issue." % cl.GetIssue())
2133 else:
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00002134 if options.title:
2135 upload_args.extend(['--title', options.title])
rogerta@chromium.org43e34f02013-03-25 14:52:48 +00002136 message = options.title or options.message or CreateDescriptionFromLog(args)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002137 change_desc = ChangeDescription(message)
piman@chromium.org336f9122014-09-04 02:16:55 +00002138 if options.reviewers or options.tbr_owners:
2139 change_desc.update_reviewers(options.reviewers,
2140 options.tbr_owners,
2141 change)
maruel@chromium.org71e12a92012-02-14 02:34:15 +00002142 if not options.force:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002143 change_desc.prompt()
dpranke@chromium.org970c5222011-03-12 00:32:24 +00002144
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002145 if not change_desc.description:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002146 print "Description is empty; aborting."
2147 return 1
dpranke@chromium.org970c5222011-03-12 00:32:24 +00002148
maruel@chromium.org71e12a92012-02-14 02:34:15 +00002149 upload_args.extend(['--message', change_desc.description])
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002150 if change_desc.get_reviewers():
2151 upload_args.append('--reviewers=' + ','.join(change_desc.get_reviewers()))
maruel@chromium.orga3353652011-11-30 14:26:57 +00002152 if options.send_mail:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002153 if not change_desc.get_reviewers():
maruel@chromium.orga3353652011-11-30 14:26:57 +00002154 DieWithError("Must specify reviewers to send email.")
2155 upload_args.append('--send_mail')
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00002156
2157 # We check this before applying rietveld.private assuming that in
2158 # rietveld.cc only addresses which we can send private CLs to are listed
2159 # if rietveld.private is set, and so we should ignore rietveld.cc only when
2160 # --private is specified explicitly on the command line.
2161 if options.private:
2162 logging.warn('rietveld.cc is ignored since private flag is specified. '
2163 'You need to review and add them manually if necessary.')
2164 cc = cl.GetCCListWithoutDefault()
2165 else:
2166 cc = cl.GetCCList()
2167 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
maruel@chromium.orgb2a7c332011-02-25 20:30:37 +00002168 if cc:
2169 upload_args.extend(['--cc', cc])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002170
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00002171 if options.private or settings.GetDefaultPrivateFlag() == "True":
2172 upload_args.append('--private')
2173
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00002174 upload_args.extend(['--git_similarity', str(options.similarity)])
iannucci@chromium.org79540052012-10-19 23:15:26 +00002175 if not options.find_copies:
2176 upload_args.extend(['--git_no_find_copies'])
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00002177
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002178 # Include the upstream repo's URL in the change -- this is useful for
2179 # projects that have their source spread across multiple repos.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00002180 remote_url = cl.GetGitBaseUrlFromConfig()
2181 if not remote_url:
2182 if settings.GetIsGitSvn():
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00002183 remote_url = cl.GetGitSvnRemoteUrl()
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00002184 else:
jam@chromium.org80c51ae2014-10-17 18:43:02 +00002185 if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
2186 remote_url = (cl.GetRemoteUrl() + '@'
2187 + cl.GetUpstreamBranch().split('/')[-1])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002188 if remote_url:
2189 upload_args.extend(['--base_url', remote_url])
rmistry@google.comd1e37582014-12-10 20:58:24 +00002190 remote, remote_branch = cl.GetRemoteBranch()
wittman@chromium.org455dc922015-01-26 20:15:50 +00002191 target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
2192 settings.GetPendingRefPrefix())
2193 if target_ref:
2194 upload_args.extend(['--target_ref', target_ref])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002195
rmistry@google.comd91b7e32015-06-23 11:24:07 +00002196 # Look for dependent patchsets. See crbug.com/480453 for more details.
2197 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
2198 upstream_branch = ShortBranchName(upstream_branch)
2199 if remote is '.':
2200 # A local branch is being tracked.
2201 local_branch = ShortBranchName(upstream_branch)
rmistry@google.com78948ed2015-07-08 23:09:57 +00002202 if settings.GetIsSkipDependencyUpload(local_branch):
rmistry@google.comd91b7e32015-06-23 11:24:07 +00002203 print
rmistry@google.com78948ed2015-07-08 23:09:57 +00002204 print ('Skipping dependency patchset upload because git config '
2205 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
rmistry@google.comd91b7e32015-06-23 11:24:07 +00002206 print
rmistry@google.com78948ed2015-07-08 23:09:57 +00002207 else:
2208 auth_config = auth.extract_auth_config_from_options(options)
2209 branch_cl = Changelist(branchref=local_branch, auth_config=auth_config)
2210 branch_cl_issue_url = branch_cl.GetIssueURL()
2211 branch_cl_issue = branch_cl.GetIssue()
2212 branch_cl_patchset = branch_cl.GetPatchset()
2213 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2214 upload_args.extend(
2215 ['--depends_on_patchset', '%s:%s' % (
2216 branch_cl_issue, branch_cl_patchset)])
2217 print
2218 print ('The current branch (%s) is tracking a local branch (%s) with '
2219 'an associated CL.') % (cl.GetBranch(), local_branch)
2220 print 'Adding %s/#ps%s as a dependency patchset.' % (
2221 branch_cl_issue_url, branch_cl_patchset)
2222 print
rmistry@google.comd91b7e32015-06-23 11:24:07 +00002223
sheyang@chromium.org152cf832014-06-11 21:37:49 +00002224 project = settings.GetProject()
2225 if project:
2226 upload_args.extend(['--project', project])
2227
rmistry@google.comef966222015-04-07 11:15:01 +00002228 if options.cq_dry_run:
2229 upload_args.extend(['--cq_dry_run'])
2230
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002231 try:
ilevy@chromium.org82880192012-11-26 15:41:57 +00002232 upload_args = ['upload'] + upload_args + args
2233 logging.info('upload.RealMain(%s)', upload_args)
2234 issue, patchset = upload.RealMain(upload_args)
maruel@chromium.org911fce12013-07-29 23:01:13 +00002235 issue = int(issue)
2236 patchset = int(patchset)
maruel@chromium.org9ce0dff2011-04-04 17:56:50 +00002237 except KeyboardInterrupt:
2238 sys.exit(1)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002239 except:
2240 # If we got an exception after the user typed a description for their
2241 # change, back up the description before re-raising.
2242 if change_desc:
2243 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
2244 print '\nGot exception while uploading -- saving description to %s\n' \
2245 % backup_path
2246 backup_file = open(backup_path, 'w')
dpranke@chromium.org970c5222011-03-12 00:32:24 +00002247 backup_file.write(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002248 backup_file.close()
2249 raise
2250
2251 if not cl.GetIssue():
2252 cl.SetIssue(issue)
2253 cl.SetPatchset(patchset)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002254
2255 if options.use_commit_queue:
2256 cl.SetFlag('commit', '1')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002257 return 0
2258
2259
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00002260def cleanup_list(l):
2261 """Fixes a list so that comma separated items are put as individual items.
2262
2263 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
2264 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
2265 """
2266 items = sum((i.split(',') for i in l), [])
2267 stripped_items = (i.strip() for i in items)
2268 return sorted(filter(None, stripped_items))
2269
2270
maruel@chromium.org0633fb42013-08-16 20:06:14 +00002271@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00002272def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00002273 """Uploads the current changelist to codereview.
2274
2275 Can skip dependency patchset uploads for a branch by running:
2276 git config branch.branch_name.skip-deps-uploads True
2277 To unset run:
2278 git config --unset branch.branch_name.skip-deps-uploads
2279 Can also set the above globally by using the --global flag.
2280 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00002281 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
2282 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00002283 parser.add_option('--bypass-watchlists', action='store_true',
2284 dest='bypass_watchlists',
2285 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00002286 parser.add_option('-f', action='store_true', dest='force',
2287 help="force yes to questions (don't prompt)")
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00002288 parser.add_option('-m', dest='message', help='message for patchset')
2289 parser.add_option('-t', dest='title', help='title for patchset')
ukai@chromium.orge8077812012-02-03 03:41:46 +00002290 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00002291 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00002292 help='reviewer email addresses')
2293 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00002294 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00002295 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00002296 parser.add_option('-s', '--send-mail', action='store_true',
ukai@chromium.orge8077812012-02-03 03:41:46 +00002297 help='send email to reviewer immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00002298 parser.add_option('--emulate_svn_auto_props',
2299 '--emulate-svn-auto-props',
2300 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00002301 dest="emulate_svn_auto_props",
2302 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00002303 parser.add_option('-c', '--use-commit-queue', action='store_true',
2304 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00002305 parser.add_option('--private', action='store_true',
2306 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00002307 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00002308 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00002309 metavar='TARGET',
2310 help='Apply CL to remote ref TARGET. ' +
2311 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002312 parser.add_option('--squash', action='store_true',
2313 help='Squash multiple commits into one (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00002314 parser.add_option('--email', default=None,
2315 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00002316 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
2317 help='add a set of OWNERS to TBR')
rmistry@google.comef966222015-04-07 11:15:01 +00002318 parser.add_option('--cq-dry-run', dest='cq_dry_run', action='store_true',
2319 help='Send the patchset to do a CQ dry run right after '
2320 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00002321 parser.add_option('--dependencies', action='store_true',
2322 help='Uploads CLs of all the local branches that depend on '
2323 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00002324
rmistry@google.com2dd99862015-06-22 12:22:18 +00002325 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00002326 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002327 auth.add_auth_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00002328 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002329 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00002330
sbc@chromium.org71437c02015-04-09 19:29:40 +00002331 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00002332 return 1
2333
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00002334 options.reviewers = cleanup_list(options.reviewers)
2335 options.cc = cleanup_list(options.cc)
2336
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002337 cl = Changelist(auth_config=auth_config)
ukai@chromium.orge8077812012-02-03 03:41:46 +00002338 if args:
2339 # TODO(ukai): is it ok for gerrit case?
2340 base_branch = args[0]
2341 else:
luqui@chromium.org64e14362015-01-07 00:29:29 +00002342 if cl.GetBranch() is None:
2343 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
2344
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00002345 # Default to diffing against common ancestor of upstream branch
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002346 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org5e07e062013-02-28 23:55:44 +00002347 args = [base_branch, 'HEAD']
ukai@chromium.orge8077812012-02-03 03:41:46 +00002348
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00002349 # Make sure authenticated to Rietveld before running expensive hooks. It is
2350 # a fast, best efforts check. Rietveld still can reject the authentication
2351 # during the actual upload.
2352 if not settings.GetIsGerrit() and auth_config.use_oauth2:
2353 authenticator = auth.get_authenticator_for_host(
2354 cl.GetRietveldServer(), auth_config)
2355 if not authenticator.has_cached_credentials():
2356 raise auth.LoginRequiredError(cl.GetRietveldServer())
2357
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00002358 # Apply watchlists on upload.
2359 change = cl.GetChange(base_branch, None)
2360 watchlist = watchlists.Watchlists(change.RepositoryRoot())
2361 files = [f.LocalPath() for f in change.AffectedFiles()]
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00002362 if not options.bypass_watchlists:
2363 cl.SetWatchers(watchlist.GetWatchersForPaths(files))
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00002364
ukai@chromium.orge8077812012-02-03 03:41:46 +00002365 if not options.bypass_hooks:
piman@chromium.org336f9122014-09-04 02:16:55 +00002366 if options.reviewers or options.tbr_owners:
isherman@chromium.orgb5cded62014-03-25 17:47:57 +00002367 # Set the reviewer list now so that presubmit checks can access it.
2368 change_description = ChangeDescription(change.FullDescriptionText())
piman@chromium.org336f9122014-09-04 02:16:55 +00002369 change_description.update_reviewers(options.reviewers,
2370 options.tbr_owners,
2371 change)
isherman@chromium.orgb5cded62014-03-25 17:47:57 +00002372 change.SetDescriptionText(change_description.description)
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00002373 hook_results = cl.RunHook(committing=False,
ukai@chromium.orge8077812012-02-03 03:41:46 +00002374 may_prompt=not options.force,
2375 verbose=options.verbose,
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00002376 change=change)
ukai@chromium.orge8077812012-02-03 03:41:46 +00002377 if not hook_results.should_continue():
2378 return 1
2379 if not options.reviewers and hook_results.reviewers:
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00002380 options.reviewers = hook_results.reviewers.split(',')
ukai@chromium.orge8077812012-02-03 03:41:46 +00002381
koz@chromium.org5974d7a2013-04-02 20:50:37 +00002382 if cl.GetIssue():
maruel@chromium.org1033efd2013-07-23 23:25:09 +00002383 latest_patchset = cl.GetMostRecentPatchset()
koz@chromium.org5974d7a2013-04-02 20:50:37 +00002384 local_patchset = cl.GetPatchset()
dmikurube@chromium.org07d149f2013-04-03 11:40:23 +00002385 if latest_patchset and local_patchset and local_patchset != latest_patchset:
koz@chromium.org5974d7a2013-04-02 20:50:37 +00002386 print ('The last upload made from this repository was patchset #%d but '
2387 'the most recent patchset on the server is #%d.'
2388 % (local_patchset, latest_patchset))
koz@chromium.orgc7192782013-04-09 23:28:46 +00002389 print ('Uploading will still work, but if you\'ve uploaded to this issue '
2390 'from another machine or branch the patch you\'re uploading now '
2391 'might not include those changes.')
koz@chromium.org5974d7a2013-04-02 20:50:37 +00002392 ask_for_data('About to upload; enter to confirm.')
2393
iannucci@chromium.org79540052012-10-19 23:15:26 +00002394 print_stats(options.similarity, options.find_copies, args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00002395 if settings.GetIsGerrit():
piman@chromium.org336f9122014-09-04 02:16:55 +00002396 return GerritUpload(options, args, cl, change)
2397 ret = RietveldUpload(options, args, cl, change)
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +00002398 if not ret:
rogerta@chromium.org4a6cd042013-04-12 15:40:42 +00002399 git_set_branch_value('last-upload-hash',
2400 RunGit(['rev-parse', 'HEAD']).strip())
rmistry@google.com5626a922015-02-26 14:03:30 +00002401 # Run post upload hooks, if specified.
2402 if settings.GetRunPostUploadHook():
2403 presubmit_support.DoPostUploadExecuter(
2404 change,
2405 cl,
2406 settings.GetRoot(),
2407 options.verbose,
2408 sys.stdout)
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +00002409
rmistry@google.com2dd99862015-06-22 12:22:18 +00002410 # Upload all dependencies if specified.
2411 if options.dependencies:
2412 print
2413 print '--dependencies has been specified.'
2414 print 'All dependent local branches will be re-uploaded.'
2415 print
2416 # Remove the dependencies flag from args so that we do not end up in a
2417 # loop.
2418 orig_args.remove('--dependencies')
2419 upload_branch_deps(cl, orig_args)
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +00002420 return ret
ukai@chromium.orge8077812012-02-03 03:41:46 +00002421
2422
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002423def IsSubmoduleMergeCommit(ref):
2424 # When submodules are added to the repo, we expect there to be a single
2425 # non-git-svn merge commit at remote HEAD with a signature comment.
2426 pattern = '^SVN changes up to revision [0-9]*$'
szager@chromium.orge84b7542012-06-15 21:26:58 +00002427 cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002428 return RunGit(cmd) != ''
2429
2430
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002431def SendUpstream(parser, args, cmd):
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00002432 """Common code for CMDland and CmdDCommit
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002433
iannucci@chromium.org5724c962014-04-11 09:32:56 +00002434 Squashes branch into a single commit.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002435 Updates changelog with metadata (e.g. pointer to review).
2436 Pushes/dcommits the code upstream.
2437 Updates review and closes.
2438 """
2439 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
2440 help='bypass upload presubmit hook')
2441 parser.add_option('-m', dest='message',
2442 help="override review description")
2443 parser.add_option('-f', action='store_true', dest='force',
2444 help="force yes to questions (don't prompt)")
2445 parser.add_option('-c', dest='contributor',
2446 help="external contributor for patch (appended to " +
2447 "description and used as author for git). Should be " +
2448 "formatted as 'First Last <email@example.com>'")
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00002449 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002450 auth.add_auth_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002451 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002452 auth_config = auth.extract_auth_config_from_options(options)
2453
2454 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002455
iannucci@chromium.org5724c962014-04-11 09:32:56 +00002456 current = cl.GetBranch()
2457 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
2458 if not settings.GetIsGitSvn() and remote == '.':
2459 print
2460 print 'Attempting to push branch %r into another local branch!' % current
2461 print
2462 print 'Either reparent this branch on top of origin/master:'
2463 print ' git reparent-branch --root'
2464 print
2465 print 'OR run `git rebase-update` if you think the parent branch is already'
2466 print 'committed.'
2467 print
2468 print ' Current parent: %r' % upstream_branch
2469 return 1
2470
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002471 if not args or cmd == 'land':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002472 # Default to merging against our best guess of the upstream branch.
2473 args = [cl.GetUpstreamBranch()]
2474
maruel@chromium.org13f623c2011-07-22 16:02:23 +00002475 if options.contributor:
2476 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
2477 print "Please provide contibutor as 'First Last <email@example.com>'"
2478 return 1
2479
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002480 base_branch = args[0]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002481 base_has_submodules = IsSubmoduleMergeCommit(base_branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002482
sbc@chromium.org71437c02015-04-09 19:29:40 +00002483 if git_common.is_dirty_git_tree(cmd):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002484 return 1
2485
2486 # This rev-list syntax means "show all commits not in my branch that
2487 # are in base_branch".
2488 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
2489 base_branch]).splitlines()
2490 if upstream_commits:
2491 print ('Base branch "%s" has %d commits '
2492 'not in this branch.' % (base_branch, len(upstream_commits)))
2493 print 'Run "git merge %s" before attempting to %s.' % (base_branch, cmd)
2494 return 1
2495
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002496 # This is the revision `svn dcommit` will commit on top of.
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002497 svn_head = None
2498 if cmd == 'dcommit' or base_has_submodules:
2499 svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
2500 '--pretty=format:%H'])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002501
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002502 if cmd == 'dcommit':
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002503 # If the base_head is a submodule merge commit, the first parent of the
2504 # base_head should be a git-svn commit, which is what we're interested in.
2505 base_svn_head = base_branch
2506 if base_has_submodules:
2507 base_svn_head += '^1'
2508
2509 extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002510 if extra_commits:
2511 print ('This branch has %d additional commits not upstreamed yet.'
2512 % len(extra_commits.splitlines()))
2513 print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
2514 'before attempting to %s.' % (base_branch, cmd))
2515 return 1
2516
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002517 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00002518 if not options.bypass_hooks:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00002519 author = None
2520 if options.contributor:
2521 author = re.search(r'\<(.*)\>', options.contributor).group(1)
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00002522 hook_results = cl.RunHook(
2523 committing=True,
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00002524 may_prompt=not options.force,
2525 verbose=options.verbose,
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002526 change=cl.GetChange(merge_base, author))
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00002527 if not hook_results.should_continue():
2528 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002529
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002530 # Check the tree status if the tree status URL is set.
2531 status = GetTreeStatus()
2532 if 'closed' == status:
2533 print('The tree is closed. Please wait for it to reopen. Use '
2534 '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
2535 return 1
2536 elif 'unknown' == status:
2537 print('Unable to determine tree status. Please verify manually and '
2538 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
2539 return 1
maruel@chromium.orgac637152012-01-16 14:19:54 +00002540 else:
2541 breakpad.SendStack(
2542 'GitClHooksBypassedCommit',
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00002543 'Issue %s/%s bypassed hook when committing (tree status was "%s")' %
2544 (cl.GetRietveldServer(), cl.GetIssue(), GetTreeStatus()),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +00002545 verbose=False)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002546
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002547 change_desc = ChangeDescription(options.message)
2548 if not change_desc.description and cl.GetIssue():
2549 change_desc = ChangeDescription(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002550
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002551 if not change_desc.description:
erg@chromium.org1a173982012-08-29 20:43:05 +00002552 if not cl.GetIssue() and options.bypass_hooks:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002553 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
erg@chromium.org1a173982012-08-29 20:43:05 +00002554 else:
2555 print 'No description set.'
2556 print 'Visit %s/edit to set it.' % (cl.GetIssueURL())
2557 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002558
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002559 # Keep a separate copy for the commit message, because the commit message
2560 # contains the link to the Rietveld issue, while the Rietveld message contains
2561 # the commit viewvc url.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002562 # Keep a separate copy for the commit message.
2563 if cl.GetIssue():
maruel@chromium.orgcf087782013-07-23 13:08:48 +00002564 change_desc.update_reviewers(cl.GetApprovingReviewers())
maruel@chromium.orge52678e2013-04-26 18:34:44 +00002565
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002566 commit_desc = ChangeDescription(change_desc.description)
maruel@chromium.orgcc73ad62011-07-06 17:39:26 +00002567 if cl.GetIssue():
smut@google.com4c61dcc2015-06-08 22:31:29 +00002568 # Xcode won't linkify this URL unless there is a non-whitespace character
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +00002569 # after it. Add a period on a new line to circumvent this. Also add a space
2570 # before the period to make sure that Gitiles continues to correctly resolve
2571 # the URL.
2572 commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002573 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002574 commit_desc.append_footer('Patch from %s.' % options.contributor)
2575
agable@chromium.orgeec3ea32013-08-15 20:31:39 +00002576 print('Description:')
2577 print(commit_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002578
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002579 branches = [merge_base, cl.GetBranchRef()]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002580 if not options.force:
iannucci@chromium.org79540052012-10-19 23:15:26 +00002581 print_stats(options.similarity, options.find_copies, branches)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002582
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002583 # We want to squash all this branch's commits into one commit with the proper
2584 # description. We do this by doing a "reset --soft" to the base branch (which
2585 # keeps the working copy the same), then dcommitting that. If origin/master
2586 # has a submodule merge commit, we'll also need to cherry-pick the squashed
2587 # commit onto a branch based on the git-svn head.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002588 MERGE_BRANCH = 'git-cl-commit'
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002589 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
2590 # Delete the branches if they exist.
2591 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
2592 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
2593 result = RunGitWithCode(showref_cmd)
2594 if result[0] == 0:
2595 RunGit(['branch', '-D', branch])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002596
2597 # We might be in a directory that's present in this branch but not in the
2598 # trunk. Move up to the top of the tree so that git commands that expect a
2599 # valid CWD won't fail after we check out the merge branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002600 rel_base_path = settings.GetRelativeRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002601 if rel_base_path:
2602 os.chdir(rel_base_path)
2603
2604 # Stuff our change into the merge branch.
2605 # We wrap in a try...finally block so if anything goes wrong,
2606 # we clean up the branches.
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00002607 retcode = -1
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002608 pushed_to_pending = False
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002609 pending_ref = None
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002610 revision = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002611 try:
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00002612 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002613 RunGit(['reset', '--soft', merge_base])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002614 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002615 RunGit(
2616 [
2617 'commit', '--author', options.contributor,
2618 '-m', commit_desc.description,
2619 ])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002620 else:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002621 RunGit(['commit', '-m', commit_desc.description])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002622 if base_has_submodules:
2623 cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip()
2624 RunGit(['branch', CHERRY_PICK_BRANCH, svn_head])
2625 RunGit(['checkout', CHERRY_PICK_BRANCH])
2626 RunGit(['cherry-pick', cherry_pick_commit])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002627 if cmd == 'land':
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00002628 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002629 pending_prefix = settings.GetPendingRefPrefix()
2630 if not pending_prefix or branch.startswith(pending_prefix):
2631 # If not using refs/pending/heads/* at all, or target ref is already set
2632 # to pending, then push to the target ref directly.
2633 retcode, output = RunGitWithCode(
2634 ['push', '--porcelain', remote, 'HEAD:%s' % branch])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002635 pushed_to_pending = pending_prefix and branch.startswith(pending_prefix)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002636 else:
2637 # Cherry-pick the change on top of pending ref and then push it.
2638 assert branch.startswith('refs/'), branch
2639 assert pending_prefix[-1] == '/', pending_prefix
2640 pending_ref = pending_prefix + branch[len('refs/'):]
2641 retcode, output = PushToGitPending(remote, pending_ref, branch)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002642 pushed_to_pending = (retcode == 0)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00002643 if retcode == 0:
2644 revision = RunGit(['rev-parse', 'HEAD']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002645 else:
2646 # dcommit the merge branch.
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00002647 cmd_args = [
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00002648 'svn', 'dcommit',
2649 '-C%s' % options.similarity,
2650 '--no-rebase', '--rmdir',
2651 ]
2652 if settings.GetForceHttpsCommitUrl():
2653 # Allow forcing https commit URLs for some projects that don't allow
2654 # committing to http URLs (like Google Code).
2655 remote_url = cl.GetGitSvnRemoteUrl()
2656 if urlparse.urlparse(remote_url).scheme == 'http':
2657 remote_url = remote_url.replace('http://', 'https://')
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00002658 cmd_args.append('--commit-url=%s' % remote_url)
2659 _, output = RunGitWithCode(cmd_args)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00002660 if 'Committed r' in output:
2661 revision = re.match(
2662 '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
2663 logging.debug(output)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002664 finally:
2665 # And then swap back to the original branch and clean up.
2666 RunGit(['checkout', '-q', cl.GetBranch()])
2667 RunGit(['branch', '-D', MERGE_BRANCH])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00002668 if base_has_submodules:
2669 RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002670
iannucci@chromium.org34504a12014-08-29 23:51:37 +00002671 if not revision:
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00002672 print 'Failed to push. If this persists, please file a bug.'
iannucci@chromium.org34504a12014-08-29 23:51:37 +00002673 return 1
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00002674
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00002675 killed = False
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00002676 if pushed_to_pending:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002677 try:
2678 revision = WaitForRealCommit(remote, revision, base_branch, branch)
2679 # We set pushed_to_pending to False, since it made it all the way to the
2680 # real ref.
2681 pushed_to_pending = False
2682 except KeyboardInterrupt:
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00002683 killed = True
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002684
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002685 if cl.GetIssue():
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002686 to_pending = ' to pending queue' if pushed_to_pending else ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002687 viewvc_url = settings.GetViewVCUrl()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002688 if not to_pending:
2689 if viewvc_url and revision:
2690 change_desc.append_footer(
2691 'Committed: %s%s' % (viewvc_url, revision))
2692 elif revision:
2693 change_desc.append_footer('Committed: %s' % (revision,))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002694 print ('Closing issue '
2695 '(you may be prompted for your codereview password)...')
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002696 cl.UpdateDescription(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002697 cl.CloseIssue()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00002698 props = cl.GetIssueProperties()
sadrul@chromium.org34b5d822013-02-18 01:39:24 +00002699 patch_num = len(props['patchsets'])
rmistry@google.com52d224a2014-08-27 14:44:41 +00002700 comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
mark@chromium.org782570c2014-09-26 21:48:02 +00002701 patch_num, props['patchsets'][-1], to_pending, revision)
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00002702 if options.bypass_hooks:
2703 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
2704 else:
2705 comment += ' (presubmit successful).'
iannucci@chromium.orgb85a3162013-01-26 01:11:13 +00002706 cl.RpcServer().add_comment(cl.GetIssue(), comment)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00002707 cl.SetIssue(None)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00002708
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00002709 if pushed_to_pending:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002710 _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
2711 print 'The commit is in the pending queue (%s).' % pending_ref
2712 print (
thakis@chromium.org5f32a962014-09-05 21:33:23 +00002713 'It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002714 'footer.' % branch)
2715
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00002716 hook = POSTUPSTREAM_HOOK_PATTERN % cmd
2717 if os.path.isfile(hook):
2718 RunCommand([hook, merge_base], error_ok=True)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00002719
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00002720 return 1 if killed else 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002721
2722
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002723def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
2724 print
2725 print 'Waiting for commit to be landed on %s...' % real_ref
2726 print '(If you are impatient, you may Ctrl-C once without harm)'
2727 target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
2728 current_rev = RunGit(['rev-parse', local_base_ref]).strip()
2729
2730 loop = 0
2731 while True:
2732 sys.stdout.write('fetching (%d)... \r' % loop)
2733 sys.stdout.flush()
2734 loop += 1
2735
2736 RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID)
2737 to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
2738 commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)])
2739 for commit in commits.splitlines():
2740 if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree:
2741 print 'Found commit on %s' % real_ref
2742 return commit
2743
2744 current_rev = to_rev
2745
2746
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002747def PushToGitPending(remote, pending_ref, upstream_ref):
2748 """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
2749
2750 Returns:
2751 (retcode of last operation, output log of last operation).
2752 """
2753 assert pending_ref.startswith('refs/'), pending_ref
2754 local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):]
2755 cherry = RunGit(['rev-parse', 'HEAD']).strip()
2756 code = 0
2757 out = ''
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002758 max_attempts = 3
2759 attempts_left = max_attempts
2760 while attempts_left:
2761 if attempts_left != max_attempts:
2762 print 'Retrying, %d attempts left...' % (attempts_left - 1,)
2763 attempts_left -= 1
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002764
2765 # Fetch. Retry fetch errors.
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002766 print 'Fetching pending ref %s...' % pending_ref
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002767 code, out = RunGitWithCode(
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002768 ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002769 if code:
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002770 print 'Fetch failed with exit code %d.' % code
2771 if out.strip():
2772 print out.strip()
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002773 continue
2774
2775 # Try to cherry pick. Abort on merge conflicts.
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002776 print 'Cherry-picking commit on top of pending ref...'
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002777 RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002778 code, out = RunGitWithCode(['cherry-pick', cherry])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002779 if code:
2780 print (
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002781 'Your patch doesn\'t apply cleanly to ref \'%s\', '
2782 'the following files have merge conflicts:' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002783 print RunGit(['diff', '--name-status', '--diff-filter=U']).strip()
2784 print 'Please rebase your patch and try again.'
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002785 RunGitWithCode(['cherry-pick', '--abort'])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002786 return code, out
2787
2788 # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002789 print 'Pushing commit to %s... It can take a while.' % pending_ref
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002790 code, out = RunGitWithCode(
2791 ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
2792 if code == 0:
2793 # Success.
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00002794 print 'Commit pushed to pending ref successfully!'
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002795 return code, out
2796
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002797 print 'Push failed with exit code %d.' % code
2798 if out.strip():
2799 print out.strip()
2800 if IsFatalPushFailure(out):
2801 print (
2802 'Fatal push error. Make sure your .netrc credentials and git '
2803 'user.email are correct and you have push access to the repo.')
2804 return code, out
2805
2806 print 'All attempts to push to pending ref failed.'
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002807 return code, out
2808
2809
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00002810def IsFatalPushFailure(push_stdout):
2811 """True if retrying push won't help."""
2812 return '(prohibited by Gerrit)' in push_stdout
2813
2814
maruel@chromium.org0633fb42013-08-16 20:06:14 +00002815@subcommand.usage('[upstream branch to apply against]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002816def CMDdcommit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00002817 """Commits the current changelist via git-svn."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002818 if not settings.GetIsGitSvn():
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00002819 if get_footer_svn_id():
2820 # If it looks like previous commits were mirrored with git-svn.
2821 message = """This repository appears to be a git-svn mirror, but no
2822upstream SVN master is set. You probably need to run 'git auto-svn' once."""
2823 else:
2824 message = """This doesn't appear to be an SVN repository.
2825If your project has a true, writeable git repository, you probably want to run
2826'git cl land' instead.
2827If your project has a git mirror of an upstream SVN master, you probably need
2828to run 'git svn init'.
2829
2830Using the wrong command might cause your commit to appear to succeed, and the
2831review to be closed, without actually landing upstream. If you choose to
2832proceed, please verify that the commit lands upstream as expected."""
thakis@chromium.orgcde3bb62011-01-20 01:16:14 +00002833 print(message)
maruel@chromium.org90541732011-04-01 17:54:18 +00002834 ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002835 return SendUpstream(parser, args, 'dcommit')
2836
2837
maruel@chromium.org0633fb42013-08-16 20:06:14 +00002838@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00002839def CMDland(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00002840 """Commits the current changelist via git."""
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00002841 if settings.GetIsGitSvn() or get_footer_svn_id():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002842 print('This appears to be an SVN repository.')
2843 print('Are you sure you didn\'t mean \'git cl dcommit\'?')
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00002844 print('(Ignore if this is the first commit after migrating from svn->git)')
maruel@chromium.org90541732011-04-01 17:54:18 +00002845 ask_for_data('[Press enter to push or ctrl-C to quit]')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00002846 return SendUpstream(parser, args, 'land')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002847
2848
maruel@chromium.org0633fb42013-08-16 20:06:14 +00002849@subcommand.usage('<patch url or issue id>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002850def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00002851 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002852 parser.add_option('-b', dest='newbranch',
2853 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00002854 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002855 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00002856 parser.add_option('-d', '--directory', action='store', metavar='DIR',
2857 help='Change to the directory DIR immediately, '
2858 'before doing anything else.')
2859 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00002860 help='failed patches spew .rej files rather than '
2861 'attempting a 3-way merge')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002862 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
2863 help="don't commit after patch applies")
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002864 auth.add_auth_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002865 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002866 auth_config = auth.extract_auth_config_from_options(options)
2867
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002868 if len(args) != 1:
2869 parser.print_help()
2870 return 1
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00002871 issue_arg = args[0]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002872
wychen@chromium.org46309bf2015-04-03 21:04:49 +00002873 # We don't want uncommitted changes mixed up with the patch.
sbc@chromium.org71437c02015-04-09 19:29:40 +00002874 if git_common.is_dirty_git_tree('patch'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00002875 return 1
2876
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002877 # TODO(maruel): Use apply_issue.py
ukai@chromium.orge8077812012-02-03 03:41:46 +00002878 # TODO(ukai): use gerrit-cherry-pick for gerrit repository?
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002879
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00002880 if options.newbranch:
2881 if options.force:
2882 RunGit(['branch', '-D', options.newbranch],
2883 stderr=subprocess2.PIPE, error_ok=True)
2884 RunGit(['checkout', '-b', options.newbranch,
2885 Changelist().GetUpstreamBranch()])
2886
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00002887 return PatchIssue(issue_arg, options.reject, options.nocommit,
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002888 options.directory, auth_config)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00002889
2890
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002891def PatchIssue(issue_arg, reject, nocommit, directory, auth_config):
wychen@chromium.orga872e752015-04-28 23:42:18 +00002892 # PatchIssue should never be called with a dirty tree. It is up to the
2893 # caller to check this, but just in case we assert here since the
2894 # consequences of the caller not checking this could be dire.
sbc@chromium.org71437c02015-04-09 19:29:40 +00002895 assert(not git_common.is_dirty_git_tree('apply'))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00002896
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00002897 if type(issue_arg) is int or issue_arg.isdigit():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002898 # Input is an issue id. Figure out the URL.
maruel@chromium.org52424302012-08-29 15:14:30 +00002899 issue = int(issue_arg)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002900 cl = Changelist(issue=issue, auth_config=auth_config)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00002901 patchset = cl.GetMostRecentPatchset()
binji@chromium.org0281f522012-09-14 13:37:59 +00002902 patch_data = cl.GetPatchSetDiff(issue, patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002903 else:
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002904 # Assume it's a URL to the patch. Default to https.
2905 issue_url = gclient_utils.UpgradeToHttps(issue_arg)
kjellander@chromium.org44424542015-06-02 18:35:29 +00002906 match = re.match(r'(.*?)/download/issue(\d+)_(\d+).diff', issue_url)
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002907 if not match:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002908 DieWithError('Must pass an issue ID or full URL for '
2909 '\'Download raw patch set\'')
kjellander@chromium.org44424542015-06-02 18:35:29 +00002910 issue = int(match.group(2))
2911 cl = Changelist(issue=issue, auth_config=auth_config)
2912 cl.rietveld_server = match.group(1)
2913 patchset = int(match.group(3))
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002914 patch_data = urllib2.urlopen(issue_arg).read()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002915
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002916 # Switch up to the top-level directory, if necessary, in preparation for
2917 # applying the patch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002918 top = settings.GetRelativeRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002919 if top:
2920 os.chdir(top)
2921
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002922 # Git patches have a/ at the beginning of source paths. We strip that out
2923 # with a sed script rather than the -p flag to patch so we can feed either
2924 # Git or svn-style patches into the same apply command.
2925 # re.sub() should be used but flags=re.MULTILINE is only in python 2.7.
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +00002926 try:
2927 patch_data = subprocess2.check_output(
2928 ['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'], stdin=patch_data)
2929 except subprocess2.CalledProcessError:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002930 DieWithError('Git patch mungling failed.')
2931 logging.info(patch_data)
bratell@opera.com82b91cd2013-07-09 06:33:41 +00002932
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002933 # We use "git apply" to apply the patch instead of "patch" so that we can
2934 # pick up file adds.
2935 # The --index flag means: also insert into the index (so we catch adds).
bratell@opera.com82b91cd2013-07-09 06:33:41 +00002936 cmd = ['git', 'apply', '--index', '-p0']
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00002937 if directory:
2938 cmd.extend(('--directory', directory))
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00002939 if reject:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002940 cmd.append('--reject')
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00002941 elif IsGitVersionAtLeast('1.7.12'):
2942 cmd.append('--3way')
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +00002943 try:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002944 subprocess2.check_call(cmd, env=GetNoGitPagerEnv(),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00002945 stdin=patch_data, stdout=subprocess2.VOID)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +00002946 except subprocess2.CalledProcessError:
wychen@chromium.orga872e752015-04-28 23:42:18 +00002947 print 'Failed to apply the patch'
2948 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002949
2950 # If we had an issue, commit the current state and register the issue.
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00002951 if not nocommit:
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00002952 RunGit(['commit', '-m', (cl.GetDescription() + '\n\n' +
2953 'patch from issue %(i)s at patchset '
carlosk@chromium.org71284d92014-11-14 18:12:50 +00002954 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2955 % {'i': issue, 'p': patchset})])
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002956 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002957 cl.SetIssue(issue)
binji@chromium.org0281f522012-09-14 13:37:59 +00002958 cl.SetPatchset(patchset)
pdr@chromium.org98ca6622013-04-09 20:58:40 +00002959 print "Committed patch locally."
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002960 else:
2961 print "Patch applied to index."
2962 return 0
2963
2964
2965def CMDrebase(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00002966 """Rebases current branch on top of svn repo."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002967 # Provide a wrapper for git svn rebase to help avoid accidental
2968 # git svn dcommit.
2969 # It's the only command that doesn't use parser at all since we just defer
2970 # execution to git-svn.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00002971
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00002972 return RunGitWithCode(['svn', 'rebase'] + args)[1]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002973
2974
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00002975def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002976 """Fetches the tree status and returns either 'open', 'closed',
2977 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00002978 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002979 if url:
2980 status = urllib2.urlopen(url).read().lower()
2981 if status.find('closed') != -1 or status == '0':
2982 return 'closed'
2983 elif status.find('open') != -1 or status == '1':
2984 return 'open'
2985 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002986 return 'unset'
2987
dpranke@chromium.org970c5222011-03-12 00:32:24 +00002988
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002989def GetTreeStatusReason():
2990 """Fetches the tree status from a json url and returns the message
2991 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00002992 url = settings.GetTreeStatusUrl()
2993 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002994 connection = urllib2.urlopen(json_url)
2995 status = json.loads(connection.read())
2996 connection.close()
2997 return status['message']
2998
dpranke@chromium.org970c5222011-03-12 00:32:24 +00002999
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00003000def GetBuilderMaster(bot_list):
3001 """For a given builder, fetch the master from AE if available."""
3002 map_url = 'https://builders-map.appspot.com/'
3003 try:
3004 master_map = json.load(urllib2.urlopen(map_url))
3005 except urllib2.URLError as e:
3006 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
3007 (map_url, e))
3008 except ValueError as e:
3009 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
3010 if not master_map:
3011 return None, 'Failed to build master map.'
3012
3013 result_master = ''
3014 for bot in bot_list:
3015 builder = bot.split(':', 1)[0]
3016 master_list = master_map.get(builder, [])
3017 if not master_list:
3018 return None, ('No matching master for builder %s.' % builder)
3019 elif len(master_list) > 1:
3020 return None, ('The builder name %s exists in multiple masters %s.' %
3021 (builder, master_list))
3022 else:
3023 cur_master = master_list[0]
3024 if not result_master:
3025 result_master = cur_master
3026 elif result_master != cur_master:
3027 return None, 'The builders do not belong to the same master.'
3028 return result_master, None
3029
3030
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003031def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003032 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00003033 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003034 status = GetTreeStatus()
3035 if 'unset' == status:
3036 print 'You must configure your tree status URL by running "git cl config".'
3037 return 2
3038
3039 print "The tree is %s" % status
3040 print
3041 print GetTreeStatusReason()
3042 if status != 'open':
3043 return 1
3044 return 0
3045
3046
maruel@chromium.org15192402012-09-06 12:38:29 +00003047def CMDtry(parser, args):
3048 """Triggers a try job through Rietveld."""
3049 group = optparse.OptionGroup(parser, "Try job options")
3050 group.add_option(
3051 "-b", "--bot", action="append",
3052 help=("IMPORTANT: specify ONE builder per --bot flag. Use it multiple "
3053 "times to specify multiple builders. ex: "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00003054 "'-b win_rel -b win_layout'. See "
maruel@chromium.org15192402012-09-06 12:38:29 +00003055 "the try server waterfall for the builders name and the tests "
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00003056 "available."))
maruel@chromium.org15192402012-09-06 12:38:29 +00003057 group.add_option(
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003058 "-m", "--master", default='',
iannucci@chromium.org9e849272014-04-04 00:31:55 +00003059 help=("Specify a try master where to run the tries."))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003060 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00003061 "-r", "--revision",
3062 help="Revision to use for the try job; default: the "
3063 "revision will be determined by the try server; see "
3064 "its waterfall for more info")
3065 group.add_option(
3066 "-c", "--clobber", action="store_true", default=False,
3067 help="Force a clobber before building; e.g. don't do an "
3068 "incremental build")
3069 group.add_option(
3070 "--project",
3071 help="Override which project to use. Projects are defined "
3072 "server-side to define what default bot set to use")
3073 group.add_option(
maruel@chromium.org15192402012-09-06 12:38:29 +00003074 "-n", "--name", help="Try job name; default to current branch name")
sheyang@google.com6ebaf782015-05-12 19:17:54 +00003075 group.add_option(
3076 "--use-buildbucket", action="store_true", default=False,
3077 help="Use buildbucket to trigger try jobs.")
maruel@chromium.org15192402012-09-06 12:38:29 +00003078 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003079 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00003080 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003081 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00003082
3083 if args:
3084 parser.error('Unknown arguments: %s' % args)
3085
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003086 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00003087 if not cl.GetIssue():
3088 parser.error('Need to upload first')
3089
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00003090 props = cl.GetIssueProperties()
agable@chromium.org787e3062014-08-20 16:31:19 +00003091 if props.get('closed'):
3092 parser.error('Cannot send tryjobs for a closed CL')
3093
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00003094 if props.get('private'):
3095 parser.error('Cannot use trybots with private issue')
3096
maruel@chromium.org15192402012-09-06 12:38:29 +00003097 if not options.name:
3098 options.name = cl.GetBranch()
3099
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00003100 if options.bot and not options.master:
sheyang@chromium.org2b34d552014-08-14 22:18:42 +00003101 options.master, err_msg = GetBuilderMaster(options.bot)
3102 if err_msg:
3103 parser.error('Tryserver master cannot be found because: %s\n'
3104 'Please manually specify the tryserver master'
3105 ', e.g. "-m tryserver.chromium.linux".' % err_msg)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00003106
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003107 def GetMasterMap():
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00003108 # Process --bot.
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003109 if not options.bot:
3110 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
maruel@chromium.org15192402012-09-06 12:38:29 +00003111
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003112 # Get try masters from PRESUBMIT.py files.
3113 masters = presubmit_support.DoGetTryMasters(
3114 change,
3115 change.LocalPaths(),
3116 settings.GetRoot(),
3117 None,
3118 None,
3119 options.verbose,
3120 sys.stdout)
3121 if masters:
3122 return masters
stip@chromium.org43064fd2013-12-18 20:07:44 +00003123
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003124 # Fall back to deprecated method: get try slaves from PRESUBMIT.py files.
3125 options.bot = presubmit_support.DoGetTrySlaves(
3126 change,
3127 change.LocalPaths(),
3128 settings.GetRoot(),
3129 None,
3130 None,
3131 options.verbose,
3132 sys.stdout)
3133 if not options.bot:
3134 parser.error('No default try builder to try, use --bot')
maruel@chromium.org15192402012-09-06 12:38:29 +00003135
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003136 builders_and_tests = {}
3137 # TODO(machenbach): The old style command-line options don't support
3138 # multiple try masters yet.
3139 old_style = filter(lambda x: isinstance(x, basestring), options.bot)
3140 new_style = filter(lambda x: isinstance(x, tuple), options.bot)
3141
3142 for bot in old_style:
3143 if ':' in bot:
phajdan.jr@chromium.org52914132015-01-22 10:37:09 +00003144 parser.error('Specifying testfilter is no longer supported')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003145 elif ',' in bot:
3146 parser.error('Specify one bot per --bot flag')
3147 else:
3148 builders_and_tests.setdefault(bot, []).append('defaulttests')
3149
3150 for bot, tests in new_style:
3151 builders_and_tests.setdefault(bot, []).extend(tests)
3152
3153 # Return a master map with one master to be backwards compatible. The
3154 # master name defaults to an empty string, which will cause the master
3155 # not to be set on rietveld (deprecated).
3156 return {options.master: builders_and_tests}
3157
3158 masters = GetMasterMap()
stip@chromium.org43064fd2013-12-18 20:07:44 +00003159
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003160 for builders in masters.itervalues():
3161 if any('triggered' in b for b in builders):
3162 print >> sys.stderr, (
3163 'ERROR You are trying to send a job to a triggered bot. This type of'
3164 ' bot requires an\ninitial job from a parent (usually a builder). '
3165 'Instead send your job to the parent.\n'
3166 'Bot list: %s' % builders)
3167 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00003168
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00003169 patchset = cl.GetMostRecentPatchset()
3170 if patchset and patchset != cl.GetPatchset():
3171 print(
3172 '\nWARNING Mismatch between local config and server. Did a previous '
3173 'upload fail?\ngit-cl try always uses latest patchset from rietveld. '
3174 'Continuing using\npatchset %s.\n' % patchset)
sheyang@google.com6ebaf782015-05-12 19:17:54 +00003175 if options.use_buildbucket:
3176 try:
3177 trigger_try_jobs(auth_config, cl, options, masters, 'git_cl_try')
3178 except BuildbucketResponseException as ex:
3179 print 'ERROR: %s' % ex
fischman@chromium.orgd246c972013-12-21 22:47:38 +00003180 return 1
sheyang@google.com6ebaf782015-05-12 19:17:54 +00003181 except Exception as e:
3182 stacktrace = (''.join(traceback.format_stack()) + traceback.format_exc())
3183 print 'ERROR: Exception when trying to trigger tryjobs: %s\n%s' % (
3184 e, stacktrace)
3185 return 1
3186 else:
3187 try:
3188 cl.RpcServer().trigger_distributed_try_jobs(
3189 cl.GetIssue(), patchset, options.name, options.clobber,
3190 options.revision, masters)
3191 except urllib2.HTTPError as e:
3192 if e.code == 404:
3193 print('404 from rietveld; '
3194 'did you mean to use "git try" instead of "git cl try"?')
3195 return 1
3196 print('Tried jobs on:')
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00003197
sheyang@google.com6ebaf782015-05-12 19:17:54 +00003198 for (master, builders) in sorted(masters.iteritems()):
3199 if master:
3200 print 'Master: %s' % master
3201 length = max(len(builder) for builder in builders)
3202 for builder in sorted(builders):
3203 print ' %*s: %s' % (length, builder, ','.join(builders[builder]))
maruel@chromium.org15192402012-09-06 12:38:29 +00003204 return 0
3205
3206
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003207@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003208def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003209 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00003210 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00003211 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00003212 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00003213
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003214 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00003215 if args:
3216 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00003217 branch = cl.GetBranch()
3218 RunGit(['branch', '--set-upstream', branch, args[0]])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00003219 cl = Changelist()
3220 print "Upstream branch set to " + cl.GetUpstreamBranch()
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00003221
3222 # Clear configured merge-base, if there is one.
3223 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00003224 else:
3225 print cl.GetUpstreamBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003226 return 0
3227
3228
thestig@chromium.org00858c82013-12-02 23:08:03 +00003229def CMDweb(parser, args):
3230 """Opens the current CL in the web browser."""
3231 _, args = parser.parse_args(args)
3232 if args:
3233 parser.error('Unrecognized args: %s' % ' '.join(args))
3234
3235 issue_url = Changelist().GetIssueURL()
3236 if not issue_url:
3237 print >> sys.stderr, 'ERROR No issue to open'
3238 return 1
3239
3240 webbrowser.open(issue_url)
3241 return 0
3242
3243
maruel@chromium.org27bb3872011-05-30 20:33:19 +00003244def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003245 """Sets the commit bit to trigger the Commit Queue."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003246 auth.add_auth_options(parser)
3247 options, args = parser.parse_args(args)
3248 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00003249 if args:
3250 parser.error('Unrecognized args: %s' % ' '.join(args))
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003251 cl = Changelist(auth_config=auth_config)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00003252 props = cl.GetIssueProperties()
3253 if props.get('private'):
3254 parser.error('Cannot set commit on private issue')
maruel@chromium.org27bb3872011-05-30 20:33:19 +00003255 cl.SetFlag('commit', '1')
3256 return 0
3257
3258
groby@chromium.org411034a2013-02-26 15:12:01 +00003259def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003260 """Closes the issue."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003261 auth.add_auth_options(parser)
3262 options, args = parser.parse_args(args)
3263 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00003264 if args:
3265 parser.error('Unrecognized args: %s' % ' '.join(args))
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003266 cl = Changelist(auth_config=auth_config)
groby@chromium.org411034a2013-02-26 15:12:01 +00003267 # Ensure there actually is an issue to close.
3268 cl.GetDescription()
3269 cl.CloseIssue()
3270 return 0
3271
3272
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003273def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00003274 """Shows differences between local tree and last upload."""
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003275 auth.add_auth_options(parser)
3276 options, args = parser.parse_args(args)
3277 auth_config = auth.extract_auth_config_from_options(options)
3278 if args:
3279 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00003280
3281 # Uncommitted (staged and unstaged) changes will be destroyed by
3282 # "git reset --hard" if there are merging conflicts in PatchIssue().
3283 # Staged changes would be committed along with the patch from last
3284 # upload, hence counted toward the "last upload" side in the final
3285 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00003286 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00003287 return 1
3288
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003289 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00003290 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003291 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00003292 if not issue:
3293 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003294 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003295 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003296
3297 # Create a new branch based on the merge-base
3298 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
3299 try:
3300 # Patch in the latest changes from rietveld.
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003301 rtn = PatchIssue(issue, False, False, None, auth_config)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003302 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00003303 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003304 return rtn
3305
wychen@chromium.org06928532015-02-03 02:11:29 +00003306 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003307 # branch containing the latest rietveld patch.
wychen@chromium.org06928532015-02-03 02:11:29 +00003308 subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch, '--'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00003309 finally:
3310 RunGit(['checkout', '-q', branch])
3311 RunGit(['branch', '-D', TMP_BRANCH])
3312
3313 return 0
3314
3315
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00003316def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00003317 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00003318 parser.add_option(
3319 '--no-color',
3320 action='store_true',
3321 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003322 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00003323 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003324 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00003325
3326 author = RunGit(['config', 'user.email']).strip() or None
3327
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003328 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00003329
3330 if args:
3331 if len(args) > 1:
3332 parser.error('Unknown args')
3333 base_branch = args[0]
3334 else:
3335 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003336 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00003337
3338 change = cl.GetChange(base_branch, None)
3339 return owners_finder.OwnersFinder(
3340 [f.LocalPath() for f in
3341 cl.GetChange(base_branch, None).AffectedFiles()],
3342 change.RepositoryRoot(), author,
3343 fopen=file, os_path=os.path, glob=glob.glob,
3344 disable_color=options.no_color).run()
3345
3346
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003347def BuildGitDiffCmd(diff_type, upstream_commit, args, extensions):
3348 """Generates a diff command."""
3349 # Generate diff for the current branch's changes.
3350 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
3351 upstream_commit, '--' ]
3352
3353 if args:
3354 for arg in args:
3355 if os.path.isdir(arg):
3356 diff_cmd.extend(os.path.join(arg, '*' + ext) for ext in extensions)
3357 elif os.path.isfile(arg):
3358 diff_cmd.append(arg)
3359 else:
3360 DieWithError('Argument "%s" is not a file or a directory' % arg)
3361 else:
3362 diff_cmd.extend('*' + ext for ext in extensions)
3363
3364 return diff_cmd
3365
3366
enne@chromium.org555cfe42014-01-29 18:21:39 +00003367@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00003368def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00003369 """Runs auto-formatting tools (clang-format etc.) on the diff."""
thakis@chromium.org9819b1b2014-12-09 21:21:53 +00003370 CLANG_EXTS = ['.cc', '.cpp', '.h', '.mm', '.proto', '.java']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00003371 parser.add_option('--full', action='store_true',
3372 help='Reformat the full content of all touched files')
3373 parser.add_option('--dry-run', action='store_true',
3374 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00003375 parser.add_option('--python', action='store_true',
3376 help='Format python code with yapf (experimental).')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00003377 parser.add_option('--diff', action='store_true',
3378 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00003379 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00003380
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00003381 # git diff generates paths against the root of the repository. Change
3382 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003383 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00003384 if rel_base_path:
3385 os.chdir(rel_base_path)
3386
digit@chromium.org29e47272013-05-17 17:01:46 +00003387 # Grab the merge-base commit, i.e. the upstream commit of the current
3388 # branch when it was created or the last time it was rebased. This is
3389 # to cover the case where the user may have called "git fetch origin",
3390 # moving the origin branch to a newer commit, but hasn't rebased yet.
3391 upstream_commit = None
3392 cl = Changelist()
3393 upstream_branch = cl.GetUpstreamBranch()
3394 if upstream_branch:
3395 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
3396 upstream_commit = upstream_commit.strip()
3397
3398 if not upstream_commit:
3399 DieWithError('Could not find base commit for this branch. '
3400 'Are you in detached state?')
3401
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003402 if opts.full:
3403 # Only list the names of modified files.
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00003404 diff_type = '--name-only'
enne@chromium.org555cfe42014-01-29 18:21:39 +00003405 else:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003406 # Only generate context-less patches.
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00003407 diff_type = '-U0'
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003408
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00003409 diff_cmd = BuildGitDiffCmd(diff_type, upstream_commit, args, CLANG_EXTS)
digit@chromium.org29e47272013-05-17 17:01:46 +00003410 diff_output = RunGit(diff_cmd)
3411
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00003412 top_dir = os.path.normpath(
3413 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
3414
3415 # Locate the clang-format binary in the checkout
3416 try:
3417 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
3418 except clang_format.NotFoundError, e:
3419 DieWithError(e)
mdempsky@google.comc3b3dc02013-08-05 23:09:49 +00003420
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003421 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
3422 # formatted. This is used to block during the presubmit.
3423 return_value = 0
3424
digit@chromium.org29e47272013-05-17 17:01:46 +00003425 if opts.full:
3426 # diff_output is a list of files to send to clang-format.
3427 files = diff_output.splitlines()
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003428 if files:
3429 cmd = [clang_format_tool]
3430 if not opts.dry_run and not opts.diff:
3431 cmd.append('-i')
3432 stdout = RunCommand(cmd + files, cwd=top_dir)
3433 if opts.diff:
3434 sys.stdout.write(stdout)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00003435 else:
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00003436 env = os.environ.copy()
thakis@chromium.orgbd2a9b92014-09-05 18:54:22 +00003437 env['PATH'] = str(os.path.dirname(clang_format_tool))
digit@chromium.org29e47272013-05-17 17:01:46 +00003438 # diff_output is a patch to send to clang-format-diff.py
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00003439 try:
3440 script = clang_format.FindClangFormatScriptInChromiumTree(
3441 'clang-format-diff.py')
3442 except clang_format.NotFoundError, e:
3443 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00003444
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00003445 cmd = [sys.executable, script, '-p0']
wittman@chromium.org04d5a222014-03-07 18:30:42 +00003446 if not opts.dry_run and not opts.diff:
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00003447 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00003448
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00003449 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
wittman@chromium.org04d5a222014-03-07 18:30:42 +00003450 if opts.diff:
3451 sys.stdout.write(stdout)
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00003452 if opts.dry_run and len(stdout) > 0:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003453 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00003454
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00003455 # Similar code to above, but using yapf on .py files rather than clang-format
3456 # on C/C++ files
3457 if opts.python:
3458 diff_cmd = BuildGitDiffCmd(diff_type, upstream_commit, args, ['.py'])
3459 diff_output = RunGit(diff_cmd)
3460 yapf_tool = gclient_utils.FindExecutable('yapf')
3461 if yapf_tool is None:
3462 DieWithError('yapf not found in PATH')
3463
3464 if opts.full:
3465 files = diff_output.splitlines()
3466 if files:
3467 cmd = [yapf_tool]
3468 if not opts.dry_run and not opts.diff:
3469 cmd.append('-i')
3470 stdout = RunCommand(cmd + files, cwd=top_dir)
3471 if opts.diff:
3472 sys.stdout.write(stdout)
3473 else:
3474 # TODO(sbc): yapf --lines mode still has some issues.
3475 # https://github.com/google/yapf/issues/154
3476 DieWithError('--python currently only works with --full')
3477
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00003478 # Build a diff command that only operates on dart files. dart's formatter
3479 # does not have the nice property of only operating on modified chunks, so
3480 # hard code full.
3481 dart_diff_cmd = BuildGitDiffCmd('--name-only', upstream_commit,
3482 args, ['.dart'])
3483 dart_diff_output = RunGit(dart_diff_cmd)
3484 if dart_diff_output:
3485 try:
3486 command = [dart_format.FindDartFmtToolInChromiumTree()]
3487 if not opts.dry_run and not opts.diff:
3488 command.append('-w')
3489 command.extend(dart_diff_output.splitlines())
3490
3491 stdout = RunCommand(command, cwd=top_dir, env=env)
3492 if opts.dry_run and stdout:
3493 return_value = 2
3494 except dart_format.NotFoundError as e:
3495 print ('Unable to check dart code formatting. Dart SDK is not in ' +
3496 'this checkout.')
3497
3498 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00003499
3500
maruel@chromium.org29404b52014-09-08 22:58:00 +00003501def CMDlol(parser, args):
3502 # This command is intentionally undocumented.
thakis@chromium.org3421c992014-11-02 02:20:32 +00003503 print zlib.decompress(base64.b64decode(
3504 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
3505 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
3506 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
3507 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY'))
maruel@chromium.org29404b52014-09-08 22:58:00 +00003508 return 0
3509
3510
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003511class OptionParser(optparse.OptionParser):
3512 """Creates the option parse and add --verbose support."""
3513 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003514 optparse.OptionParser.__init__(
3515 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003516 self.add_option(
3517 '-v', '--verbose', action='count', default=0,
3518 help='Use 2 times for more debugging info')
3519
3520 def parse_args(self, args=None, values=None):
3521 options, args = optparse.OptionParser.parse_args(self, args, values)
3522 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
3523 logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
3524 return options, args
3525
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003526
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003527def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00003528 if sys.hexversion < 0x02060000:
3529 print >> sys.stderr, (
3530 '\nYour python version %s is unsupported, please upgrade.\n' %
3531 sys.version.split(' ', 1)[0])
3532 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00003533
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003534 # Reload settings.
3535 global settings
3536 settings = Settings()
3537
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003538 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003539 dispatcher = subcommand.CommandDispatcher(__name__)
3540 try:
3541 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00003542 except auth.AuthenticationError as e:
3543 DieWithError(str(e))
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003544 except urllib2.HTTPError, e:
3545 if e.code != 500:
3546 raise
3547 DieWithError(
3548 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
3549 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00003550 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003551
3552
3553if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00003554 # These affect sys.stdout so do it outside of main() to simplify mocks in
3555 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00003556 fix_encoding.fix_encoding()
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00003557 colorama.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00003558 try:
3559 sys.exit(main(sys.argv[1:]))
3560 except KeyboardInterrupt:
3561 sys.stderr.write('interrupted\n')
3562 sys.exit(1)