blob: da568e5f47b651346b44e1c62b2780b54251e734 [file] [log] [blame]
iannucci@chromium.org405b87e2015-11-12 18:08:34 +00001#!/usr/bin/env python
miket@chromium.org183df1a2012-01-04 19:44:55 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org725f1c32011-04-01 20:24:54 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00006# Copyright (C) 2008 Evan Martin <martine@danga.com>
7
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00008"""A git-command for integrating reviews on Rietveld and Gerrit."""
maruel@chromium.org725f1c32011-04-01 20:24:54 +00009
vapiera7fbd5a2016-06-16 09:17:49 -070010from __future__ import print_function
11
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +000012from distutils.version import LooseVersion
calamity@chromium.orgffde55c2015-03-12 00:44:17 +000013from multiprocessing.pool import ThreadPool
thakis@chromium.org3421c992014-11-02 02:20:32 +000014import base64
rmistry@google.com2dd99862015-06-22 12:22:18 +000015import collections
sheyang@google.com6ebaf782015-05-12 19:17:54 +000016import httplib
maruel@chromium.org4f6852c2012-04-20 20:39:20 +000017import json
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000018import logging
calamity@chromium.orgcf197482016-04-29 20:15:53 +000019import multiprocessing
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000020import optparse
21import os
22import re
ukai@chromium.org78c4b982012-02-14 02:20:26 +000023import stat
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000024import sys
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000025import textwrap
sheyang@google.com6ebaf782015-05-12 19:17:54 +000026import traceback
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000027import urllib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000028import urllib2
maruel@chromium.org967c0a82013-06-17 22:52:24 +000029import urlparse
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +000030import uuid
thestig@chromium.org00858c82013-12-02 23:08:03 +000031import webbrowser
thakis@chromium.org3421c992014-11-02 02:20:32 +000032import zlib
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000033
34try:
maruel@chromium.orgc98c0c52011-04-06 13:39:43 +000035 import readline # pylint: disable=F0401,W0611
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000036except ImportError:
37 pass
38
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000039from third_party import colorama
sheyang@google.com6ebaf782015-05-12 19:17:54 +000040from third_party import httplib2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000041from third_party import upload
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +000042import auth
skobes6468b902016-10-24 08:45:10 -070043import checkout
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +000044import clang_format
tandrii@chromium.org71184c02016-01-13 15:18:44 +000045import commit_queue
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +000046import dart_format
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +000047import setup_color
maruel@chromium.org6f09cd92011-04-01 16:38:12 +000048import fix_encoding
maruel@chromium.org0e0436a2011-10-25 13:32:41 +000049import gclient_utils
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +000050import gerrit_util
szager@chromium.org151ebcf2016-03-09 01:08:25 +000051import git_cache
iannucci@chromium.org9e849272014-04-04 00:31:55 +000052import git_common
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +000053import git_footers
piman@chromium.org336f9122014-09-04 02:16:55 +000054import owners
iannucci@chromium.org9e849272014-04-04 00:31:55 +000055import owners_finder
maruel@chromium.org2a74d372011-03-29 19:05:50 +000056import presubmit_support
maruel@chromium.orgcab38e92011-04-09 00:30:51 +000057import rietveld
maruel@chromium.org2a74d372011-03-29 19:05:50 +000058import scm
maruel@chromium.org0633fb42013-08-16 20:06:14 +000059import subcommand
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +000060import subprocess2
maruel@chromium.org2a74d372011-03-29 19:05:50 +000061import watchlists
62
tandrii7400cf02016-06-21 08:48:07 -070063__version__ = '2.0'
maruel@chromium.org2a74d372011-03-29 19:05:50 +000064
tandrii9d2c7a32016-06-22 03:42:45 -070065COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
iannuccie7f68952016-08-15 17:45:29 -070066DEFAULT_SERVER = 'https://codereview.chromium.org'
maruel@chromium.org0ba7f962011-01-11 22:13:58 +000067POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000068DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +000069GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
rmistry@google.comc68112d2015-03-03 12:48:06 +000070REFS_THAT_ALIAS_TO_OTHER_REFS = {
71 'refs/remotes/origin/lkgr': 'refs/remotes/origin/master',
72 'refs/remotes/origin/lkcr': 'refs/remotes/origin/master',
73}
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000074
thestig@chromium.org44202a22014-03-11 19:22:18 +000075# Valid extensions for files we want to lint.
76DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
77DEFAULT_LINT_IGNORE_REGEX = r"$^"
78
borenet6c0efe62016-10-19 08:13:29 -070079# Buildbucket master name prefix.
80MASTER_PREFIX = 'master.'
81
maruel@chromium.org2e23ce32013-05-07 12:42:28 +000082# Shortcut since it quickly becomes redundant.
83Fore = colorama.Fore
maruel@chromium.org90541732011-04-01 17:54:18 +000084
maruel@chromium.orgddd59412011-11-30 14:20:38 +000085# Initialized in main()
86settings = None
87
88
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000089def DieWithError(message):
vapiera7fbd5a2016-06-16 09:17:49 -070090 print(message, file=sys.stderr)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +000091 sys.exit(1)
92
93
thestig@chromium.org8b0553c2014-02-11 00:33:37 +000094def GetNoGitPagerEnv():
95 env = os.environ.copy()
96 # 'cat' is a magical git string that disables pagers on all platforms.
97 env['GIT_PAGER'] = 'cat'
98 return env
99
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000100
bsep@chromium.org627d9002016-04-29 00:00:52 +0000101def RunCommand(args, error_ok=False, error_message=None, shell=False, **kwargs):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000102 try:
bsep@chromium.org627d9002016-04-29 00:00:52 +0000103 return subprocess2.check_output(args, shell=shell, **kwargs)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000104 except subprocess2.CalledProcessError as e:
105 logging.debug('Failed running %s', args)
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000106 if not error_ok:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000107 DieWithError(
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000108 'Command "%s" failed.\n%s' % (
109 ' '.join(args), error_message or e.stdout or ''))
110 return e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000111
112
113def RunGit(args, **kwargs):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000114 """Returns stdout."""
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000115 return RunCommand(['git'] + args, **kwargs)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000116
117
enne@chromium.org3b7e15c2014-01-21 17:44:47 +0000118def RunGitWithCode(args, suppress_stderr=False):
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000119 """Returns return code and stdout."""
tandrii5d48c322016-08-18 16:19:37 -0700120 if suppress_stderr:
121 stderr = subprocess2.VOID
122 else:
123 stderr = sys.stderr
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000124 try:
tandrii5d48c322016-08-18 16:19:37 -0700125 (out, _), code = subprocess2.communicate(['git'] + args,
126 env=GetNoGitPagerEnv(),
127 stdout=subprocess2.PIPE,
128 stderr=stderr)
129 return code, out
130 except subprocess2.CalledProcessError as e:
131 logging.debug('Failed running %s', args)
132 return e.returncode, e.stdout
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000133
134
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000135def RunGitSilent(args):
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +0000136 """Returns stdout, suppresses stderr and ignores the return code."""
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000137 return RunGitWithCode(args, suppress_stderr=True)[1]
138
139
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000140def IsGitVersionAtLeast(min_version):
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000141 prefix = 'git version '
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000142 version = RunGit(['--version']).strip()
ilevy@chromium.orgcc56ee42013-07-10 22:16:29 +0000143 return (version.startswith(prefix) and
144 LooseVersion(version[len(prefix):]) >= LooseVersion(min_version))
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +0000145
146
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000147def BranchExists(branch):
148 """Return True if specified branch exists."""
149 code, _ = RunGitWithCode(['rev-parse', '--verify', branch],
150 suppress_stderr=True)
151 return not code
152
153
tandrii2a16b952016-10-19 07:09:44 -0700154def time_sleep(seconds):
155 # Use this so that it can be mocked in tests without interfering with python
156 # system machinery.
157 import time # Local import to discourage others from importing time globally.
158 return time.sleep(seconds)
159
160
maruel@chromium.org90541732011-04-01 17:54:18 +0000161def ask_for_data(prompt):
162 try:
163 return raw_input(prompt)
164 except KeyboardInterrupt:
165 # Hide the exception.
166 sys.exit(1)
167
168
tandrii5d48c322016-08-18 16:19:37 -0700169def _git_branch_config_key(branch, key):
170 """Helper method to return Git config key for a branch."""
171 assert branch, 'branch name is required to set git config for it'
172 return 'branch.%s.%s' % (branch, key)
173
174
175def _git_get_branch_config_value(key, default=None, value_type=str,
176 branch=False):
177 """Returns git config value of given or current branch if any.
178
179 Returns default in all other cases.
180 """
181 assert value_type in (int, str, bool)
182 if branch is False: # Distinguishing default arg value from None.
183 branch = GetCurrentBranch()
184
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000185 if not branch:
tandrii5d48c322016-08-18 16:19:37 -0700186 return default
rogerta@chromium.orgcaa16552013-03-18 20:45:05 +0000187
tandrii5d48c322016-08-18 16:19:37 -0700188 args = ['config']
tandrii33a46ff2016-08-23 05:53:40 -0700189 if value_type == bool:
tandrii5d48c322016-08-18 16:19:37 -0700190 args.append('--bool')
tandrii33a46ff2016-08-23 05:53:40 -0700191 # git config also has --int, but apparently git config suffers from integer
192 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700193 args.append(_git_branch_config_key(branch, key))
194 code, out = RunGitWithCode(args)
195 if code == 0:
196 value = out.strip()
197 if value_type == int:
198 return int(value)
199 if value_type == bool:
200 return bool(value.lower() == 'true')
201 return value
iannucci@chromium.org79540052012-10-19 23:15:26 +0000202 return default
203
204
tandrii5d48c322016-08-18 16:19:37 -0700205def _git_set_branch_config_value(key, value, branch=None, **kwargs):
206 """Sets the value or unsets if it's None of a git branch config.
207
208 Valid, though not necessarily existing, branch must be provided,
209 otherwise currently checked out branch is used.
210 """
211 if not branch:
212 branch = GetCurrentBranch()
213 assert branch, 'a branch name OR currently checked out branch is required'
214 args = ['config']
qyearsley12fa6ff2016-08-24 09:18:40 -0700215 # Check for boolean first, because bool is int, but int is not bool.
tandrii5d48c322016-08-18 16:19:37 -0700216 if value is None:
217 args.append('--unset')
218 elif isinstance(value, bool):
219 args.append('--bool')
220 value = str(value).lower()
tandrii5d48c322016-08-18 16:19:37 -0700221 else:
tandrii33a46ff2016-08-23 05:53:40 -0700222 # git config also has --int, but apparently git config suffers from integer
223 # overflows (http://crbug.com/640115), so don't use it.
tandrii5d48c322016-08-18 16:19:37 -0700224 value = str(value)
225 args.append(_git_branch_config_key(branch, key))
226 if value is not None:
227 args.append(value)
228 RunGit(args, **kwargs)
229
230
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000231def add_git_similarity(parser):
232 parser.add_option(
tandrii5d48c322016-08-18 16:19:37 -0700233 '--similarity', metavar='SIM', type=int, action='store',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000234 help='Sets the percentage that a pair of files need to match in order to'
235 ' be considered copies (default 50)')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000236 parser.add_option(
237 '--find-copies', action='store_true',
238 help='Allows git to look for copies.')
239 parser.add_option(
240 '--no-find-copies', action='store_false', dest='find_copies',
241 help='Disallows git from looking for copies.')
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000242
243 old_parser_args = parser.parse_args
244 def Parse(args):
245 options, args = old_parser_args(args)
246
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000247 if options.similarity is None:
tandrii5d48c322016-08-18 16:19:37 -0700248 options.similarity = _git_get_branch_config_value(
249 'git-cl-similarity', default=50, value_type=int)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000250 else:
iannucci@chromium.org79540052012-10-19 23:15:26 +0000251 print('Note: Saving similarity of %d%% in git config.'
252 % options.similarity)
tandrii5d48c322016-08-18 16:19:37 -0700253 _git_set_branch_config_value('git-cl-similarity', options.similarity)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000254
iannucci@chromium.org79540052012-10-19 23:15:26 +0000255 options.similarity = max(0, min(options.similarity, 100))
256
257 if options.find_copies is None:
tandrii5d48c322016-08-18 16:19:37 -0700258 options.find_copies = _git_get_branch_config_value(
259 'git-find-copies', default=True, value_type=bool)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000260 else:
tandrii5d48c322016-08-18 16:19:37 -0700261 _git_set_branch_config_value('git-find-copies', bool(options.find_copies))
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000262
263 print('Using %d%% similarity for rename/copy detection. '
264 'Override with --similarity.' % options.similarity)
265
266 return options, args
267 parser.parse_args = Parse
268
269
machenbach@chromium.org45453142015-09-15 08:45:22 +0000270def _get_properties_from_options(options):
271 properties = dict(x.split('=', 1) for x in options.properties)
272 for key, val in properties.iteritems():
273 try:
274 properties[key] = json.loads(val)
275 except ValueError:
276 pass # If a value couldn't be evaluated, treat it as a string.
277 return properties
278
279
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000280def _prefix_master(master):
281 """Convert user-specified master name to full master name.
282
283 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
284 name, while the developers always use shortened master name
285 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
286 function does the conversion for buildbucket migration.
287 """
borenet6c0efe62016-10-19 08:13:29 -0700288 if master.startswith(MASTER_PREFIX):
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000289 return master
borenet6c0efe62016-10-19 08:13:29 -0700290 return '%s%s' % (MASTER_PREFIX, master)
291
292
293def _unprefix_master(bucket):
294 """Convert bucket name to shortened master name.
295
296 Buildbucket uses full master name(master.tryserver.chromium.linux) as bucket
297 name, while the developers always use shortened master name
298 (tryserver.chromium.linux) by stripping off the prefix 'master.'. This
299 function does the conversion for buildbucket migration.
300 """
301 if bucket.startswith(MASTER_PREFIX):
302 return bucket[len(MASTER_PREFIX):]
303 return bucket
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000304
305
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000306def _buildbucket_retry(operation_name, http, *args, **kwargs):
307 """Retries requests to buildbucket service and returns parsed json content."""
308 try_count = 0
309 while True:
310 response, content = http.request(*args, **kwargs)
311 try:
312 content_json = json.loads(content)
313 except ValueError:
314 content_json = None
315
316 # Buildbucket could return an error even if status==200.
317 if content_json and content_json.get('error'):
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000318 error = content_json.get('error')
319 if error.get('code') == 403:
320 raise BuildbucketResponseException(
321 'Access denied: %s' % error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000322 msg = 'Error in response. Reason: %s. Message: %s.' % (
nodir@chromium.orgbaff4e12016-03-08 00:33:57 +0000323 error.get('reason', ''), error.get('message', ''))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000324 raise BuildbucketResponseException(msg)
325
326 if response.status == 200:
327 if not content_json:
328 raise BuildbucketResponseException(
329 'Buildbucket returns invalid json content: %s.\n'
330 'Please file bugs at http://crbug.com, label "Infra-BuildBucket".' %
331 content)
332 return content_json
333 if response.status < 500 or try_count >= 2:
334 raise httplib2.HttpLib2Error(content)
335
336 # status >= 500 means transient failures.
337 logging.debug('Transient errors when %s. Will retry.', operation_name)
tandrii2a16b952016-10-19 07:09:44 -0700338 time_sleep(0.5 + 1.5*try_count)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000339 try_count += 1
340 assert False, 'unreachable'
341
342
qyearsley1fdfcb62016-10-24 13:22:03 -0700343def _get_bucket_map(changelist, options, option_parser):
qyearsleydd49f942016-10-28 11:57:22 -0700344 """Returns a dict mapping bucket names to builders and tests,
345 for triggering try jobs.
qyearsley1fdfcb62016-10-24 13:22:03 -0700346 """
qyearsleydd49f942016-10-28 11:57:22 -0700347 # If no bots are listed, we try to get a set of builders and tests based
348 # on GetPreferredTryMasters functions in PRESUBMIT.py files.
qyearsley1fdfcb62016-10-24 13:22:03 -0700349 if not options.bot:
350 change = changelist.GetChange(
351 changelist.GetCommonAncestorWithUpstream(), None)
qyearsley136b49f2016-10-31 09:02:26 -0700352 # Get try masters from PRESUBMIT.py files.
nodire4f0fe02016-11-04 16:23:30 -0700353 masters = presubmit_support.DoGetTryMasters(
qyearsley1fdfcb62016-10-24 13:22:03 -0700354 change=change,
355 changed_files=change.LocalPaths(),
356 repository_root=settings.GetRoot(),
357 default_presubmit=None,
358 project=None,
359 verbose=options.verbose,
360 output_stream=sys.stdout)
nodire4f0fe02016-11-04 16:23:30 -0700361 if masters is None:
362 return None
363 return {MASTER_PREFIX + m: b for m, b in masters.iteritems()}
qyearsley1fdfcb62016-10-24 13:22:03 -0700364
qyearsley1fdfcb62016-10-24 13:22:03 -0700365 if options.bucket:
366 return {options.bucket: {b: [] for b in options.bot}}
qyearsleydd49f942016-10-28 11:57:22 -0700367 if options.master:
368 return {_prefix_master(options.master): {b: [] for b in options.bot}}
qyearsley1fdfcb62016-10-24 13:22:03 -0700369
qyearsleydd49f942016-10-28 11:57:22 -0700370 # If bots are listed but no master or bucket, then we need to find out
371 # the corresponding master for each bot.
372 bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
373 if error_message:
374 option_parser.error(
375 'Tryserver master cannot be found because: %s\n'
376 'Please manually specify the tryserver master, e.g. '
377 '"-m tryserver.chromium.linux".' % error_message)
378 return bucket_map
qyearsley1fdfcb62016-10-24 13:22:03 -0700379
380
qyearsley123a4682016-10-26 09:12:17 -0700381def _get_bucket_map_for_builders(builders):
382 """Returns a map of buckets to builders for the given builders."""
qyearsley1fdfcb62016-10-24 13:22:03 -0700383 map_url = 'https://builders-map.appspot.com/'
384 try:
qyearsley123a4682016-10-26 09:12:17 -0700385 builders_map = json.load(urllib2.urlopen(map_url))
qyearsley1fdfcb62016-10-24 13:22:03 -0700386 except urllib2.URLError as e:
387 return None, ('Failed to fetch builder-to-master map from %s. Error: %s.' %
388 (map_url, e))
389 except ValueError as e:
390 return None, ('Invalid json string from %s. Error: %s.' % (map_url, e))
qyearsley123a4682016-10-26 09:12:17 -0700391 if not builders_map:
qyearsley1fdfcb62016-10-24 13:22:03 -0700392 return None, 'Failed to build master map.'
393
qyearsley123a4682016-10-26 09:12:17 -0700394 bucket_map = {}
395 for builder in builders:
qyearsley123a4682016-10-26 09:12:17 -0700396 masters = builders_map.get(builder, [])
397 if not masters:
qyearsley1fdfcb62016-10-24 13:22:03 -0700398 return None, ('No matching master for builder %s.' % builder)
qyearsley123a4682016-10-26 09:12:17 -0700399 if len(masters) > 1:
qyearsley1fdfcb62016-10-24 13:22:03 -0700400 return None, ('The builder name %s exists in multiple masters %s.' %
qyearsley123a4682016-10-26 09:12:17 -0700401 (builder, masters))
402 bucket = _prefix_master(masters[0])
403 bucket_map.setdefault(bucket, {})[builder] = []
404
405 return bucket_map, None
qyearsley1fdfcb62016-10-24 13:22:03 -0700406
407
borenet6c0efe62016-10-19 08:13:29 -0700408def _trigger_try_jobs(auth_config, changelist, buckets, options,
tandriide281ae2016-10-12 06:02:30 -0700409 category='git_cl_try', patchset=None):
qyearsley1fdfcb62016-10-24 13:22:03 -0700410 """Sends a request to Buildbucket to trigger try jobs for a changelist.
411
412 Args:
413 auth_config: AuthConfig for Rietveld.
414 changelist: Changelist that the try jobs are associated with.
415 buckets: A nested dict mapping bucket names to builders to tests.
416 options: Command-line options.
417 """
tandriide281ae2016-10-12 06:02:30 -0700418 assert changelist.GetIssue(), 'CL must be uploaded first'
419 codereview_url = changelist.GetCodereviewServer()
420 assert codereview_url, 'CL must be uploaded first'
421 patchset = patchset or changelist.GetMostRecentPatchset()
422 assert patchset, 'CL must be uploaded first'
423
424 codereview_host = urlparse.urlparse(codereview_url).hostname
425 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000426 http = authenticator.authorize(httplib2.Http())
427 http.force_exception_to_status_code = True
tandriide281ae2016-10-12 06:02:30 -0700428
429 # TODO(tandrii): consider caching Gerrit CL details just like
430 # _RietveldChangelistImpl does, then caching values in these two variables
431 # won't be necessary.
432 owner_email = changelist.GetIssueOwner()
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000433
434 buildbucket_put_url = (
435 'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
sheyang@chromium.orgdb375572015-08-17 19:22:23 +0000436 hostname=options.buildbucket_host))
tandriide281ae2016-10-12 06:02:30 -0700437 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
438 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
439 hostname=codereview_host,
440 issue=changelist.GetIssue(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000441 patch=patchset)
tandrii8c5a3532016-11-04 07:52:02 -0700442
443 shared_parameters_properties = changelist.GetTryjobProperties(patchset)
444 shared_parameters_properties['category'] = category
445 if options.clobber:
446 shared_parameters_properties['clobber'] = True
tandriide281ae2016-10-12 06:02:30 -0700447 extra_properties = _get_properties_from_options(options)
tandrii8c5a3532016-11-04 07:52:02 -0700448 if extra_properties:
449 shared_parameters_properties.update(extra_properties)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000450
451 batch_req_body = {'builds': []}
452 print_text = []
453 print_text.append('Tried jobs on:')
borenet6c0efe62016-10-19 08:13:29 -0700454 for bucket, builders_and_tests in sorted(buckets.iteritems()):
455 print_text.append('Bucket: %s' % bucket)
456 master = None
457 if bucket.startswith(MASTER_PREFIX):
458 master = _unprefix_master(bucket)
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000459 for builder, tests in sorted(builders_and_tests.iteritems()):
460 print_text.append(' %s: %s' % (builder, tests))
461 parameters = {
462 'builder_name': builder,
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000463 'changes': [{
tandriide281ae2016-10-12 06:02:30 -0700464 'author': {'email': owner_email},
nodir@chromium.orgd2217312015-09-21 15:51:21 +0000465 'revision': options.revision,
466 }],
tandrii8c5a3532016-11-04 07:52:02 -0700467 'properties': shared_parameters_properties.copy(),
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000468 }
machenbach@chromium.org2403e802016-04-29 12:34:42 +0000469 if 'presubmit' in builder.lower():
470 parameters['properties']['dry_run'] = 'true'
tandrii@chromium.org3764fa22015-10-21 16:40:40 +0000471 if tests:
472 parameters['properties']['testfilter'] = tests
borenet6c0efe62016-10-19 08:13:29 -0700473
474 tags = [
475 'builder:%s' % builder,
476 'buildset:%s' % buildset,
477 'user_agent:git_cl_try',
478 ]
479 if master:
480 parameters['properties']['master'] = master
481 tags.append('master:%s' % master)
482
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000483 batch_req_body['builds'].append(
484 {
485 'bucket': bucket,
486 'parameters_json': json.dumps(parameters),
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000487 'client_operation_id': str(uuid.uuid4()),
borenet6c0efe62016-10-19 08:13:29 -0700488 'tags': tags,
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000489 }
490 )
491
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000492 _buildbucket_retry(
qyearsleyeab3c042016-08-24 09:18:28 -0700493 'triggering try jobs',
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000494 http,
495 buildbucket_put_url,
496 'PUT',
497 body=json.dumps(batch_req_body),
498 headers={'Content-Type': 'application/json'}
499 )
tandrii@chromium.org35c61452016-02-26 15:24:57 +0000500 print_text.append('To see results here, run: git cl try-results')
501 print_text.append('To see results in browser, run: git cl web')
vapiera7fbd5a2016-06-16 09:17:49 -0700502 print('\n'.join(print_text))
kjellander@chromium.org44424542015-06-02 18:35:29 +0000503
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000504
tandrii221ab252016-10-06 08:12:04 -0700505def fetch_try_jobs(auth_config, changelist, buildbucket_host,
506 patchset=None):
qyearsleyeab3c042016-08-24 09:18:28 -0700507 """Fetches try jobs from buildbucket.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000508
qyearsley53f48a12016-09-01 10:45:13 -0700509 Returns a map from build id to build info as a dictionary.
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000510 """
tandrii221ab252016-10-06 08:12:04 -0700511 assert buildbucket_host
512 assert changelist.GetIssue(), 'CL must be uploaded first'
513 assert changelist.GetCodereviewServer(), 'CL must be uploaded first'
514 patchset = patchset or changelist.GetMostRecentPatchset()
515 assert patchset, 'CL must be uploaded first'
516
517 codereview_url = changelist.GetCodereviewServer()
518 codereview_host = urlparse.urlparse(codereview_url).hostname
519 authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000520 if authenticator.has_cached_credentials():
521 http = authenticator.authorize(httplib2.Http())
522 else:
vapiera7fbd5a2016-06-16 09:17:49 -0700523 print('Warning: Some results might be missing because %s' %
524 # Get the message on how to login.
tandrii221ab252016-10-06 08:12:04 -0700525 (auth.LoginRequiredError(codereview_host).message,))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000526 http = httplib2.Http()
527
528 http.force_exception_to_status_code = True
529
tandrii221ab252016-10-06 08:12:04 -0700530 buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
531 codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
532 hostname=codereview_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000533 issue=changelist.GetIssue(),
tandrii221ab252016-10-06 08:12:04 -0700534 patch=patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000535 params = {'tag': 'buildset:%s' % buildset}
536
537 builds = {}
538 while True:
539 url = 'https://{hostname}/_ah/api/buildbucket/v1/search?{params}'.format(
tandrii221ab252016-10-06 08:12:04 -0700540 hostname=buildbucket_host,
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000541 params=urllib.urlencode(params))
qyearsleyeab3c042016-08-24 09:18:28 -0700542 content = _buildbucket_retry('fetching try jobs', http, url, 'GET')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000543 for build in content.get('builds', []):
544 builds[build['id']] = build
545 if 'next_cursor' in content:
546 params['start_cursor'] = content['next_cursor']
547 else:
548 break
549 return builds
550
551
qyearsleyeab3c042016-08-24 09:18:28 -0700552def print_try_jobs(options, builds):
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000553 """Prints nicely result of fetch_try_jobs."""
554 if not builds:
qyearsleyeab3c042016-08-24 09:18:28 -0700555 print('No try jobs scheduled')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000556 return
557
558 # Make a copy, because we'll be modifying builds dictionary.
559 builds = builds.copy()
560 builder_names_cache = {}
561
562 def get_builder(b):
563 try:
564 return builder_names_cache[b['id']]
565 except KeyError:
566 try:
567 parameters = json.loads(b['parameters_json'])
568 name = parameters['builder_name']
569 except (ValueError, KeyError) as error:
vapiera7fbd5a2016-06-16 09:17:49 -0700570 print('WARNING: failed to get builder name for build %s: %s' % (
571 b['id'], error))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000572 name = None
573 builder_names_cache[b['id']] = name
574 return name
575
576 def get_bucket(b):
577 bucket = b['bucket']
578 if bucket.startswith('master.'):
579 return bucket[len('master.'):]
580 return bucket
581
582 if options.print_master:
583 name_fmt = '%%-%ds %%-%ds' % (
584 max(len(str(get_bucket(b))) for b in builds.itervalues()),
585 max(len(str(get_builder(b))) for b in builds.itervalues()))
586 def get_name(b):
587 return name_fmt % (get_bucket(b), get_builder(b))
588 else:
589 name_fmt = '%%-%ds' % (
590 max(len(str(get_builder(b))) for b in builds.itervalues()))
591 def get_name(b):
592 return name_fmt % get_builder(b)
593
594 def sort_key(b):
595 return b['status'], b.get('result'), get_name(b), b.get('url')
596
597 def pop(title, f, color=None, **kwargs):
598 """Pop matching builds from `builds` dict and print them."""
599
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +0000600 if not options.color or color is None:
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000601 colorize = str
602 else:
603 colorize = lambda x: '%s%s%s' % (color, x, Fore.RESET)
604
605 result = []
606 for b in builds.values():
607 if all(b.get(k) == v for k, v in kwargs.iteritems()):
608 builds.pop(b['id'])
609 result.append(b)
610 if result:
vapiera7fbd5a2016-06-16 09:17:49 -0700611 print(colorize(title))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000612 for b in sorted(result, key=sort_key):
vapiera7fbd5a2016-06-16 09:17:49 -0700613 print(' ', colorize('\t'.join(map(str, f(b)))))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000614
615 total = len(builds)
616 pop(status='COMPLETED', result='SUCCESS',
617 title='Successes:', color=Fore.GREEN,
618 f=lambda b: (get_name(b), b.get('url')))
619 pop(status='COMPLETED', result='FAILURE', failure_reason='INFRA_FAILURE',
620 title='Infra Failures:', color=Fore.MAGENTA,
621 f=lambda b: (get_name(b), b.get('url')))
622 pop(status='COMPLETED', result='FAILURE', failure_reason='BUILD_FAILURE',
623 title='Failures:', color=Fore.RED,
624 f=lambda b: (get_name(b), b.get('url')))
625 pop(status='COMPLETED', result='CANCELED',
626 title='Canceled:', color=Fore.MAGENTA,
627 f=lambda b: (get_name(b),))
628 pop(status='COMPLETED', result='FAILURE',
629 failure_reason='INVALID_BUILD_DEFINITION',
630 title='Wrong master/builder name:', color=Fore.MAGENTA,
631 f=lambda b: (get_name(b),))
632 pop(status='COMPLETED', result='FAILURE',
633 title='Other failures:',
634 f=lambda b: (get_name(b), b.get('failure_reason'), b.get('url')))
635 pop(status='COMPLETED',
636 title='Other finished:',
637 f=lambda b: (get_name(b), b.get('result'), b.get('url')))
638 pop(status='STARTED',
639 title='Started:', color=Fore.YELLOW,
640 f=lambda b: (get_name(b), b.get('url')))
641 pop(status='SCHEDULED',
642 title='Scheduled:',
643 f=lambda b: (get_name(b), 'id=%s' % b['id']))
644 # The last section is just in case buildbucket API changes OR there is a bug.
645 pop(title='Other:',
646 f=lambda b: (get_name(b), 'id=%s' % b['id']))
647 assert len(builds) == 0
qyearsleyeab3c042016-08-24 09:18:28 -0700648 print('Total: %d try jobs' % total)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +0000649
650
qyearsley53f48a12016-09-01 10:45:13 -0700651def write_try_results_json(output_file, builds):
652 """Writes a subset of the data from fetch_try_jobs to a file as JSON.
653
654 The input |builds| dict is assumed to be generated by Buildbucket.
655 Buildbucket documentation: http://goo.gl/G0s101
656 """
657
658 def convert_build_dict(build):
659 return {
660 'buildbucket_id': build.get('id'),
661 'status': build.get('status'),
662 'result': build.get('result'),
663 'bucket': build.get('bucket'),
664 'builder_name': json.loads(
665 build.get('parameters_json', '{}')).get('builder_name'),
666 'failure_reason': build.get('failure_reason'),
667 'url': build.get('url'),
668 }
669
670 converted = []
671 for _, build in sorted(builds.items()):
672 converted.append(convert_build_dict(build))
673 write_json(output_file, converted)
674
675
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000676def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
677 """Return the corresponding git ref if |base_url| together with |glob_spec|
678 matches the full |url|.
679
680 If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
681 """
682 fetch_suburl, as_ref = glob_spec.split(':')
683 if allow_wildcards:
684 glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
685 if glob_match:
686 # Parse specs like "branches/*/src:refs/remotes/svn/*" or
687 # "branches/{472,597,648}/src:refs/remotes/svn/*".
688 branch_re = re.escape(base_url)
689 if glob_match.group(1):
690 branch_re += '/' + re.escape(glob_match.group(1))
691 wildcard = glob_match.group(2)
692 if wildcard == '*':
693 branch_re += '([^/]*)'
694 else:
695 # Escape and replace surrounding braces with parentheses and commas
696 # with pipe symbols.
697 wildcard = re.escape(wildcard)
698 wildcard = re.sub('^\\\\{', '(', wildcard)
699 wildcard = re.sub('\\\\,', '|', wildcard)
700 wildcard = re.sub('\\\\}$', ')', wildcard)
701 branch_re += wildcard
702 if glob_match.group(3):
703 branch_re += re.escape(glob_match.group(3))
704 match = re.match(branch_re, url)
705 if match:
706 return re.sub('\*$', match.group(1), as_ref)
707
708 # Parse specs like "trunk/src:refs/remotes/origin/trunk".
709 if fetch_suburl:
710 full_url = base_url + '/' + fetch_suburl
711 else:
712 full_url = base_url
713 if full_url == url:
714 return as_ref
715 return None
716
maruel@chromium.org32f9f5e2011-09-14 13:41:47 +0000717
iannucci@chromium.org79540052012-10-19 23:15:26 +0000718def print_stats(similarity, find_copies, args):
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000719 """Prints statistics about the change to the user."""
720 # --no-ext-diff is broken in some versions of Git, so try to work around
721 # this by overriding the environment (but there is still a problem if the
722 # git config key "diff.external" is used).
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000723 env = GetNoGitPagerEnv()
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000724 if 'GIT_EXTERNAL_DIFF' in env:
725 del env['GIT_EXTERNAL_DIFF']
iannucci@chromium.org79540052012-10-19 23:15:26 +0000726
727 if find_copies:
728 similarity_options = ['--find-copies-harder', '-l100000',
729 '-C%s' % similarity]
730 else:
731 similarity_options = ['-M%s' % similarity]
732
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000733 try:
734 stdout = sys.stdout.fileno()
735 except AttributeError:
736 stdout = None
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000737 return subprocess2.call(
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000738 ['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000739 'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
szager@chromium.orgd057f9a2014-05-29 21:09:36 +0000740 stdout=stdout, env=env)
maruel@chromium.org49e3d802012-07-18 23:54:45 +0000741
742
sheyang@google.com6ebaf782015-05-12 19:17:54 +0000743class BuildbucketResponseException(Exception):
744 pass
745
746
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000747class Settings(object):
748 def __init__(self):
749 self.default_server = None
750 self.cc = None
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000751 self.root = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000752 self.is_git_svn = None
753 self.svn_branch = None
754 self.tree_status_url = None
755 self.viewvc_url = None
756 self.updated = False
ukai@chromium.orge8077812012-02-03 03:41:46 +0000757 self.is_gerrit = None
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000758 self.squash_gerrit_uploads = None
tandrii@chromium.org28253532016-04-14 13:46:56 +0000759 self.gerrit_skip_ensure_authenticated = None
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000760 self.git_editor = None
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000761 self.project = None
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000762 self.force_https_commit_url = None
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000763 self.pending_ref_prefix = None
tandriif46c20f2016-09-14 06:17:05 -0700764 self.git_number_footer = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000765
766 def LazyUpdateIfNeeded(self):
767 """Updates the settings from a codereview.settings file, if available."""
768 if not self.updated:
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000769 # The only value that actually changes the behavior is
770 # autoupdate = "false". Everything else means "true".
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +0000771 autoupdate = RunGit(['config', 'rietveld.autoupdate'],
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000772 error_ok=True
773 ).strip().lower()
774
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000775 cr_settings_file = FindCodereviewSettingsFile()
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000776 if autoupdate != 'false' and cr_settings_file:
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000777 LoadCodereviewSettingsFromFile(cr_settings_file)
778 self.updated = True
779
780 def GetDefaultServerUrl(self, error_ok=False):
781 if not self.default_server:
782 self.LazyUpdateIfNeeded()
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000783 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000784 self._GetRietveldConfig('server', error_ok=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000785 if error_ok:
786 return self.default_server
787 if not self.default_server:
788 error_message = ('Could not find settings file. You must configure '
789 'your review setup by running "git cl config".')
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000790 self.default_server = gclient_utils.UpgradeToHttps(
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000791 self._GetRietveldConfig('server', error_message=error_message))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000792 return self.default_server
793
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000794 @staticmethod
795 def GetRelativeRoot():
796 return RunGit(['rev-parse', '--show-cdup']).strip()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000797
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000798 def GetRoot(self):
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000799 if self.root is None:
800 self.root = os.path.abspath(self.GetRelativeRoot())
801 return self.root
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000802
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000803 def GetGitMirror(self, remote='origin'):
804 """If this checkout is from a local git mirror, return a Mirror object."""
szager@chromium.org81593742016-03-09 20:27:58 +0000805 local_url = RunGit(['config', '--get', 'remote.%s.url' % remote]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +0000806 if not os.path.isdir(local_url):
807 return None
808 git_cache.Mirror.SetCachePath(os.path.dirname(local_url))
809 remote_url = git_cache.Mirror.CacheDirToUrl(local_url)
810 # Use the /dev/null print_func to avoid terminal spew in WaitForRealCommit.
811 mirror = git_cache.Mirror(remote_url, print_func = lambda *args: None)
812 if mirror.exists():
813 return mirror
814 return None
815
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000816 def GetIsGitSvn(self):
817 """Return true if this repo looks like it's using git-svn."""
818 if self.is_git_svn is None:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000819 if self.GetPendingRefPrefix():
820 # If PENDING_REF_PREFIX is set then it's a pure git repo no matter what.
821 self.is_git_svn = False
822 else:
823 # If you have any "svn-remote.*" config keys, we think you're using svn.
824 self.is_git_svn = RunGitWithCode(
825 ['config', '--local', '--get-regexp', r'^svn-remote\.'])[0] == 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000826 return self.is_git_svn
827
828 def GetSVNBranch(self):
829 if self.svn_branch is None:
830 if not self.GetIsGitSvn():
831 DieWithError('Repo doesn\'t appear to be a git-svn repo.')
832
833 # Try to figure out which remote branch we're based on.
834 # Strategy:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000835 # 1) iterate through our branch history and find the svn URL.
836 # 2) find the svn-remote that fetches from the URL.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000837
838 # regexp matching the git-svn line that contains the URL.
839 git_svn_re = re.compile(r'^\s*git-svn-id: (\S+)@', re.MULTILINE)
840
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000841 # We don't want to go through all of history, so read a line from the
842 # pipe at a time.
843 # The -100 is an arbitrary limit so we don't search forever.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000844 cmd = ['git', 'log', '-100', '--pretty=medium']
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000845 proc = subprocess2.Popen(cmd, stdout=subprocess2.PIPE,
846 env=GetNoGitPagerEnv())
maruel@chromium.org740f9d72011-06-10 18:33:10 +0000847 url = None
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000848 for line in proc.stdout:
849 match = git_svn_re.match(line)
850 if match:
851 url = match.group(1)
852 proc.stdout.close() # Cut pipe.
853 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000854
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000855 if url:
856 svn_remote_re = re.compile(r'^svn-remote\.([^.]+)\.url (.*)$')
857 remotes = RunGit(['config', '--get-regexp',
858 r'^svn-remote\..*\.url']).splitlines()
859 for remote in remotes:
860 match = svn_remote_re.match(remote)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000861 if match:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000862 remote = match.group(1)
863 base_url = match.group(2)
szager@chromium.org4ac25532013-12-16 22:07:02 +0000864 rewrite_root = RunGit(
865 ['config', 'svn-remote.%s.rewriteRoot' % remote],
866 error_ok=True).strip()
867 if rewrite_root:
868 base_url = rewrite_root
bauerb@chromium.orgade368c2011-03-01 08:57:50 +0000869 fetch_spec = RunGit(
bauerb@chromium.org866276c2011-03-18 20:09:31 +0000870 ['config', 'svn-remote.%s.fetch' % remote],
871 error_ok=True).strip()
872 if fetch_spec:
873 self.svn_branch = MatchSvnGlob(url, base_url, fetch_spec, False)
874 if self.svn_branch:
875 break
876 branch_spec = RunGit(
877 ['config', 'svn-remote.%s.branches' % remote],
878 error_ok=True).strip()
879 if branch_spec:
880 self.svn_branch = MatchSvnGlob(url, base_url, branch_spec, True)
881 if self.svn_branch:
882 break
883 tag_spec = RunGit(
884 ['config', 'svn-remote.%s.tags' % remote],
885 error_ok=True).strip()
886 if tag_spec:
887 self.svn_branch = MatchSvnGlob(url, base_url, tag_spec, True)
888 if self.svn_branch:
889 break
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000890
891 if not self.svn_branch:
892 DieWithError('Can\'t guess svn branch -- try specifying it on the '
893 'command line')
894
895 return self.svn_branch
896
897 def GetTreeStatusUrl(self, error_ok=False):
898 if not self.tree_status_url:
899 error_message = ('You must configure your tree status URL by running '
900 '"git cl config".')
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000901 self.tree_status_url = self._GetRietveldConfig(
902 'tree-status-url', error_ok=error_ok, error_message=error_message)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000903 return self.tree_status_url
904
905 def GetViewVCUrl(self):
906 if not self.viewvc_url:
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000907 self.viewvc_url = self._GetRietveldConfig('viewvc-url', error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +0000908 return self.viewvc_url
909
rmistry@google.com90752582014-01-14 21:04:50 +0000910 def GetBugPrefix(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000911 return self._GetRietveldConfig('bug-prefix', error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +0000912
rmistry@google.com78948ed2015-07-08 23:09:57 +0000913 def GetIsSkipDependencyUpload(self, branch_name):
914 """Returns true if specified branch should skip dep uploads."""
915 return self._GetBranchConfig(branch_name, 'skip-deps-uploads',
916 error_ok=True)
917
rmistry@google.com5626a922015-02-26 14:03:30 +0000918 def GetRunPostUploadHook(self):
919 run_post_upload_hook = self._GetRietveldConfig(
920 'run-post-upload-hook', error_ok=True)
921 return run_post_upload_hook == "True"
922
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000923 def GetDefaultCCList(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000924 return self._GetRietveldConfig('cc', error_ok=True)
bauerb@chromium.orgae6df352011-04-06 17:40:39 +0000925
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000926 def GetDefaultPrivateFlag(self):
thestig@chromium.org8b0553c2014-02-11 00:33:37 +0000927 return self._GetRietveldConfig('private', error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000928
ukai@chromium.orge8077812012-02-03 03:41:46 +0000929 def GetIsGerrit(self):
930 """Return true if this repo is assosiated with gerrit code review system."""
931 if self.is_gerrit is None:
932 self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True)
933 return self.is_gerrit
934
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000935 def GetSquashGerritUploads(self):
936 """Return true if uploads to Gerrit should be squashed by default."""
937 if self.squash_gerrit_uploads is None:
tandriia60502f2016-06-20 02:01:53 -0700938 self.squash_gerrit_uploads = self.GetSquashGerritUploadsOverride()
939 if self.squash_gerrit_uploads is None:
940 # Default is squash now (http://crbug.com/611892#c23).
941 self.squash_gerrit_uploads = not (
942 RunGit(['config', '--bool', 'gerrit.squash-uploads'],
943 error_ok=True).strip() == 'false')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000944 return self.squash_gerrit_uploads
945
tandriia60502f2016-06-20 02:01:53 -0700946 def GetSquashGerritUploadsOverride(self):
947 """Return True or False if codereview.settings should be overridden.
948
949 Returns None if no override has been defined.
950 """
951 # See also http://crbug.com/611892#c23
952 result = RunGit(['config', '--bool', 'gerrit.override-squash-uploads'],
953 error_ok=True).strip()
954 if result == 'true':
955 return True
956 if result == 'false':
957 return False
958 return None
959
tandrii@chromium.org28253532016-04-14 13:46:56 +0000960 def GetGerritSkipEnsureAuthenticated(self):
961 """Return True if EnsureAuthenticated should not be done for Gerrit
962 uploads."""
963 if self.gerrit_skip_ensure_authenticated is None:
964 self.gerrit_skip_ensure_authenticated = (
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +0000965 RunGit(['config', '--bool', 'gerrit.skip-ensure-authenticated'],
tandrii@chromium.org28253532016-04-14 13:46:56 +0000966 error_ok=True).strip() == 'true')
967 return self.gerrit_skip_ensure_authenticated
968
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000969 def GetGitEditor(self):
970 """Return the editor specified in the git config, or None if none is."""
971 if self.git_editor is None:
972 self.git_editor = self._GetConfig('core.editor', error_ok=True)
973 return self.git_editor or None
974
thestig@chromium.org44202a22014-03-11 19:22:18 +0000975 def GetLintRegex(self):
976 return (self._GetRietveldConfig('cpplint-regex', error_ok=True) or
977 DEFAULT_LINT_REGEX)
978
979 def GetLintIgnoreRegex(self):
980 return (self._GetRietveldConfig('cpplint-ignore-regex', error_ok=True) or
981 DEFAULT_LINT_IGNORE_REGEX)
982
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000983 def GetProject(self):
984 if not self.project:
985 self.project = self._GetRietveldConfig('project', error_ok=True)
986 return self.project
987
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000988 def GetForceHttpsCommitUrl(self):
989 if not self.force_https_commit_url:
990 self.force_https_commit_url = self._GetRietveldConfig(
991 'force-https-commit-url', error_ok=True)
992 return self.force_https_commit_url
993
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000994 def GetPendingRefPrefix(self):
995 if not self.pending_ref_prefix:
996 self.pending_ref_prefix = self._GetRietveldConfig(
997 'pending-ref-prefix', error_ok=True)
998 return self.pending_ref_prefix
999
tandriif46c20f2016-09-14 06:17:05 -07001000 def GetHasGitNumberFooter(self):
1001 # TODO(tandrii): this has to be removed after Rietveld is read-only.
1002 # see also bugs http://crbug.com/642493 and http://crbug.com/600469.
1003 if not self.git_number_footer:
1004 self.git_number_footer = self._GetRietveldConfig(
1005 'git-number-footer', error_ok=True)
1006 return self.git_number_footer
1007
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001008 def _GetRietveldConfig(self, param, **kwargs):
1009 return self._GetConfig('rietveld.' + param, **kwargs)
1010
rmistry@google.com78948ed2015-07-08 23:09:57 +00001011 def _GetBranchConfig(self, branch_name, param, **kwargs):
1012 return self._GetConfig('branch.' + branch_name + '.' + param, **kwargs)
1013
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001014 def _GetConfig(self, param, **kwargs):
1015 self.LazyUpdateIfNeeded()
1016 return RunGit(['config', param], **kwargs).strip()
1017
1018
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001019def ShortBranchName(branch):
1020 """Convert a name like 'refs/heads/foo' to just 'foo'."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001021 return branch.replace('refs/heads/', '', 1)
1022
1023
1024def GetCurrentBranchRef():
1025 """Returns branch ref (e.g., refs/heads/master) or None."""
1026 return RunGit(['symbolic-ref', 'HEAD'],
1027 stderr=subprocess2.VOID, error_ok=True).strip() or None
1028
1029
1030def GetCurrentBranch():
1031 """Returns current branch or None.
1032
1033 For refs/heads/* branches, returns just last part. For others, full ref.
1034 """
1035 branchref = GetCurrentBranchRef()
1036 if branchref:
1037 return ShortBranchName(branchref)
1038 return None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001039
1040
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001041class _CQState(object):
1042 """Enum for states of CL with respect to Commit Queue."""
1043 NONE = 'none'
1044 DRY_RUN = 'dry_run'
1045 COMMIT = 'commit'
1046
1047 ALL_STATES = [NONE, DRY_RUN, COMMIT]
1048
1049
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001050class _ParsedIssueNumberArgument(object):
1051 def __init__(self, issue=None, patchset=None, hostname=None):
1052 self.issue = issue
1053 self.patchset = patchset
1054 self.hostname = hostname
1055
1056 @property
1057 def valid(self):
1058 return self.issue is not None
1059
1060
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001061def ParseIssueNumberArgument(arg):
1062 """Parses the issue argument and returns _ParsedIssueNumberArgument."""
1063 fail_result = _ParsedIssueNumberArgument()
1064
1065 if arg.isdigit():
1066 return _ParsedIssueNumberArgument(issue=int(arg))
1067 if not arg.startswith('http'):
1068 return fail_result
1069 url = gclient_utils.UpgradeToHttps(arg)
1070 try:
1071 parsed_url = urlparse.urlparse(url)
1072 except ValueError:
1073 return fail_result
1074 for cls in _CODEREVIEW_IMPLEMENTATIONS.itervalues():
1075 tmp = cls.ParseIssueURL(parsed_url)
1076 if tmp is not None:
1077 return tmp
1078 return fail_result
1079
1080
tandriic2405f52016-10-10 08:13:15 -07001081class GerritIssueNotExists(Exception):
1082 def __init__(self, issue, url):
1083 self.issue = issue
1084 self.url = url
1085 super(GerritIssueNotExists, self).__init__()
1086
1087 def __str__(self):
1088 return 'issue %s at %s does not exist or you have no access to it' % (
1089 self.issue, self.url)
1090
1091
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001092class Changelist(object):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001093 """Changelist works with one changelist in local branch.
1094
1095 Supports two codereview backends: Rietveld or Gerrit, selected at object
1096 creation.
1097
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00001098 Notes:
1099 * Not safe for concurrent multi-{thread,process} use.
1100 * Caches values from current branch. Therefore, re-use after branch change
tandrii5d48c322016-08-18 16:19:37 -07001101 with great care.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001102 """
1103
1104 def __init__(self, branchref=None, issue=None, codereview=None, **kwargs):
1105 """Create a new ChangeList instance.
1106
1107 If issue is given, the codereview must be given too.
1108
1109 If `codereview` is given, it must be 'rietveld' or 'gerrit'.
1110 Otherwise, it's decided based on current configuration of the local branch,
1111 with default being 'rietveld' for backwards compatibility.
1112 See _load_codereview_impl for more details.
1113
1114 **kwargs will be passed directly to codereview implementation.
1115 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001116 # Poke settings so we get the "configure your server" message if necessary.
maruel@chromium.org379d07a2011-11-30 14:58:10 +00001117 global settings
1118 if not settings:
1119 # Happens when git_cl.py is used as a utility library.
1120 settings = Settings()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001121
1122 if issue:
1123 assert codereview, 'codereview must be known, if issue is known'
1124
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001125 self.branchref = branchref
1126 if self.branchref:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001127 assert branchref.startswith('refs/heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001128 self.branch = ShortBranchName(self.branchref)
1129 else:
1130 self.branch = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001131 self.upstream_branch = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001132 self.lookedup_issue = False
1133 self.issue = issue or None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001134 self.has_description = False
1135 self.description = None
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001136 self.lookedup_patchset = False
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001137 self.patchset = None
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001138 self.cc = None
1139 self.watchers = ()
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001140 self._remote = None
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00001141
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001142 self._codereview_impl = None
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001143 self._codereview = None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001144 self._load_codereview_impl(codereview, **kwargs)
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001145 assert self._codereview_impl
1146 assert self._codereview in _CODEREVIEW_IMPLEMENTATIONS
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001147
1148 def _load_codereview_impl(self, codereview=None, **kwargs):
1149 if codereview:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001150 assert codereview in _CODEREVIEW_IMPLEMENTATIONS
1151 cls = _CODEREVIEW_IMPLEMENTATIONS[codereview]
1152 self._codereview = codereview
1153 self._codereview_impl = cls(self, **kwargs)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001154 return
1155
1156 # Automatic selection based on issue number set for a current branch.
1157 # Rietveld takes precedence over Gerrit.
1158 assert not self.issue
1159 # Whether we find issue or not, we are doing the lookup.
1160 self.lookedup_issue = True
tandrii5d48c322016-08-18 16:19:37 -07001161 if self.GetBranch():
1162 for codereview, cls in _CODEREVIEW_IMPLEMENTATIONS.iteritems():
1163 issue = _git_get_branch_config_value(
1164 cls.IssueConfigKey(), value_type=int, branch=self.GetBranch())
1165 if issue:
1166 self._codereview = codereview
1167 self._codereview_impl = cls(self, **kwargs)
1168 self.issue = int(issue)
1169 return
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001170
1171 # No issue is set for this branch, so decide based on repo-wide settings.
1172 return self._load_codereview_impl(
1173 codereview='gerrit' if settings.GetIsGerrit() else 'rietveld',
1174 **kwargs)
1175
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00001176 def IsGerrit(self):
1177 return self._codereview == 'gerrit'
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001178
1179 def GetCCList(self):
1180 """Return the users cc'd on this CL.
1181
agable92bec4f2016-08-24 09:27:27 -07001182 Return is a string suitable for passing to git cl with the --cc flag.
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001183 """
1184 if self.cc is None:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001185 base_cc = settings.GetDefaultCCList()
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001186 more_cc = ','.join(self.watchers)
1187 self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
1188 return self.cc
1189
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +00001190 def GetCCListWithoutDefault(self):
1191 """Return the users cc'd on this CL excluding default ones."""
1192 if self.cc is None:
1193 self.cc = ','.join(self.watchers)
1194 return self.cc
1195
bauerb@chromium.orgae6df352011-04-06 17:40:39 +00001196 def SetWatchers(self, watchers):
1197 """Set the list of email addresses that should be cc'd based on the changed
1198 files in this CL.
1199 """
1200 self.watchers = watchers
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001201
1202 def GetBranch(self):
1203 """Returns the short branch name, e.g. 'master'."""
1204 if not self.branch:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001205 branchref = GetCurrentBranchRef()
szager@chromium.orgd62c61f2014-10-20 22:33:21 +00001206 if not branchref:
1207 return None
1208 self.branchref = branchref
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001209 self.branch = ShortBranchName(self.branchref)
1210 return self.branch
1211
1212 def GetBranchRef(self):
1213 """Returns the full branch name, e.g. 'refs/heads/master'."""
1214 self.GetBranch() # Poke the lazy loader.
1215 return self.branchref
1216
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00001217 def ClearBranch(self):
1218 """Clears cached branch data of this object."""
1219 self.branch = self.branchref = None
1220
tandrii5d48c322016-08-18 16:19:37 -07001221 def _GitGetBranchConfigValue(self, key, default=None, **kwargs):
1222 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1223 kwargs['branch'] = self.GetBranch()
1224 return _git_get_branch_config_value(key, default, **kwargs)
1225
1226 def _GitSetBranchConfigValue(self, key, value, **kwargs):
1227 assert 'branch' not in kwargs, 'this CL branch is used automatically'
1228 assert self.GetBranch(), (
1229 'this CL must have an associated branch to %sset %s%s' %
1230 ('un' if value is None else '',
1231 key,
1232 '' if value is None else ' to %r' % value))
1233 kwargs['branch'] = self.GetBranch()
1234 return _git_set_branch_config_value(key, value, **kwargs)
1235
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001236 @staticmethod
1237 def FetchUpstreamTuple(branch):
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001238 """Returns a tuple containing remote and remote ref,
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001239 e.g. 'origin', 'refs/heads/master'
1240 """
1241 remote = '.'
tandrii5d48c322016-08-18 16:19:37 -07001242 upstream_branch = _git_get_branch_config_value('merge', branch=branch)
1243
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001244 if upstream_branch:
tandrii5d48c322016-08-18 16:19:37 -07001245 remote = _git_get_branch_config_value('remote', branch=branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001246 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001247 upstream_branch = RunGit(['config', 'rietveld.upstream-branch'],
1248 error_ok=True).strip()
1249 if upstream_branch:
1250 remote = RunGit(['config', 'rietveld.upstream-remote']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001251 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001252 # Fall back on trying a git-svn upstream branch.
1253 if settings.GetIsGitSvn():
1254 upstream_branch = settings.GetSVNBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001255 else:
bauerb@chromium.orgade368c2011-03-01 08:57:50 +00001256 # Else, try to guess the origin remote.
1257 remote_branches = RunGit(['branch', '-r']).split()
1258 if 'origin/master' in remote_branches:
1259 # Fall back on origin/master if it exits.
1260 remote = 'origin'
1261 upstream_branch = 'refs/heads/master'
1262 elif 'origin/trunk' in remote_branches:
1263 # Fall back on origin/trunk if it exists. Generally a shared
1264 # git-svn clone
1265 remote = 'origin'
1266 upstream_branch = 'refs/heads/trunk'
1267 else:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001268 DieWithError(
1269 'Unable to determine default branch to diff against.\n'
1270 'Either pass complete "git diff"-style arguments, like\n'
1271 ' git cl upload origin/master\n'
1272 'or verify this branch is set up to track another \n'
1273 '(via the --track argument to "git checkout -b ...").')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001274
1275 return remote, upstream_branch
1276
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001277 def GetCommonAncestorWithUpstream(self):
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001278 upstream_branch = self.GetUpstreamBranch()
1279 if not BranchExists(upstream_branch):
1280 DieWithError('The upstream for the current branch (%s) does not exist '
1281 'anymore.\nPlease fix it and try again.' % self.GetBranch())
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001282 return git_common.get_or_create_merge_base(self.GetBranch(),
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +00001283 upstream_branch)
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001284
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001285 def GetUpstreamBranch(self):
1286 if self.upstream_branch is None:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001287 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001288 if remote is not '.':
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001289 upstream_branch = upstream_branch.replace('refs/heads/',
1290 'refs/remotes/%s/' % remote)
1291 upstream_branch = upstream_branch.replace('refs/branch-heads/',
1292 'refs/remotes/branch-heads/')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001293 self.upstream_branch = upstream_branch
1294 return self.upstream_branch
1295
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001296 def GetRemoteBranch(self):
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001297 if not self._remote:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001298 remote, branch = None, self.GetBranch()
1299 seen_branches = set()
1300 while branch not in seen_branches:
1301 seen_branches.add(branch)
1302 remote, branch = self.FetchUpstreamTuple(branch)
1303 branch = ShortBranchName(branch)
1304 if remote != '.' or branch.startswith('refs/remotes'):
1305 break
1306 else:
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001307 remotes = RunGit(['remote'], error_ok=True).split()
1308 if len(remotes) == 1:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001309 remote, = remotes
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001310 elif 'origin' in remotes:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001311 remote = 'origin'
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001312 logging.warning('Could not determine which remote this change is '
1313 'associated with, so defaulting to "%s". This may '
1314 'not be what you want. You may prevent this message '
1315 'by running "git svn info" as documented here: %s',
1316 self._remote,
1317 GIT_INSTRUCTIONS_URL)
1318 else:
1319 logging.warn('Could not determine which remote this change is '
1320 'associated with. You may prevent this message by '
1321 'running "git svn info" as documented here: %s',
1322 GIT_INSTRUCTIONS_URL)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001323 branch = 'HEAD'
1324 if branch.startswith('refs/remotes'):
1325 self._remote = (remote, branch)
mmoss@chromium.orge7585452014-08-24 01:41:11 +00001326 elif branch.startswith('refs/branch-heads/'):
1327 self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001328 else:
1329 self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001330 return self._remote
1331
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001332 def GitSanityChecks(self, upstream_git_obj):
1333 """Checks git repo status and ensures diff is from local commits."""
1334
sbc@chromium.org79706062015-01-14 21:18:12 +00001335 if upstream_git_obj is None:
1336 if self.GetBranch() is None:
vapiera7fbd5a2016-06-16 09:17:49 -07001337 print('ERROR: unable to determine current branch (detached HEAD?)',
1338 file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001339 else:
vapiera7fbd5a2016-06-16 09:17:49 -07001340 print('ERROR: no upstream branch', file=sys.stderr)
sbc@chromium.org79706062015-01-14 21:18:12 +00001341 return False
1342
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001343 # Verify the commit we're diffing against is in our current branch.
1344 upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
1345 common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
1346 if upstream_sha != common_ancestor:
vapiera7fbd5a2016-06-16 09:17:49 -07001347 print('ERROR: %s is not in the current branch. You may need to rebase '
1348 'your tracking branch' % upstream_sha, file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001349 return False
1350
1351 # List the commits inside the diff, and verify they are all local.
1352 commits_in_diff = RunGit(
1353 ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
1354 code, remote_branch = RunGitWithCode(['config', 'gitcl.remotebranch'])
1355 remote_branch = remote_branch.strip()
1356 if code != 0:
1357 _, remote_branch = self.GetRemoteBranch()
1358
1359 commits_in_remote = RunGit(
1360 ['rev-list', '^%s' % upstream_sha, remote_branch]).splitlines()
1361
1362 common_commits = set(commits_in_diff) & set(commits_in_remote)
1363 if common_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07001364 print('ERROR: Your diff contains %d commits already in %s.\n'
1365 'Run "git log --oneline %s..HEAD" to get a list of commits in '
1366 'the diff. If you are using a custom git flow, you can override'
1367 ' the reference used for this check with "git config '
1368 'gitcl.remotebranch <git-ref>".' % (
1369 len(common_commits), remote_branch, upstream_git_obj),
1370 file=sys.stderr)
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001371 return False
1372 return True
1373
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001374 def GetGitBaseUrlFromConfig(self):
sheyang@chromium.orga656e702014-05-15 20:43:05 +00001375 """Return the configured base URL from branch.<branchname>.baseurl.
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00001376
1377 Returns None if it is not set.
1378 """
tandrii5d48c322016-08-18 16:19:37 -07001379 return self._GitGetBranchConfigValue('base-url')
jmbaker@chromium.orga2cbbbb2012-03-22 20:40:40 +00001380
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00001381 def GetGitSvnRemoteUrl(self):
1382 """Return the configured git-svn remote URL parsed from git svn info.
1383
1384 Returns None if it is not set.
1385 """
1386 # URL is dependent on the current directory.
1387 data = RunGit(['svn', 'info'], cwd=settings.GetRoot())
1388 if data:
1389 keys = dict(line.split(': ', 1) for line in data.splitlines()
1390 if ': ' in line)
1391 return keys.get('URL', None)
1392 return None
1393
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001394 def GetRemoteUrl(self):
1395 """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
1396
1397 Returns None if there is no remote.
1398 """
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001399 remote, _ = self.GetRemoteBranch()
dyen@chromium.org2a13d4f2014-06-13 00:06:37 +00001400 url = RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
1401
1402 # If URL is pointing to a local directory, it is probably a git cache.
1403 if os.path.isdir(url):
1404 url = RunGit(['config', 'remote.%s.url' % remote],
1405 error_ok=True,
1406 cwd=url).strip()
1407 return url
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001408
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001409 def GetIssue(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001410 """Returns the issue number as a int or None if not set."""
tandrii@chromium.org87985d22016-03-24 17:33:33 +00001411 if self.issue is None and not self.lookedup_issue:
tandrii5d48c322016-08-18 16:19:37 -07001412 self.issue = self._GitGetBranchConfigValue(
1413 self._codereview_impl.IssueConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001414 self.lookedup_issue = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001415 return self.issue
1416
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001417 def GetIssueURL(self):
1418 """Get the URL for a particular issue."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001419 issue = self.GetIssue()
1420 if not issue:
dbeam@chromium.org015fd3d2013-06-18 19:02:50 +00001421 return None
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001422 return '%s/%s' % (self._codereview_impl.GetCodereviewServer(), issue)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001423
1424 def GetDescription(self, pretty=False):
1425 if not self.has_description:
1426 if self.GetIssue():
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001427 self.description = self._codereview_impl.FetchDescription()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001428 self.has_description = True
1429 if pretty:
1430 wrapper = textwrap.TextWrapper()
1431 wrapper.initial_indent = wrapper.subsequent_indent = ' '
1432 return wrapper.fill(self.description)
1433 return self.description
1434
1435 def GetPatchset(self):
maruel@chromium.org52424302012-08-29 15:14:30 +00001436 """Returns the patchset number as a int or None if not set."""
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001437 if self.patchset is None and not self.lookedup_patchset:
tandrii5d48c322016-08-18 16:19:37 -07001438 self.patchset = self._GitGetBranchConfigValue(
1439 self._codereview_impl.PatchsetConfigKey(), value_type=int)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001440 self.lookedup_patchset = True
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001441 return self.patchset
1442
1443 def SetPatchset(self, patchset):
tandrii5d48c322016-08-18 16:19:37 -07001444 """Set this branch's patchset. If patchset=0, clears the patchset."""
1445 assert self.GetBranch()
1446 if not patchset:
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001447 self.patchset = None
tandrii5d48c322016-08-18 16:19:37 -07001448 else:
1449 self.patchset = int(patchset)
1450 self._GitSetBranchConfigValue(
1451 self._codereview_impl.PatchsetConfigKey(), self.patchset)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001452
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001453 def SetIssue(self, issue=None):
tandrii5d48c322016-08-18 16:19:37 -07001454 """Set this branch's issue. If issue isn't given, clears the issue."""
1455 assert self.GetBranch()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001456 if issue:
tandrii5d48c322016-08-18 16:19:37 -07001457 issue = int(issue)
1458 self._GitSetBranchConfigValue(
1459 self._codereview_impl.IssueConfigKey(), issue)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001460 self.issue = issue
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001461 codereview_server = self._codereview_impl.GetCodereviewServer()
1462 if codereview_server:
tandrii5d48c322016-08-18 16:19:37 -07001463 self._GitSetBranchConfigValue(
1464 self._codereview_impl.CodereviewServerConfigKey(),
1465 codereview_server)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001466 else:
tandrii5d48c322016-08-18 16:19:37 -07001467 # Reset all of these just to be clean.
1468 reset_suffixes = [
1469 'last-upload-hash',
1470 self._codereview_impl.IssueConfigKey(),
1471 self._codereview_impl.PatchsetConfigKey(),
1472 self._codereview_impl.CodereviewServerConfigKey(),
1473 ] + self._PostUnsetIssueProperties()
1474 for prop in reset_suffixes:
1475 self._GitSetBranchConfigValue(prop, None, error_ok=True)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00001476 self.issue = None
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001477 self.patchset = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00001478
dnjba1b0f32016-09-02 12:37:42 -07001479 def GetChange(self, upstream_branch, author, local_description=False):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001480 if not self.GitSanityChecks(upstream_branch):
1481 DieWithError('\nGit sanity check failure')
1482
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001483 root = settings.GetRelativeRoot()
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001484 if not root:
1485 root = '.'
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001486 absroot = os.path.abspath(root)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001487
1488 # We use the sha1 of HEAD as a name of this change.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001489 name = RunGitWithCode(['rev-parse', 'HEAD'])[1].strip()
bauerb@chromium.org512f1ef2011-04-20 15:17:57 +00001490 # Need to pass a relative path for msysgit.
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001491 try:
maruel@chromium.org80a9ef12011-12-13 20:44:10 +00001492 files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001493 except subprocess2.CalledProcessError:
1494 DieWithError(
pgervais@chromium.orgd6617f32013-11-19 00:34:54 +00001495 ('\nFailed to diff against upstream branch %s\n\n'
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001496 'This branch probably doesn\'t exist anymore. To reset the\n'
1497 'tracking branch, please run\n'
stip7a3dd352016-09-22 17:32:28 -07001498 ' git branch --set-upstream-to origin/master %s\n'
1499 'or replace origin/master with the relevant branch') %
maruel@chromium.org2b38e9c2011-10-19 00:04:35 +00001500 (upstream_branch, self.GetBranch()))
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001501
maruel@chromium.org52424302012-08-29 15:14:30 +00001502 issue = self.GetIssue()
1503 patchset = self.GetPatchset()
dnjba1b0f32016-09-02 12:37:42 -07001504 if issue and not local_description:
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001505 description = self.GetDescription()
1506 else:
1507 # If the change was never uploaded, use the log messages of all commits
1508 # up to the branch point, as git cl upload will prefill the description
1509 # with these log messages.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00001510 args = ['log', '--pretty=format:%s%n%n%b', '%s...' % (upstream_branch)]
1511 description = RunGitWithCode(args)[1].strip()
maruel@chromium.org03b3bdc2011-06-14 13:04:12 +00001512
1513 if not author:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00001514 author = RunGit(['config', 'user.email']).strip() or None
asvitkine@chromium.org15169952011-09-27 14:30:53 +00001515 return presubmit_support.GitChange(
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001516 name,
1517 description,
1518 absroot,
1519 files,
1520 issue,
1521 patchset,
agable@chromium.orgea84ef12014-04-30 19:55:12 +00001522 author,
1523 upstream=upstream_branch)
bauerb@chromium.org6fb99c62011-04-18 15:57:28 +00001524
dsansomee2d6fd92016-09-08 00:10:47 -07001525 def UpdateDescription(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001526 self.description = description
dsansomee2d6fd92016-09-08 00:10:47 -07001527 return self._codereview_impl.UpdateDescriptionRemote(
1528 description, force=force)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001529
1530 def RunHook(self, committing, may_prompt, verbose, change):
1531 """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
1532 try:
1533 return presubmit_support.DoPresubmitChecks(change, committing,
1534 verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
1535 default_presubmit=None, may_prompt=may_prompt,
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001536 rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit(),
1537 gerrit_obj=self._codereview_impl.GetGerritObjForPresubmit())
vapierfd77ac72016-06-16 08:33:57 -07001538 except presubmit_support.PresubmitFailure as e:
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001539 DieWithError(
1540 ('%s\nMaybe your depot_tools is out of date?\n'
1541 'If all fails, contact maruel@') % e)
1542
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001543 def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
1544 """Fetches and applies the issue patch from codereview to local branch."""
tandrii@chromium.orgef7c68c2016-04-07 09:39:39 +00001545 if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
1546 parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001547 else:
1548 # Assume url.
1549 parsed_issue_arg = self._codereview_impl.ParseIssueURL(
1550 urlparse.urlparse(issue_arg))
1551 if not parsed_issue_arg or not parsed_issue_arg.valid:
1552 DieWithError('Failed to parse issue argument "%s". '
1553 'Must be an issue number or a valid URL.' % issue_arg)
1554 return self._codereview_impl.CMDPatchWithParsedIssue(
1555 parsed_issue_arg, reject, nocommit, directory)
1556
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001557 def CMDUpload(self, options, git_diff_args, orig_args):
1558 """Uploads a change to codereview."""
1559 if git_diff_args:
1560 # TODO(ukai): is it ok for gerrit case?
1561 base_branch = git_diff_args[0]
1562 else:
1563 if self.GetBranch() is None:
1564 DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')
1565
1566 # Default to diffing against common ancestor of upstream branch
1567 base_branch = self.GetCommonAncestorWithUpstream()
1568 git_diff_args = [base_branch, 'HEAD']
1569
1570 # Make sure authenticated to codereview before running potentially expensive
1571 # hooks. It is a fast, best efforts check. Codereview still can reject the
1572 # authentication during the actual upload.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001573 self._codereview_impl.EnsureAuthenticated(force=options.force)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001574
1575 # Apply watchlists on upload.
1576 change = self.GetChange(base_branch, None)
1577 watchlist = watchlists.Watchlists(change.RepositoryRoot())
1578 files = [f.LocalPath() for f in change.AffectedFiles()]
1579 if not options.bypass_watchlists:
1580 self.SetWatchers(watchlist.GetWatchersForPaths(files))
1581
1582 if not options.bypass_hooks:
1583 if options.reviewers or options.tbr_owners:
1584 # Set the reviewer list now so that presubmit checks can access it.
1585 change_description = ChangeDescription(change.FullDescriptionText())
1586 change_description.update_reviewers(options.reviewers,
1587 options.tbr_owners,
1588 change)
1589 change.SetDescriptionText(change_description.description)
1590 hook_results = self.RunHook(committing=False,
1591 may_prompt=not options.force,
1592 verbose=options.verbose,
1593 change=change)
1594 if not hook_results.should_continue():
1595 return 1
1596 if not options.reviewers and hook_results.reviewers:
1597 options.reviewers = hook_results.reviewers.split(',')
1598
1599 if self.GetIssue():
1600 latest_patchset = self.GetMostRecentPatchset()
1601 local_patchset = self.GetPatchset()
1602 if (latest_patchset and local_patchset and
1603 local_patchset != latest_patchset):
vapiera7fbd5a2016-06-16 09:17:49 -07001604 print('The last upload made from this repository was patchset #%d but '
1605 'the most recent patchset on the server is #%d.'
1606 % (local_patchset, latest_patchset))
1607 print('Uploading will still work, but if you\'ve uploaded to this '
1608 'issue from another machine or branch the patch you\'re '
1609 'uploading now might not include those changes.')
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001610 ask_for_data('About to upload; enter to confirm.')
1611
1612 print_stats(options.similarity, options.find_copies, git_diff_args)
1613 ret = self.CMDUploadChange(options, git_diff_args, change)
1614 if not ret:
tandrii4d0545a2016-07-06 03:56:49 -07001615 if options.use_commit_queue:
1616 self.SetCQState(_CQState.COMMIT)
1617 elif options.cq_dry_run:
1618 self.SetCQState(_CQState.DRY_RUN)
1619
tandrii5d48c322016-08-18 16:19:37 -07001620 _git_set_branch_config_value('last-upload-hash',
1621 RunGit(['rev-parse', 'HEAD']).strip())
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001622 # Run post upload hooks, if specified.
1623 if settings.GetRunPostUploadHook():
1624 presubmit_support.DoPostUploadExecuter(
1625 change,
1626 self,
1627 settings.GetRoot(),
1628 options.verbose,
1629 sys.stdout)
1630
1631 # Upload all dependencies if specified.
1632 if options.dependencies:
vapiera7fbd5a2016-06-16 09:17:49 -07001633 print()
1634 print('--dependencies has been specified.')
1635 print('All dependent local branches will be re-uploaded.')
1636 print()
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001637 # Remove the dependencies flag from args so that we do not end up in a
1638 # loop.
1639 orig_args.remove('--dependencies')
1640 ret = upload_branch_deps(self, orig_args)
1641 return ret
1642
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001643 def SetCQState(self, new_state):
1644 """Update the CQ state for latest patchset.
1645
1646 Issue must have been already uploaded and known.
1647 """
1648 assert new_state in _CQState.ALL_STATES
1649 assert self.GetIssue()
1650 return self._codereview_impl.SetCQState(new_state)
1651
qyearsley1fdfcb62016-10-24 13:22:03 -07001652 def TriggerDryRun(self):
1653 """Triggers a dry run and prints a warning on failure."""
1654 # TODO(qyearsley): Either re-use this method in CMDset_commit
1655 # and CMDupload, or change CMDtry to trigger dry runs with
1656 # just SetCQState, and catch keyboard interrupt and other
1657 # errors in that method.
1658 try:
1659 self.SetCQState(_CQState.DRY_RUN)
1660 print('scheduled CQ Dry Run on %s' % self.GetIssueURL())
1661 return 0
1662 except KeyboardInterrupt:
1663 raise
1664 except:
1665 print('WARNING: failed to trigger CQ Dry Run.\n'
1666 'Either:\n'
1667 ' * your project has no CQ\n'
1668 ' * you don\'t have permission to trigger Dry Run\n'
1669 ' * bug in this code (see stack trace below).\n'
1670 'Consider specifying which bots to trigger manually '
1671 'or asking your project owners for permissions '
1672 'or contacting Chrome Infrastructure team at '
1673 'https://www.chromium.org/infra\n\n')
1674 # Still raise exception so that stack trace is printed.
1675 raise
1676
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001677 # Forward methods to codereview specific implementation.
1678
1679 def CloseIssue(self):
1680 return self._codereview_impl.CloseIssue()
1681
1682 def GetStatus(self):
1683 return self._codereview_impl.GetStatus()
1684
1685 def GetCodereviewServer(self):
1686 return self._codereview_impl.GetCodereviewServer()
1687
tandriide281ae2016-10-12 06:02:30 -07001688 def GetIssueOwner(self):
1689 """Get owner from codereview, which may differ from this checkout."""
1690 return self._codereview_impl.GetIssueOwner()
1691
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001692 def GetApprovingReviewers(self):
1693 return self._codereview_impl.GetApprovingReviewers()
1694
1695 def GetMostRecentPatchset(self):
1696 return self._codereview_impl.GetMostRecentPatchset()
1697
tandriide281ae2016-10-12 06:02:30 -07001698 def CannotTriggerTryJobReason(self):
1699 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1700 return self._codereview_impl.CannotTriggerTryJobReason()
1701
tandrii8c5a3532016-11-04 07:52:02 -07001702 def GetTryjobProperties(self, patchset=None):
1703 """Returns dictionary of properties to launch tryjob."""
1704 return self._codereview_impl.GetTryjobProperties(patchset=patchset)
1705
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001706 def __getattr__(self, attr):
1707 # This is because lots of untested code accesses Rietveld-specific stuff
1708 # directly, and it's hard to fix for sure. So, just let it work, and fix
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00001709 # on a case by case basis.
tandrii4d895502016-08-18 08:26:19 -07001710 # Note that child method defines __getattr__ as well, and forwards it here,
1711 # because _RietveldChangelistImpl is not cleaned up yet, and given
1712 # deprecation of Rietveld, it should probably be just removed.
1713 # Until that time, avoid infinite recursion by bypassing __getattr__
1714 # of implementation class.
1715 return self._codereview_impl.__getattribute__(attr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001716
1717
1718class _ChangelistCodereviewBase(object):
1719 """Abstract base class encapsulating codereview specifics of a changelist."""
1720 def __init__(self, changelist):
1721 self._changelist = changelist # instance of Changelist
1722
1723 def __getattr__(self, attr):
1724 # Forward methods to changelist.
1725 # TODO(tandrii): maybe clean up _GerritChangelistImpl and
1726 # _RietveldChangelistImpl to avoid this hack?
1727 return getattr(self._changelist, attr)
1728
1729 def GetStatus(self):
1730 """Apply a rough heuristic to give a simple summary of an issue's review
1731 or CQ status, assuming adherence to a common workflow.
1732
1733 Returns None if no issue for this branch, or specific string keywords.
1734 """
1735 raise NotImplementedError()
1736
1737 def GetCodereviewServer(self):
1738 """Returns server URL without end slash, like "https://codereview.com"."""
1739 raise NotImplementedError()
1740
1741 def FetchDescription(self):
1742 """Fetches and returns description from the codereview server."""
1743 raise NotImplementedError()
1744
tandrii5d48c322016-08-18 16:19:37 -07001745 @classmethod
1746 def IssueConfigKey(cls):
1747 """Returns branch setting storing issue number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001748 raise NotImplementedError()
1749
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001750 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07001751 def PatchsetConfigKey(cls):
1752 """Returns branch setting storing patchset number."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001753 raise NotImplementedError()
1754
tandrii5d48c322016-08-18 16:19:37 -07001755 @classmethod
1756 def CodereviewServerConfigKey(cls):
1757 """Returns branch setting storing codereview server."""
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001758 raise NotImplementedError()
1759
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001760 def _PostUnsetIssueProperties(self):
1761 """Which branch-specific properties to erase when unsettin issue."""
tandrii5d48c322016-08-18 16:19:37 -07001762 return []
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00001763
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001764 def GetRieveldObjForPresubmit(self):
1765 # This is an unfortunate Rietveld-embeddedness in presubmit.
1766 # For non-Rietveld codereviews, this probably should return a dummy object.
1767 raise NotImplementedError()
1768
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00001769 def GetGerritObjForPresubmit(self):
1770 # None is valid return value, otherwise presubmit_support.GerritAccessor.
1771 return None
1772
dsansomee2d6fd92016-09-08 00:10:47 -07001773 def UpdateDescriptionRemote(self, description, force=False):
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001774 """Update the description on codereview site."""
1775 raise NotImplementedError()
1776
1777 def CloseIssue(self):
1778 """Closes the issue."""
1779 raise NotImplementedError()
1780
1781 def GetApprovingReviewers(self):
1782 """Returns a list of reviewers approving the change.
1783
1784 Note: not necessarily committers.
1785 """
1786 raise NotImplementedError()
1787
1788 def GetMostRecentPatchset(self):
1789 """Returns the most recent patchset number from the codereview site."""
1790 raise NotImplementedError()
1791
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001792 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
1793 directory):
1794 """Fetches and applies the issue.
1795
1796 Arguments:
1797 parsed_issue_arg: instance of _ParsedIssueNumberArgument.
1798 reject: if True, reject the failed patch instead of switching to 3-way
1799 merge. Rietveld only.
1800 nocommit: do not commit the patch, thus leave the tree dirty. Rietveld
1801 only.
1802 directory: switch to directory before applying the patch. Rietveld only.
1803 """
1804 raise NotImplementedError()
1805
1806 @staticmethod
1807 def ParseIssueURL(parsed_url):
1808 """Parses url and returns instance of _ParsedIssueNumberArgument or None if
1809 failed."""
1810 raise NotImplementedError()
1811
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001812 def EnsureAuthenticated(self, force):
1813 """Best effort check that user is authenticated with codereview server.
1814
1815 Arguments:
1816 force: whether to skip confirmation questions.
1817 """
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001818 raise NotImplementedError()
1819
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00001820 def CMDUploadChange(self, options, args, change):
1821 """Uploads a change to codereview."""
1822 raise NotImplementedError()
1823
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001824 def SetCQState(self, new_state):
1825 """Update the CQ state for latest patchset.
1826
1827 Issue must have been already uploaded and known.
1828 """
1829 raise NotImplementedError()
1830
tandriie113dfd2016-10-11 10:20:12 -07001831 def CannotTriggerTryJobReason(self):
1832 """Returns reason (str) if unable trigger tryjobs on this CL or None."""
1833 raise NotImplementedError()
1834
tandriide281ae2016-10-12 06:02:30 -07001835 def GetIssueOwner(self):
1836 raise NotImplementedError()
1837
tandrii8c5a3532016-11-04 07:52:02 -07001838 def GetTryjobProperties(self, patchset=None):
tandriide281ae2016-10-12 06:02:30 -07001839 raise NotImplementedError()
1840
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001841
1842class _RietveldChangelistImpl(_ChangelistCodereviewBase):
1843 def __init__(self, changelist, auth_config=None, rietveld_server=None):
1844 super(_RietveldChangelistImpl, self).__init__(changelist)
1845 assert settings, 'must be initialized in _ChangelistCodereviewBase'
martiniss6eda05f2016-06-30 10:18:35 -07001846 if not rietveld_server:
1847 settings.GetDefaultServerUrl()
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001848
1849 self._rietveld_server = rietveld_server
1850 self._auth_config = auth_config
1851 self._props = None
1852 self._rpc_server = None
1853
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001854 def GetCodereviewServer(self):
1855 if not self._rietveld_server:
1856 # If we're on a branch then get the server potentially associated
1857 # with that branch.
1858 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07001859 self._rietveld_server = gclient_utils.UpgradeToHttps(
1860 self._GitGetBranchConfigValue(self.CodereviewServerConfigKey()))
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001861 if not self._rietveld_server:
1862 self._rietveld_server = settings.GetDefaultServerUrl()
1863 return self._rietveld_server
1864
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001865 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00001866 """Best effort check that user is authenticated with Rietveld server."""
1867 if self._auth_config.use_oauth2:
1868 authenticator = auth.get_authenticator_for_host(
1869 self.GetCodereviewServer(), self._auth_config)
1870 if not authenticator.has_cached_credentials():
1871 raise auth.LoginRequiredError(self.GetCodereviewServer())
1872
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001873 def FetchDescription(self):
1874 issue = self.GetIssue()
1875 assert issue
1876 try:
1877 return self.RpcServer().get_description(issue).strip()
1878 except urllib2.HTTPError as e:
1879 if e.code == 404:
1880 DieWithError(
1881 ('\nWhile fetching the description for issue %d, received a '
1882 '404 (not found)\n'
1883 'error. It is likely that you deleted this '
1884 'issue on the server. If this is the\n'
1885 'case, please run\n\n'
1886 ' git cl issue 0\n\n'
1887 'to clear the association with the deleted issue. Then run '
1888 'this command again.') % issue)
1889 else:
1890 DieWithError(
1891 '\nFailed to fetch issue description. HTTP error %d' % e.code)
1892 except urllib2.URLError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07001893 print('Warning: Failed to retrieve CL description due to network '
1894 'failure.', file=sys.stderr)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001895 return ''
1896
1897 def GetMostRecentPatchset(self):
1898 return self.GetIssueProperties()['patchsets'][-1]
1899
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001900 def GetIssueProperties(self):
1901 if self._props is None:
1902 issue = self.GetIssue()
1903 if not issue:
1904 self._props = {}
1905 else:
1906 self._props = self.RpcServer().get_issue_properties(issue, True)
1907 return self._props
1908
tandriie113dfd2016-10-11 10:20:12 -07001909 def CannotTriggerTryJobReason(self):
1910 props = self.GetIssueProperties()
1911 if not props:
1912 return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
1913 if props.get('closed'):
1914 return 'CL %s is closed' % self.GetIssue()
1915 if props.get('private'):
1916 return 'CL %s is private' % self.GetIssue()
1917 return None
1918
tandrii8c5a3532016-11-04 07:52:02 -07001919 def GetTryjobProperties(self, patchset=None):
1920 """Returns dictionary of properties to launch tryjob."""
1921 project = (self.GetIssueProperties() or {}).get('project')
1922 return {
1923 'issue': self.GetIssue(),
1924 'patch_project': project,
1925 'patch_storage': 'rietveld',
1926 'patchset': patchset or self.GetPatchset(),
1927 'rietveld': self.GetCodereviewServer(),
1928 }
1929
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001930 def GetApprovingReviewers(self):
1931 return get_approving_reviewers(self.GetIssueProperties())
1932
tandriide281ae2016-10-12 06:02:30 -07001933 def GetIssueOwner(self):
1934 return (self.GetIssueProperties() or {}).get('owner_email')
1935
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001936 def AddComment(self, message):
1937 return self.RpcServer().add_comment(self.GetIssue(), message)
1938
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001939 def GetStatus(self):
1940 """Apply a rough heuristic to give a simple summary of an issue's review
1941 or CQ status, assuming adherence to a common workflow.
1942
1943 Returns None if no issue for this branch, or one of the following keywords:
1944 * 'error' - error from review tool (including deleted issues)
1945 * 'unsent' - not sent for review
1946 * 'waiting' - waiting for review
1947 * 'reply' - waiting for owner to reply to review
1948 * 'lgtm' - LGTM from at least one approved reviewer
1949 * 'commit' - in the commit queue
1950 * 'closed' - closed
1951 """
1952 if not self.GetIssue():
1953 return None
1954
1955 try:
1956 props = self.GetIssueProperties()
1957 except urllib2.HTTPError:
1958 return 'error'
1959
1960 if props.get('closed'):
1961 # Issue is closed.
1962 return 'closed'
tandrii@chromium.orgb4f6a222016-03-03 01:11:04 +00001963 if props.get('commit') and not props.get('cq_dry_run', False):
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001964 # Issue is in the commit queue.
1965 return 'commit'
1966
1967 try:
1968 reviewers = self.GetApprovingReviewers()
1969 except urllib2.HTTPError:
1970 return 'error'
1971
1972 if reviewers:
1973 # Was LGTM'ed.
1974 return 'lgtm'
1975
1976 messages = props.get('messages') or []
1977
tandrii9d2c7a32016-06-22 03:42:45 -07001978 # Skip CQ messages that don't require owner's action.
1979 while messages and messages[-1]['sender'] == COMMIT_BOT_EMAIL:
1980 if 'Dry run:' in messages[-1]['text']:
1981 messages.pop()
1982 elif 'The CQ bit was unchecked' in messages[-1]['text']:
1983 # This message always follows prior messages from CQ,
1984 # so skip this too.
1985 messages.pop()
1986 else:
1987 # This is probably a CQ messages warranting user attention.
1988 break
1989
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001990 if not messages:
1991 # No message was sent.
1992 return 'unsent'
1993 if messages[-1]['sender'] != props.get('owner_email'):
tandrii9d2c7a32016-06-22 03:42:45 -07001994 # Non-LGTM reply from non-owner and not CQ bot.
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00001995 return 'reply'
1996 return 'waiting'
1997
dsansomee2d6fd92016-09-08 00:10:47 -07001998 def UpdateDescriptionRemote(self, description, force=False):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00001999 return self.RpcServer().update_description(
2000 self.GetIssue(), self.description)
2001
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002002 def CloseIssue(self):
maruel@chromium.orgb021b322013-04-08 17:57:29 +00002003 return self.RpcServer().close_issue(self.GetIssue())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002004
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002005 def SetFlag(self, flag, value):
tandrii4b233bd2016-07-06 03:50:29 -07002006 return self.SetFlags({flag: value})
2007
2008 def SetFlags(self, flags):
2009 """Sets flags on this CL/patchset in Rietveld.
tandrii4b233bd2016-07-06 03:50:29 -07002010 """
phajdan.jr68598232016-08-10 03:28:28 -07002011 patchset = self.GetPatchset() or self.GetMostRecentPatchset()
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002012 try:
tandrii4b233bd2016-07-06 03:50:29 -07002013 return self.RpcServer().set_flags(
phajdan.jr68598232016-08-10 03:28:28 -07002014 self.GetIssue(), patchset, flags)
vapierfd77ac72016-06-16 08:33:57 -07002015 except urllib2.HTTPError as e:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002016 if e.code == 404:
2017 DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
2018 if e.code == 403:
2019 DieWithError(
2020 ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
phajdan.jr68598232016-08-10 03:28:28 -07002021 'match?') % (self.GetIssue(), patchset))
maruel@chromium.org27bb3872011-05-30 20:33:19 +00002022 raise
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002023
maruel@chromium.orgcab38e92011-04-09 00:30:51 +00002024 def RpcServer(self):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002025 """Returns an upload.RpcServer() to access this review's rietveld instance.
2026 """
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002027 if not self._rpc_server:
maruel@chromium.org4bac4b52012-11-27 20:33:52 +00002028 self._rpc_server = rietveld.CachingRietveld(
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002029 self.GetCodereviewServer(),
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00002030 self._auth_config or auth.make_auth_config())
maruel@chromium.orge77ebbf2011-03-29 20:35:38 +00002031 return self._rpc_server
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002032
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002033 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002034 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002035 return 'rietveldissue'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002036
tandrii5d48c322016-08-18 16:19:37 -07002037 @classmethod
2038 def PatchsetConfigKey(cls):
2039 return 'rietveldpatchset'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002040
tandrii5d48c322016-08-18 16:19:37 -07002041 @classmethod
2042 def CodereviewServerConfigKey(cls):
2043 return 'rietveldserver'
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002044
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002045 def GetRieveldObjForPresubmit(self):
2046 return self.RpcServer()
2047
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002048 def SetCQState(self, new_state):
2049 props = self.GetIssueProperties()
2050 if props.get('private'):
2051 DieWithError('Cannot set-commit on private issue')
2052
2053 if new_state == _CQState.COMMIT:
tandrii4d843592016-07-27 08:22:56 -07002054 self.SetFlags({'commit': '1', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002055 elif new_state == _CQState.NONE:
tandrii4b233bd2016-07-06 03:50:29 -07002056 self.SetFlags({'commit': '0', 'cq_dry_run': '0'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002057 else:
tandrii4b233bd2016-07-06 03:50:29 -07002058 assert new_state == _CQState.DRY_RUN
2059 self.SetFlags({'commit': '1', 'cq_dry_run': '1'})
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002060
2061
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2063 directory):
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002064 # PatchIssue should never be called with a dirty tree. It is up to the
2065 # caller to check this, but just in case we assert here since the
2066 # consequences of the caller not checking this could be dire.
2067 assert(not git_common.is_dirty_git_tree('apply'))
2068 assert(parsed_issue_arg.valid)
2069 self._changelist.issue = parsed_issue_arg.issue
2070 if parsed_issue_arg.hostname:
2071 self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
2072
skobes6468b902016-10-24 08:45:10 -07002073 patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
2074 patchset_object = self.RpcServer().get_patch(self.GetIssue(), patchset)
2075 scm_obj = checkout.GitCheckout(settings.GetRoot(), None, None, None, None)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002076 try:
skobes6468b902016-10-24 08:45:10 -07002077 scm_obj.apply_patch(patchset_object)
2078 except Exception as e:
2079 print(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002080 return 1
2081
2082 # If we had an issue, commit the current state and register the issue.
2083 if not nocommit:
2084 RunGit(['commit', '-m', (self.GetDescription() + '\n\n' +
2085 'patch from issue %(i)s at patchset '
2086 '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
2087 % {'i': self.GetIssue(), 'p': patchset})])
2088 self.SetIssue(self.GetIssue())
2089 self.SetPatchset(patchset)
vapiera7fbd5a2016-06-16 09:17:49 -07002090 print('Committed patch locally.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002091 else:
vapiera7fbd5a2016-06-16 09:17:49 -07002092 print('Patch applied to index.')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002093 return 0
2094
2095 @staticmethod
2096 def ParseIssueURL(parsed_url):
2097 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2098 return None
wychen3c1c1722016-08-04 11:46:36 -07002099 # Rietveld patch: https://domain/<number>/#ps<patchset>
2100 match = re.match(r'/(\d+)/$', parsed_url.path)
2101 match2 = re.match(r'ps(\d+)$', parsed_url.fragment)
2102 if match and match2:
skobes6468b902016-10-24 08:45:10 -07002103 return _ParsedIssueNumberArgument(
wychen3c1c1722016-08-04 11:46:36 -07002104 issue=int(match.group(1)),
2105 patchset=int(match2.group(1)),
2106 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002107 # Typical url: https://domain/<issue_number>[/[other]]
2108 match = re.match('/(\d+)(/.*)?$', parsed_url.path)
2109 if match:
skobes6468b902016-10-24 08:45:10 -07002110 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002111 issue=int(match.group(1)),
2112 hostname=parsed_url.netloc)
2113 # Rietveld patch: https://domain/download/issue<number>_<patchset>.diff
2114 match = re.match(r'/download/issue(\d+)_(\d+).diff$', parsed_url.path)
2115 if match:
skobes6468b902016-10-24 08:45:10 -07002116 return _ParsedIssueNumberArgument(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002117 issue=int(match.group(1)),
2118 patchset=int(match.group(2)),
skobes6468b902016-10-24 08:45:10 -07002119 hostname=parsed_url.netloc)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002120 return None
2121
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002122 def CMDUploadChange(self, options, args, change):
2123 """Upload the patch to Rietveld."""
2124 upload_args = ['--assume_yes'] # Don't ask about untracked files.
2125 upload_args.extend(['--server', self.GetCodereviewServer()])
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002126 upload_args.extend(auth.auth_config_to_command_options(self._auth_config))
2127 if options.emulate_svn_auto_props:
2128 upload_args.append('--emulate_svn_auto_props')
2129
2130 change_desc = None
2131
2132 if options.email is not None:
2133 upload_args.extend(['--email', options.email])
2134
2135 if self.GetIssue():
nodirca166002016-06-27 10:59:51 -07002136 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002137 upload_args.extend(['--title', options.title])
2138 if options.message:
2139 upload_args.extend(['--message', options.message])
2140 upload_args.extend(['--issue', str(self.GetIssue())])
vapiera7fbd5a2016-06-16 09:17:49 -07002141 print('This branch is associated with issue %s. '
2142 'Adding patch to that issue.' % self.GetIssue())
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002143 else:
nodirca166002016-06-27 10:59:51 -07002144 if options.title is not None:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002145 upload_args.extend(['--title', options.title])
2146 message = (options.title or options.message or
2147 CreateDescriptionFromLog(args))
2148 change_desc = ChangeDescription(message)
2149 if options.reviewers or options.tbr_owners:
2150 change_desc.update_reviewers(options.reviewers,
2151 options.tbr_owners,
2152 change)
2153 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002154 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002155
2156 if not change_desc.description:
vapiera7fbd5a2016-06-16 09:17:49 -07002157 print('Description is empty; aborting.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002158 return 1
2159
2160 upload_args.extend(['--message', change_desc.description])
2161 if change_desc.get_reviewers():
2162 upload_args.append('--reviewers=%s' % ','.join(
2163 change_desc.get_reviewers()))
2164 if options.send_mail:
2165 if not change_desc.get_reviewers():
2166 DieWithError("Must specify reviewers to send email.")
2167 upload_args.append('--send_mail')
2168
2169 # We check this before applying rietveld.private assuming that in
2170 # rietveld.cc only addresses which we can send private CLs to are listed
2171 # if rietveld.private is set, and so we should ignore rietveld.cc only
2172 # when --private is specified explicitly on the command line.
2173 if options.private:
2174 logging.warn('rietveld.cc is ignored since private flag is specified. '
2175 'You need to review and add them manually if necessary.')
2176 cc = self.GetCCListWithoutDefault()
2177 else:
2178 cc = self.GetCCList()
2179 cc = ','.join(filter(None, (cc, ','.join(options.cc))))
bradnelsond975b302016-10-23 12:20:23 -07002180 if change_desc.get_cced():
2181 cc = ','.join(filter(None, (cc, ','.join(change_desc.get_cced()))))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002182 if cc:
2183 upload_args.extend(['--cc', cc])
2184
2185 if options.private or settings.GetDefaultPrivateFlag() == "True":
2186 upload_args.append('--private')
2187
2188 upload_args.extend(['--git_similarity', str(options.similarity)])
2189 if not options.find_copies:
2190 upload_args.extend(['--git_no_find_copies'])
2191
2192 # Include the upstream repo's URL in the change -- this is useful for
2193 # projects that have their source spread across multiple repos.
2194 remote_url = self.GetGitBaseUrlFromConfig()
2195 if not remote_url:
2196 if settings.GetIsGitSvn():
2197 remote_url = self.GetGitSvnRemoteUrl()
2198 else:
2199 if self.GetRemoteUrl() and '/' in self.GetUpstreamBranch():
2200 remote_url = '%s@%s' % (self.GetRemoteUrl(),
2201 self.GetUpstreamBranch().split('/')[-1])
2202 if remote_url:
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002203 remote, remote_branch = self.GetRemoteBranch()
2204 target_ref = GetTargetRef(remote, remote_branch, options.target_branch,
2205 settings.GetPendingRefPrefix())
2206 if target_ref:
2207 upload_args.extend(['--target_ref', target_ref])
2208
2209 # Look for dependent patchsets. See crbug.com/480453 for more details.
2210 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2211 upstream_branch = ShortBranchName(upstream_branch)
2212 if remote is '.':
2213 # A local branch is being tracked.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002214 local_branch = upstream_branch
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002215 if settings.GetIsSkipDependencyUpload(local_branch):
vapiera7fbd5a2016-06-16 09:17:49 -07002216 print()
2217 print('Skipping dependency patchset upload because git config '
2218 'branch.%s.skip-deps-uploads is set to True.' % local_branch)
2219 print()
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002220 else:
2221 auth_config = auth.extract_auth_config_from_options(options)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00002222 branch_cl = Changelist(branchref='refs/heads/'+local_branch,
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002223 auth_config=auth_config)
2224 branch_cl_issue_url = branch_cl.GetIssueURL()
2225 branch_cl_issue = branch_cl.GetIssue()
2226 branch_cl_patchset = branch_cl.GetPatchset()
2227 if branch_cl_issue_url and branch_cl_issue and branch_cl_patchset:
2228 upload_args.extend(
2229 ['--depends_on_patchset', '%s:%s' % (
2230 branch_cl_issue, branch_cl_patchset)])
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002231 print(
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002232 '\n'
2233 'The current branch (%s) is tracking a local branch (%s) with '
2234 'an associated CL.\n'
2235 'Adding %s/#ps%s as a dependency patchset.\n'
2236 '\n' % (self.GetBranch(), local_branch, branch_cl_issue_url,
2237 branch_cl_patchset))
2238
2239 project = settings.GetProject()
2240 if project:
2241 upload_args.extend(['--project', project])
2242
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002243 try:
2244 upload_args = ['upload'] + upload_args + args
2245 logging.info('upload.RealMain(%s)', upload_args)
2246 issue, patchset = upload.RealMain(upload_args)
2247 issue = int(issue)
2248 patchset = int(patchset)
2249 except KeyboardInterrupt:
2250 sys.exit(1)
2251 except:
2252 # If we got an exception after the user typed a description for their
2253 # change, back up the description before re-raising.
2254 if change_desc:
2255 backup_path = os.path.expanduser(DESCRIPTION_BACKUP_FILE)
2256 print('\nGot exception while uploading -- saving description to %s\n' %
2257 backup_path)
2258 backup_file = open(backup_path, 'w')
2259 backup_file.write(change_desc.description)
2260 backup_file.close()
2261 raise
2262
2263 if not self.GetIssue():
2264 self.SetIssue(issue)
2265 self.SetPatchset(patchset)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002266 return 0
2267
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002268
2269class _GerritChangelistImpl(_ChangelistCodereviewBase):
2270 def __init__(self, changelist, auth_config=None):
2271 # auth_config is Rietveld thing, kept here to preserve interface only.
2272 super(_GerritChangelistImpl, self).__init__(changelist)
2273 self._change_id = None
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002274 # Lazily cached values.
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002275 self._gerrit_server = None # e.g. https://chromium-review.googlesource.com
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002276 self._gerrit_host = None # e.g. chromium-review.googlesource.com
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002277
2278 def _GetGerritHost(self):
2279 # Lazy load of configs.
2280 self.GetCodereviewServer()
tandriie32e3ea2016-06-22 02:52:48 -07002281 if self._gerrit_host and '.' not in self._gerrit_host:
2282 # Abbreviated domain like "chromium" instead of chromium.googlesource.com.
2283 # This happens for internal stuff http://crbug.com/614312.
2284 parsed = urlparse.urlparse(self.GetRemoteUrl())
2285 if parsed.scheme == 'sso':
2286 print('WARNING: using non https URLs for remote is likely broken\n'
2287 ' Your current remote is: %s' % self.GetRemoteUrl())
2288 self._gerrit_host = '%s.googlesource.com' % self._gerrit_host
2289 self._gerrit_server = 'https://%s' % self._gerrit_host
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002290 return self._gerrit_host
2291
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002292 def _GetGitHost(self):
2293 """Returns git host to be used when uploading change to Gerrit."""
2294 return urlparse.urlparse(self.GetRemoteUrl()).netloc
2295
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002296 def GetCodereviewServer(self):
2297 if not self._gerrit_server:
2298 # If we're on a branch then get the server potentially associated
2299 # with that branch.
2300 if self.GetIssue():
tandrii5d48c322016-08-18 16:19:37 -07002301 self._gerrit_server = self._GitGetBranchConfigValue(
2302 self.CodereviewServerConfigKey())
2303 if self._gerrit_server:
2304 self._gerrit_host = urlparse.urlparse(self._gerrit_server).netloc
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002305 if not self._gerrit_server:
2306 # We assume repo to be hosted on Gerrit, and hence Gerrit server
2307 # has "-review" suffix for lowest level subdomain.
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002308 parts = self._GetGitHost().split('.')
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002309 parts[0] = parts[0] + '-review'
2310 self._gerrit_host = '.'.join(parts)
2311 self._gerrit_server = 'https://%s' % self._gerrit_host
2312 return self._gerrit_server
2313
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002314 @classmethod
tandrii5d48c322016-08-18 16:19:37 -07002315 def IssueConfigKey(cls):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002316 return 'gerritissue'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002317
tandrii5d48c322016-08-18 16:19:37 -07002318 @classmethod
2319 def PatchsetConfigKey(cls):
2320 return 'gerritpatchset'
2321
2322 @classmethod
2323 def CodereviewServerConfigKey(cls):
2324 return 'gerritserver'
2325
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002326 def EnsureAuthenticated(self, force):
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002327 """Best effort check that user is authenticated with Gerrit server."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002328 if settings.GetGerritSkipEnsureAuthenticated():
2329 # For projects with unusual authentication schemes.
2330 # See http://crbug.com/603378.
2331 return
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002332 # Lazy-loader to identify Gerrit and Git hosts.
2333 if gerrit_util.GceAuthenticator.is_gce():
2334 return
2335 self.GetCodereviewServer()
2336 git_host = self._GetGitHost()
2337 assert self._gerrit_server and self._gerrit_host
2338 cookie_auth = gerrit_util.CookiesAuthenticator()
2339
2340 gerrit_auth = cookie_auth.get_auth_header(self._gerrit_host)
2341 git_auth = cookie_auth.get_auth_header(git_host)
2342 if gerrit_auth and git_auth:
2343 if gerrit_auth == git_auth:
2344 return
2345 print((
2346 'WARNING: you have different credentials for Gerrit and git hosts.\n'
2347 ' Check your %s or %s file for credentials of hosts:\n'
2348 ' %s\n'
2349 ' %s\n'
2350 ' %s') %
2351 (cookie_auth.get_gitcookies_path(), cookie_auth.get_netrc_path(),
2352 git_host, self._gerrit_host,
2353 cookie_auth.get_new_password_message(git_host)))
2354 if not force:
2355 ask_for_data('If you know what you are doing, press Enter to continue, '
2356 'Ctrl+C to abort.')
2357 return
2358 else:
2359 missing = (
2360 [] if gerrit_auth else [self._gerrit_host] +
2361 [] if git_auth else [git_host])
2362 DieWithError('Credentials for the following hosts are required:\n'
2363 ' %s\n'
2364 'These are read from %s (or legacy %s)\n'
2365 '%s' % (
2366 '\n '.join(missing),
2367 cookie_auth.get_gitcookies_path(),
2368 cookie_auth.get_netrc_path(),
2369 cookie_auth.get_new_password_message(git_host)))
2370
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002371 def _PostUnsetIssueProperties(self):
2372 """Which branch-specific properties to erase when unsetting issue."""
tandrii5d48c322016-08-18 16:19:37 -07002373 return ['gerritsquashhash']
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002374
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002375 def GetRieveldObjForPresubmit(self):
2376 class ThisIsNotRietveldIssue(object):
2377 def __nonzero__(self):
2378 # This is a hack to make presubmit_support think that rietveld is not
2379 # defined, yet still ensure that calls directly result in a decent
2380 # exception message below.
2381 return False
2382
2383 def __getattr__(self, attr):
2384 print(
2385 'You aren\'t using Rietveld at the moment, but Gerrit.\n'
2386 'Using Rietveld in your PRESUBMIT scripts won\'t work.\n'
2387 'Please, either change your PRESUBIT to not use rietveld_obj.%s,\n'
2388 'or use Rietveld for codereview.\n'
2389 'See also http://crbug.com/579160.' % attr)
2390 raise NotImplementedError()
2391 return ThisIsNotRietveldIssue()
2392
tandrii@chromium.org37b07a72016-04-29 16:42:28 +00002393 def GetGerritObjForPresubmit(self):
2394 return presubmit_support.GerritAccessor(self._GetGerritHost())
2395
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002396 def GetStatus(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002397 """Apply a rough heuristic to give a simple summary of an issue's review
2398 or CQ status, assuming adherence to a common workflow.
2399
2400 Returns None if no issue for this branch, or one of the following keywords:
2401 * 'error' - error from review tool (including deleted issues)
2402 * 'unsent' - no reviewers added
2403 * 'waiting' - waiting for review
2404 * 'reply' - waiting for owner to reply to review
tandriic2405f52016-10-10 08:13:15 -07002405 * 'not lgtm' - Code-Review disaproval from at least one valid reviewer
2406 * 'lgtm' - Code-Review approval from at least one valid reviewer
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002407 * 'commit' - in the commit queue
2408 * 'closed' - abandoned
2409 """
2410 if not self.GetIssue():
2411 return None
2412
2413 try:
2414 data = self._GetChangeDetail(['DETAILED_LABELS', 'CURRENT_REVISION'])
tandriic2405f52016-10-10 08:13:15 -07002415 except (httplib.HTTPException, GerritIssueNotExists):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002416 return 'error'
2417
tandrii@chromium.org5e1bf382016-05-17 08:43:24 +00002418 if data['status'] in ('ABANDONED', 'MERGED'):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002419 return 'closed'
2420
2421 cq_label = data['labels'].get('Commit-Queue', {})
2422 if cq_label:
rmistryc9ebbd22016-10-14 12:35:54 -07002423 votes = cq_label.get('all', [])
2424 highest_vote = 0
2425 for v in votes:
2426 highest_vote = max(highest_vote, v.get('value', 0))
2427 vote_value = str(highest_vote)
2428 if vote_value != '0':
2429 # Add a '+' if the value is not 0 to match the values in the label.
2430 # The cq_label does not have negatives.
2431 vote_value = '+' + vote_value
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002432 vote_text = cq_label.get('values', {}).get(vote_value, '')
2433 if vote_text.lower() == 'commit':
2434 return 'commit'
2435
2436 lgtm_label = data['labels'].get('Code-Review', {})
2437 if lgtm_label:
2438 if 'rejected' in lgtm_label:
2439 return 'not lgtm'
2440 if 'approved' in lgtm_label:
2441 return 'lgtm'
2442
2443 if not data.get('reviewers', {}).get('REVIEWER', []):
2444 return 'unsent'
2445
2446 messages = data.get('messages', [])
2447 if messages:
2448 owner = data['owner'].get('_account_id')
2449 last_message_author = messages[-1].get('author', {}).get('_account_id')
2450 if owner != last_message_author:
2451 # Some reply from non-owner.
2452 return 'reply'
2453
2454 return 'waiting'
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002455
2456 def GetMostRecentPatchset(self):
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002457 data = self._GetChangeDetail(['CURRENT_REVISION'])
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002458 return data['revisions'][data['current_revision']]['_number']
2459
2460 def FetchDescription(self):
tandrii@chromium.org2d3da632016-04-25 19:23:27 +00002461 data = self._GetChangeDetail(['CURRENT_REVISION'])
2462 current_rev = data['current_revision']
2463 url = data['revisions'][current_rev]['fetch']['http']['url']
2464 return gerrit_util.GetChangeDescriptionFromGitiles(url, current_rev)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002465
dsansomee2d6fd92016-09-08 00:10:47 -07002466 def UpdateDescriptionRemote(self, description, force=False):
2467 if gerrit_util.HasPendingChangeEdit(self._GetGerritHost(), self.GetIssue()):
2468 if not force:
2469 ask_for_data(
2470 'The description cannot be modified while the issue has a pending '
2471 'unpublished edit. Either publish the edit in the Gerrit web UI '
2472 'or delete it.\n\n'
2473 'Press Enter to delete the unpublished edit, Ctrl+C to abort.')
2474
2475 gerrit_util.DeletePendingChangeEdit(self._GetGerritHost(),
2476 self.GetIssue())
scottmg@chromium.org6d1266e2016-04-26 11:12:26 +00002477 gerrit_util.SetCommitMessage(self._GetGerritHost(), self.GetIssue(),
2478 description)
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002479
2480 def CloseIssue(self):
2481 gerrit_util.AbandonChange(self._GetGerritHost(), self.GetIssue(), msg='')
2482
tandrii@chromium.org600b4922016-04-26 10:57:52 +00002483 def GetApprovingReviewers(self):
2484 """Returns a list of reviewers approving the change.
2485
2486 Note: not necessarily committers.
2487 """
2488 raise NotImplementedError()
2489
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002490 def SubmitIssue(self, wait_for_merge=True):
2491 gerrit_util.SubmitChange(self._GetGerritHost(), self.GetIssue(),
2492 wait_for_merge=wait_for_merge)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00002493
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002494 def _GetChangeDetail(self, options=None, issue=None):
2495 options = options or []
2496 issue = issue or self.GetIssue()
tandriic2405f52016-10-10 08:13:15 -07002497 assert issue, 'issue is required to query Gerrit'
2498 data = gerrit_util.GetChangeDetail(self._GetGerritHost(), str(issue),
tandrii@chromium.org11a899e2016-04-13 12:45:44 +00002499 options)
tandriic2405f52016-10-10 08:13:15 -07002500 if not data:
2501 raise GerritIssueNotExists(issue, self.GetCodereviewServer())
2502 return data
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002503
agable32978d92016-11-01 12:55:02 -07002504 def _GetChangeCommit(self, issue=None):
2505 issue = issue or self.GetIssue()
2506 assert issue, 'issue is required to query Gerrit'
2507 data = gerrit_util.GetChangeCommit(self._GetGerritHost(), str(issue))
2508 if not data:
2509 raise GerritIssueNotExists(issue, self.GetCodereviewServer())
2510 return data
2511
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002512 def CMDLand(self, force, bypass_hooks, verbose):
2513 if git_common.is_dirty_git_tree('land'):
2514 return 1
tandriid60367b2016-06-22 05:25:12 -07002515 detail = self._GetChangeDetail(['CURRENT_REVISION', 'LABELS'])
2516 if u'Commit-Queue' in detail.get('labels', {}):
2517 if not force:
2518 ask_for_data('\nIt seems this repository has a Commit Queue, '
2519 'which can test and land changes for you. '
2520 'Are you sure you wish to bypass it?\n'
2521 'Press Enter to continue, Ctrl+C to abort.')
2522
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002523 differs = True
tandriic4344b52016-08-29 06:04:54 -07002524 last_upload = self._GitGetBranchConfigValue('gerritsquashhash')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002525 # Note: git diff outputs nothing if there is no diff.
2526 if not last_upload or RunGit(['diff', last_upload]).strip():
2527 print('WARNING: some changes from local branch haven\'t been uploaded')
2528 else:
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002529 if detail['current_revision'] == last_upload:
2530 differs = False
2531 else:
2532 print('WARNING: local branch contents differ from latest uploaded '
2533 'patchset')
2534 if differs:
2535 if not force:
2536 ask_for_data(
2537 'Do you want to submit latest Gerrit patchset and bypass hooks?')
2538 print('WARNING: bypassing hooks and submitting latest uploaded patchset')
2539 elif not bypass_hooks:
2540 hook_results = self.RunHook(
2541 committing=True,
2542 may_prompt=not force,
2543 verbose=verbose,
2544 change=self.GetChange(self.GetCommonAncestorWithUpstream(), None))
2545 if not hook_results.should_continue():
2546 return 1
2547
2548 self.SubmitIssue(wait_for_merge=True)
2549 print('Issue %s has been submitted.' % self.GetIssueURL())
agable32978d92016-11-01 12:55:02 -07002550 links = self._GetChangeCommit().get('web_links', [])
2551 for link in links:
2552 if link.get('name') == 'gerrit' and link.get('url'):
2553 print('Landed as %s' % link.get('url'))
2554 break
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002555 return 0
2556
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002557 def CMDPatchWithParsedIssue(self, parsed_issue_arg, reject, nocommit,
2558 directory):
2559 assert not reject
2560 assert not nocommit
2561 assert not directory
2562 assert parsed_issue_arg.valid
2563
2564 self._changelist.issue = parsed_issue_arg.issue
2565
2566 if parsed_issue_arg.hostname:
2567 self._gerrit_host = parsed_issue_arg.hostname
2568 self._gerrit_server = 'https://%s' % self._gerrit_host
2569
tandriic2405f52016-10-10 08:13:15 -07002570 try:
2571 detail = self._GetChangeDetail(['ALL_REVISIONS'])
2572 except GerritIssueNotExists as e:
2573 DieWithError(str(e))
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002574
2575 if not parsed_issue_arg.patchset:
2576 # Use current revision by default.
2577 revision_info = detail['revisions'][detail['current_revision']]
2578 patchset = int(revision_info['_number'])
2579 else:
2580 patchset = parsed_issue_arg.patchset
2581 for revision_info in detail['revisions'].itervalues():
2582 if int(revision_info['_number']) == parsed_issue_arg.patchset:
2583 break
2584 else:
2585 DieWithError('Couldn\'t find patchset %i in issue %i' %
2586 (parsed_issue_arg.patchset, self.GetIssue()))
2587
2588 fetch_info = revision_info['fetch']['http']
2589 RunGit(['fetch', fetch_info['url'], fetch_info['ref']])
2590 RunGit(['cherry-pick', 'FETCH_HEAD'])
2591 self.SetIssue(self.GetIssue())
2592 self.SetPatchset(patchset)
2593 print('Committed patch for issue %i pathset %i locally' %
2594 (self.GetIssue(), self.GetPatchset()))
2595 return 0
2596
2597 @staticmethod
2598 def ParseIssueURL(parsed_url):
2599 if not parsed_url.scheme or not parsed_url.scheme.startswith('http'):
2600 return None
2601 # Gerrit's new UI is https://domain/c/<issue_number>[/[patchset]]
2602 # But current GWT UI is https://domain/#/c/<issue_number>[/[patchset]]
2603 # Short urls like https://domain/<issue_number> can be used, but don't allow
2604 # specifying the patchset (you'd 404), but we allow that here.
2605 if parsed_url.path == '/':
2606 part = parsed_url.fragment
2607 else:
2608 part = parsed_url.path
2609 match = re.match('(/c)?/(\d+)(/(\d+)?/?)?$', part)
2610 if match:
2611 return _ParsedIssueNumberArgument(
2612 issue=int(match.group(2)),
2613 patchset=int(match.group(4)) if match.group(4) else None,
2614 hostname=parsed_url.netloc)
2615 return None
2616
tandrii16e0b4e2016-06-07 10:34:28 -07002617 def _GerritCommitMsgHookCheck(self, offer_removal):
2618 hook = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
2619 if not os.path.exists(hook):
2620 return
2621 # Crude attempt to distinguish Gerrit Codereview hook from potentially
2622 # custom developer made one.
2623 data = gclient_utils.FileRead(hook)
2624 if not('From Gerrit Code Review' in data and 'add_ChangeId()' in data):
2625 return
2626 print('Warning: you have Gerrit commit-msg hook installed.\n'
qyearsley12fa6ff2016-08-24 09:18:40 -07002627 'It is not necessary for uploading with git cl in squash mode, '
tandrii16e0b4e2016-06-07 10:34:28 -07002628 'and may interfere with it in subtle ways.\n'
2629 'We recommend you remove the commit-msg hook.')
2630 if offer_removal:
2631 reply = ask_for_data('Do you want to remove it now? [Yes/No]')
2632 if reply.lower().startswith('y'):
2633 gclient_utils.rm_file_or_tree(hook)
2634 print('Gerrit commit-msg hook removed.')
2635 else:
2636 print('OK, will keep Gerrit commit-msg hook in place.')
2637
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002638 def CMDUploadChange(self, options, args, change):
2639 """Upload the current branch to Gerrit."""
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00002640 if options.squash and options.no_squash:
2641 DieWithError('Can only use one of --squash or --no-squash')
tandriia60502f2016-06-20 02:01:53 -07002642
2643 if not options.squash and not options.no_squash:
2644 # Load default for user, repo, squash=true, in this order.
2645 options.squash = settings.GetSquashGerritUploads()
2646 elif options.no_squash:
2647 options.squash = False
tandrii26f3e4e2016-06-10 08:37:04 -07002648
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002649 # We assume the remote called "origin" is the one we want.
2650 # It is probably not worthwhile to support different workflows.
2651 gerrit_remote = 'origin'
2652
2653 remote, remote_branch = self.GetRemoteBranch()
2654 branch = GetTargetRef(remote, remote_branch, options.target_branch,
2655 pending_prefix='')
2656
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002657 if options.squash:
tandrii16e0b4e2016-06-07 10:34:28 -07002658 self._GerritCommitMsgHookCheck(offer_removal=not options.force)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002659 if self.GetIssue():
2660 # Try to get the message from a previous upload.
2661 message = self.GetDescription()
2662 if not message:
2663 DieWithError(
2664 'failed to fetch description from current Gerrit issue %d\n'
2665 '%s' % (self.GetIssue(), self.GetIssueURL()))
2666 change_id = self._GetChangeDetail()['change_id']
2667 while True:
2668 footer_change_ids = git_footers.get_footer_change_id(message)
2669 if footer_change_ids == [change_id]:
2670 break
2671 if not footer_change_ids:
2672 message = git_footers.add_footer_change_id(message, change_id)
2673 print('WARNING: appended missing Change-Id to issue description')
2674 continue
2675 # There is already a valid footer but with different or several ids.
2676 # Doing this automatically is non-trivial as we don't want to lose
2677 # existing other footers, yet we want to append just 1 desired
2678 # Change-Id. Thus, just create a new footer, but let user verify the
2679 # new description.
2680 message = '%s\n\nChange-Id: %s' % (message, change_id)
2681 print(
2682 'WARNING: issue %s has Change-Id footer(s):\n'
2683 ' %s\n'
2684 'but issue has Change-Id %s, according to Gerrit.\n'
2685 'Please, check the proposed correction to the description, '
2686 'and edit it if necessary but keep the "Change-Id: %s" footer\n'
2687 % (self.GetIssue(), '\n '.join(footer_change_ids), change_id,
2688 change_id))
2689 ask_for_data('Press enter to edit now, Ctrl+C to abort')
2690 if not options.force:
2691 change_desc = ChangeDescription(message)
tandriif9aefb72016-07-01 09:06:51 -07002692 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002693 message = change_desc.description
2694 if not message:
2695 DieWithError("Description is empty. Aborting...")
2696 # Continue the while loop.
2697 # Sanity check of this code - we should end up with proper message
2698 # footer.
2699 assert [change_id] == git_footers.get_footer_change_id(message)
2700 change_desc = ChangeDescription(message)
2701 else:
2702 change_desc = ChangeDescription(
2703 options.message or CreateDescriptionFromLog(args))
2704 if not options.force:
tandriif9aefb72016-07-01 09:06:51 -07002705 change_desc.prompt(bug=options.bug)
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002706 if not change_desc.description:
2707 DieWithError("Description is empty. Aborting...")
2708 message = change_desc.description
2709 change_ids = git_footers.get_footer_change_id(message)
2710 if len(change_ids) > 1:
2711 DieWithError('too many Change-Id footers, at most 1 allowed.')
2712 if not change_ids:
2713 # Generate the Change-Id automatically.
2714 message = git_footers.add_footer_change_id(
2715 message, GenerateGerritChangeId(message))
2716 change_desc.set_description(message)
2717 change_ids = git_footers.get_footer_change_id(message)
2718 assert len(change_ids) == 1
2719 change_id = change_ids[0]
2720
2721 remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
2722 if remote is '.':
2723 # If our upstream branch is local, we base our squashed commit on its
2724 # squashed version.
2725 upstream_branch_name = scm.GIT.ShortBranchName(upstream_branch)
2726 # Check the squashed hash of the parent.
2727 parent = RunGit(['config',
2728 'branch.%s.gerritsquashhash' % upstream_branch_name],
2729 error_ok=True).strip()
2730 # Verify that the upstream branch has been uploaded too, otherwise
2731 # Gerrit will create additional CLs when uploading.
2732 if not parent or (RunGitSilent(['rev-parse', upstream_branch + ':']) !=
2733 RunGitSilent(['rev-parse', parent + ':'])):
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002734 DieWithError(
2735 'Upload upstream branch %s first.\n'
tandrii2bdadf12016-07-12 12:27:54 -07002736 'Note: maybe you\'ve uploaded it with --no-squash. '
2737 'If so, then re-upload it with:\n'
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002738 ' git cl upload --squash\n' % upstream_branch_name)
2739 else:
2740 parent = self.GetCommonAncestorWithUpstream()
2741
2742 tree = RunGit(['rev-parse', 'HEAD:']).strip()
2743 ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
2744 '-m', message]).strip()
2745 else:
2746 change_desc = ChangeDescription(
2747 options.message or CreateDescriptionFromLog(args))
2748 if not change_desc.description:
2749 DieWithError("Description is empty. Aborting...")
2750
2751 if not git_footers.get_footer_change_id(change_desc.description):
2752 DownloadGerritHook(False)
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002753 change_desc.set_description(self._AddChangeIdToCommitMessage(options,
2754 args))
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002755 ref_to_push = 'HEAD'
2756 parent = '%s/%s' % (gerrit_remote, branch)
2757 change_id = git_footers.get_footer_change_id(change_desc.description)[0]
2758
2759 assert change_desc
2760 commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
2761 ref_to_push)]).splitlines()
2762 if len(commits) > 1:
2763 print('WARNING: This will upload %d commits. Run the following command '
2764 'to see which commits will be uploaded: ' % len(commits))
2765 print('git log %s..%s' % (parent, ref_to_push))
2766 print('You can also use `git squash-branch` to squash these into a '
2767 'single commit.')
2768 ask_for_data('About to upload; enter to confirm.')
2769
2770 if options.reviewers or options.tbr_owners:
2771 change_desc.update_reviewers(options.reviewers, options.tbr_owners,
2772 change)
2773
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002774 # Extra options that can be specified at push time. Doc:
2775 # https://gerrit-review.googlesource.com/Documentation/user-upload.html
2776 refspec_opts = []
tandrii99a72f22016-08-17 14:33:24 -07002777 if change_desc.get_reviewers(tbr_only=True):
2778 print('Adding self-LGTM (Code-Review +1) because of TBRs')
2779 refspec_opts.append('l=Code-Review+1')
2780
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002781 if options.title:
tandriieefe8322016-08-17 10:12:24 -07002782 if not re.match(r'^[\w ]+$', options.title):
2783 options.title = re.sub(r'[^\w ]', '', options.title)
2784 print('WARNING: Patchset title may only contain alphanumeric chars '
2785 'and spaces. Cleaned up title:\n%s' % options.title)
2786 if not options.force:
2787 ask_for_data('Press enter to continue, Ctrl+C to abort')
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002788 # Per doc, spaces must be converted to underscores, and Gerrit will do the
2789 # reverse on its side.
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002790 refspec_opts.append('m=' + options.title.replace(' ', '_'))
2791
tandrii@chromium.org8da45402016-05-24 23:11:03 +00002792 if options.send_mail:
2793 if not change_desc.get_reviewers():
2794 DieWithError('Must specify reviewers to send email.')
2795 refspec_opts.append('notify=ALL')
2796 else:
2797 refspec_opts.append('notify=NONE')
2798
tandrii99a72f22016-08-17 14:33:24 -07002799 reviewers = change_desc.get_reviewers()
2800 if reviewers:
2801 refspec_opts.extend('r=' + email.strip() for email in reviewers)
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002802
agablec6787972016-09-09 16:13:34 -07002803 if options.private:
2804 refspec_opts.append('draft')
2805
rmistry9eadede2016-09-19 11:22:43 -07002806 if options.topic:
2807 # Documentation on Gerrit topics is here:
2808 # https://gerrit-review.googlesource.com/Documentation/user-upload.html#topic
2809 refspec_opts.append('topic=%s' % options.topic)
2810
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002811 refspec_suffix = ''
2812 if refspec_opts:
2813 refspec_suffix = '%' + ','.join(refspec_opts)
2814 assert ' ' not in refspec_suffix, (
2815 'spaces not allowed in refspec: "%s"' % refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002816 refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00002817
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002818 push_stdout = gclient_utils.CheckCallAndFilter(
tandrii@chromium.org8acd8332016-04-13 12:56:03 +00002819 ['git', 'push', gerrit_remote, refspec],
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002820 print_stdout=True,
2821 # Flush after every line: useful for seeing progress when running as
2822 # recipe.
2823 filter_fn=lambda _: sys.stdout.flush())
2824
2825 if options.squash:
2826 regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
2827 change_numbers = [m.group(1)
2828 for m in map(regex.match, push_stdout.splitlines())
2829 if m]
2830 if len(change_numbers) != 1:
2831 DieWithError(
2832 ('Created|Updated %d issues on Gerrit, but only 1 expected.\n'
2833 'Change-Id: %s') % (len(change_numbers), change_id))
2834 self.SetIssue(change_numbers[0])
tandrii5d48c322016-08-18 16:19:37 -07002835 self._GitSetBranchConfigValue('gerritsquashhash', ref_to_push)
tandrii88189772016-09-29 04:29:57 -07002836
2837 # Add cc's from the CC_LIST and --cc flag (if any).
2838 cc = self.GetCCList().split(',')
2839 if options.cc:
2840 cc.extend(options.cc)
2841 cc = filter(None, [email.strip() for email in cc])
bradnelsond975b302016-10-23 12:20:23 -07002842 if change_desc.get_cced():
2843 cc.extend(change_desc.get_cced())
tandrii88189772016-09-29 04:29:57 -07002844 if cc:
Aaron Gabledf86e302016-11-08 10:48:03 -08002845 errors = gerrit_util.AddReviewers(
tandrii88189772016-09-29 04:29:57 -07002846 self._GetGerritHost(), self.GetIssue(), cc, is_reviewer=False)
Aaron Gabledf86e302016-11-08 10:48:03 -08002847 if errors:
2848 return 1
tandrii88189772016-09-29 04:29:57 -07002849
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002850 return 0
2851
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002852 def _AddChangeIdToCommitMessage(self, options, args):
2853 """Re-commits using the current message, assumes the commit hook is in
2854 place.
2855 """
2856 log_desc = options.message or CreateDescriptionFromLog(args)
2857 git_command = ['commit', '--amend', '-m', log_desc]
2858 RunGit(git_command)
2859 new_log_desc = CreateDescriptionFromLog(args)
2860 if git_footers.get_footer_change_id(new_log_desc):
vapiera7fbd5a2016-06-16 09:17:49 -07002861 print('git-cl: Added Change-Id to commit message.')
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00002862 return new_log_desc
2863 else:
tandrii@chromium.orgb067ec52016-05-31 15:24:44 +00002864 DieWithError('ERROR: Gerrit commit-msg hook not installed.')
tandrii@chromium.orgaa6235b2016-04-11 21:35:29 +00002865
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002866 def SetCQState(self, new_state):
2867 """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002868 vote_map = {
2869 _CQState.NONE: 0,
2870 _CQState.DRY_RUN: 1,
2871 _CQState.COMMIT : 2,
2872 }
2873 gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
2874 labels={'Commit-Queue': vote_map[new_state]})
2875
tandriie113dfd2016-10-11 10:20:12 -07002876 def CannotTriggerTryJobReason(self):
tandrii8c5a3532016-11-04 07:52:02 -07002877 try:
2878 data = self._GetChangeDetail()
2879 except GerritIssueNotExists:
2880 return 'Gerrit doesn\'t know about your issue %s' % self.GetIssue()
2881
2882 if data['status'] in ('ABANDONED', 'MERGED'):
2883 return 'CL %s is closed' % self.GetIssue()
2884
2885 def GetTryjobProperties(self, patchset=None):
2886 """Returns dictionary of properties to launch tryjob."""
2887 data = self._GetChangeDetail(['ALL_REVISIONS'])
2888 patchset = int(patchset or self.GetPatchset())
2889 assert patchset
2890 revision_data = None # Pylint wants it to be defined.
2891 for revision_data in data['revisions'].itervalues():
2892 if int(revision_data['_number']) == patchset:
2893 break
2894 else:
2895 raise Exception('Patchset %d is not known in Gerrit issue %d' %
2896 (patchset, self.GetIssue()))
2897 return {
2898 'patch_issue': self.GetIssue(),
2899 'patch_set': patchset or self.GetPatchset(),
2900 'patch_project': data['project'],
2901 'patch_storage': 'gerrit',
2902 'patch_ref': revision_data['fetch']['http']['ref'],
2903 'patch_repository_url': revision_data['fetch']['http']['url'],
2904 'patch_gerrit_url': self.GetCodereviewServer(),
2905 }
tandriie113dfd2016-10-11 10:20:12 -07002906
tandriide281ae2016-10-12 06:02:30 -07002907 def GetIssueOwner(self):
tandrii8c5a3532016-11-04 07:52:02 -07002908 return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
tandriide281ae2016-10-12 06:02:30 -07002909
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00002910
2911_CODEREVIEW_IMPLEMENTATIONS = {
2912 'rietveld': _RietveldChangelistImpl,
2913 'gerrit': _GerritChangelistImpl,
2914}
2915
tandrii@chromium.org013a2802016-03-29 09:52:33 +00002916
iannuccie53c9352016-08-17 14:40:40 -07002917def _add_codereview_issue_select_options(parser, extra=""):
2918 _add_codereview_select_options(parser)
2919
2920 text = ('Operate on this issue number instead of the current branch\'s '
2921 'implicit issue.')
2922 if extra:
2923 text += ' '+extra
2924 parser.add_option('-i', '--issue', type=int, help=text)
2925
2926
2927def _process_codereview_issue_select_options(parser, options):
2928 _process_codereview_select_options(parser, options)
2929 if options.issue is not None and not options.forced_codereview:
2930 parser.error('--issue must be specified with either --rietveld or --gerrit')
2931
2932
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002933def _add_codereview_select_options(parser):
2934 """Appends --gerrit and --rietveld options to force specific codereview."""
2935 parser.codereview_group = optparse.OptionGroup(
2936 parser, 'EXPERIMENTAL! Codereview override options')
2937 parser.add_option_group(parser.codereview_group)
2938 parser.codereview_group.add_option(
2939 '--gerrit', action='store_true',
2940 help='Force the use of Gerrit for codereview')
2941 parser.codereview_group.add_option(
2942 '--rietveld', action='store_true',
2943 help='Force the use of Rietveld for codereview')
2944
2945
2946def _process_codereview_select_options(parser, options):
2947 if options.gerrit and options.rietveld:
2948 parser.error('Options --gerrit and --rietveld are mutually exclusive')
2949 options.forced_codereview = None
2950 if options.gerrit:
2951 options.forced_codereview = 'gerrit'
2952 elif options.rietveld:
2953 options.forced_codereview = 'rietveld'
2954
2955
tandriif9aefb72016-07-01 09:06:51 -07002956def _get_bug_line_values(default_project, bugs):
2957 """Given default_project and comma separated list of bugs, yields bug line
2958 values.
2959
2960 Each bug can be either:
2961 * a number, which is combined with default_project
2962 * string, which is left as is.
2963
2964 This function may produce more than one line, because bugdroid expects one
2965 project per line.
2966
2967 >>> list(_get_bug_line_values('v8', '123,chromium:789'))
2968 ['v8:123', 'chromium:789']
2969 """
2970 default_bugs = []
2971 others = []
2972 for bug in bugs.split(','):
2973 bug = bug.strip()
2974 if bug:
2975 try:
2976 default_bugs.append(int(bug))
2977 except ValueError:
2978 others.append(bug)
2979
2980 if default_bugs:
2981 default_bugs = ','.join(map(str, default_bugs))
2982 if default_project:
2983 yield '%s:%s' % (default_project, default_bugs)
2984 else:
2985 yield default_bugs
2986 for other in sorted(others):
2987 # Don't bother finding common prefixes, CLs with >2 bugs are very very rare.
2988 yield other
2989
2990
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002991class ChangeDescription(object):
2992 """Contains a parsed form of the change description."""
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00002993 R_LINE = r'^[ \t]*(TBR|R)[ \t]*=[ \t]*(.*?)[ \t]*$'
bradnelsond975b302016-10-23 12:20:23 -07002994 CC_LINE = r'^[ \t]*(CC)[ \t]*=[ \t]*(.*?)[ \t]*$'
agable@chromium.org42c20792013-09-12 17:34:49 +00002995 BUG_LINE = r'^[ \t]*(BUG)[ \t]*=[ \t]*(.*?)[ \t]*$'
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00002996
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002997 def __init__(self, description):
agable@chromium.org42c20792013-09-12 17:34:49 +00002998 self._description_lines = (description or '').strip().splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00002999
agable@chromium.org42c20792013-09-12 17:34:49 +00003000 @property # www.logilab.org/ticket/89786
3001 def description(self): # pylint: disable=E0202
3002 return '\n'.join(self._description_lines)
3003
3004 def set_description(self, desc):
3005 if isinstance(desc, basestring):
3006 lines = desc.splitlines()
3007 else:
3008 lines = [line.rstrip() for line in desc]
3009 while lines and not lines[0]:
3010 lines.pop(0)
3011 while lines and not lines[-1]:
3012 lines.pop(-1)
3013 self._description_lines = lines
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003014
piman@chromium.org336f9122014-09-04 02:16:55 +00003015 def update_reviewers(self, reviewers, add_owners_tbr=False, change=None):
agable@chromium.org42c20792013-09-12 17:34:49 +00003016 """Rewrites the R=/TBR= line(s) as a single line each."""
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003017 assert isinstance(reviewers, list), reviewers
piman@chromium.org336f9122014-09-04 02:16:55 +00003018 if not reviewers and not add_owners_tbr:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003019 return
agable@chromium.org42c20792013-09-12 17:34:49 +00003020 reviewers = reviewers[:]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003021
agable@chromium.org42c20792013-09-12 17:34:49 +00003022 # Get the set of R= and TBR= lines and remove them from the desciption.
3023 regexp = re.compile(self.R_LINE)
3024 matches = [regexp.match(line) for line in self._description_lines]
3025 new_desc = [l for i, l in enumerate(self._description_lines)
3026 if not matches[i]]
3027 self.set_description(new_desc)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003028
agable@chromium.org42c20792013-09-12 17:34:49 +00003029 # Construct new unified R= and TBR= lines.
3030 r_names = []
3031 tbr_names = []
3032 for match in matches:
3033 if not match:
3034 continue
3035 people = cleanup_list([match.group(2).strip()])
3036 if match.group(1) == 'TBR':
3037 tbr_names.extend(people)
3038 else:
3039 r_names.extend(people)
3040 for name in r_names:
3041 if name not in reviewers:
3042 reviewers.append(name)
piman@chromium.org336f9122014-09-04 02:16:55 +00003043 if add_owners_tbr:
3044 owners_db = owners.Database(change.RepositoryRoot(),
dtu944b6052016-07-14 14:48:21 -07003045 fopen=file, os_path=os.path)
piman@chromium.org336f9122014-09-04 02:16:55 +00003046 all_reviewers = set(tbr_names + reviewers)
3047 missing_files = owners_db.files_not_covered_by(change.LocalPaths(),
3048 all_reviewers)
3049 tbr_names.extend(owners_db.reviewers_for(missing_files,
3050 change.author_email))
agable@chromium.org42c20792013-09-12 17:34:49 +00003051 new_r_line = 'R=' + ', '.join(reviewers) if reviewers else None
3052 new_tbr_line = 'TBR=' + ', '.join(tbr_names) if tbr_names else None
3053
3054 # Put the new lines in the description where the old first R= line was.
3055 line_loc = next((i for i, match in enumerate(matches) if match), -1)
3056 if 0 <= line_loc < len(self._description_lines):
3057 if new_tbr_line:
3058 self._description_lines.insert(line_loc, new_tbr_line)
3059 if new_r_line:
3060 self._description_lines.insert(line_loc, new_r_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003061 else:
agable@chromium.org42c20792013-09-12 17:34:49 +00003062 if new_r_line:
3063 self.append_footer(new_r_line)
3064 if new_tbr_line:
3065 self.append_footer(new_tbr_line)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003066
tandriif9aefb72016-07-01 09:06:51 -07003067 def prompt(self, bug=None):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003068 """Asks the user to update the description."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003069 self.set_description([
3070 '# Enter a description of the change.',
3071 '# This will be displayed on the codereview site.',
3072 '# The first line will also be used as the subject of the review.',
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +00003073 '#--------------------This line is 72 characters long'
agable@chromium.org42c20792013-09-12 17:34:49 +00003074 '--------------------',
3075 ] + self._description_lines)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003076
agable@chromium.org42c20792013-09-12 17:34:49 +00003077 regexp = re.compile(self.BUG_LINE)
3078 if not any((regexp.match(line) for line in self._description_lines)):
tandriif9aefb72016-07-01 09:06:51 -07003079 prefix = settings.GetBugPrefix()
3080 values = list(_get_bug_line_values(prefix, bug or '')) or [prefix]
3081 for value in values:
3082 # TODO(tandrii): change this to 'Bug: xxx' to be a proper Gerrit footer.
3083 self.append_footer('BUG=%s' % value)
3084
agable@chromium.org42c20792013-09-12 17:34:49 +00003085 content = gclient_utils.RunEditor(self.description, True,
jbroman@chromium.org615a2622013-05-03 13:20:14 +00003086 git_editor=settings.GetGitEditor())
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003087 if not content:
3088 DieWithError('Running editor failed')
agable@chromium.org42c20792013-09-12 17:34:49 +00003089 lines = content.splitlines()
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003090
3091 # Strip off comments.
agable@chromium.org42c20792013-09-12 17:34:49 +00003092 clean_lines = [line.rstrip() for line in lines if not line.startswith('#')]
3093 if not clean_lines:
maruel@chromium.org0e0436a2011-10-25 13:32:41 +00003094 DieWithError('No CL description, aborting')
agable@chromium.org42c20792013-09-12 17:34:49 +00003095 self.set_description(clean_lines)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003096
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003097 def append_footer(self, line):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00003098 """Adds a footer line to the description.
3099
3100 Differentiates legacy "KEY=xxx" footers (used to be called tags) and
3101 Gerrit's footers in the form of "Footer-Key: footer any value" and ensures
3102 that Gerrit footers are always at the end.
3103 """
3104 parsed_footer_line = git_footers.parse_footer(line)
3105 if parsed_footer_line:
3106 # Line is a gerrit footer in the form: Footer-Key: any value.
3107 # Thus, must be appended observing Gerrit footer rules.
3108 self.set_description(
3109 git_footers.add_footer(self.description,
3110 key=parsed_footer_line[0],
3111 value=parsed_footer_line[1]))
3112 return
3113
3114 if not self._description_lines:
3115 self._description_lines.append(line)
3116 return
3117
3118 top_lines, gerrit_footers, _ = git_footers.split_footers(self.description)
3119 if gerrit_footers:
3120 # git_footers.split_footers ensures that there is an empty line before
3121 # actual (gerrit) footers, if any. We have to keep it that way.
3122 assert top_lines and top_lines[-1] == ''
3123 top_lines, separator = top_lines[:-1], top_lines[-1:]
3124 else:
3125 separator = [] # No need for separator if there are no gerrit_footers.
3126
3127 prev_line = top_lines[-1] if top_lines else ''
3128 if (not presubmit_support.Change.TAG_LINE_RE.match(prev_line) or
3129 not presubmit_support.Change.TAG_LINE_RE.match(line)):
3130 top_lines.append('')
3131 top_lines.append(line)
3132 self._description_lines = top_lines + separator + gerrit_footers
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003133
tandrii99a72f22016-08-17 14:33:24 -07003134 def get_reviewers(self, tbr_only=False):
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003135 """Retrieves the list of reviewers."""
agable@chromium.org42c20792013-09-12 17:34:49 +00003136 matches = [re.match(self.R_LINE, line) for line in self._description_lines]
tandrii99a72f22016-08-17 14:33:24 -07003137 reviewers = [match.group(2).strip()
3138 for match in matches
3139 if match and (not tbr_only or match.group(1).upper() == 'TBR')]
maruel@chromium.org78936cb2013-04-11 00:17:52 +00003140 return cleanup_list(reviewers)
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003141
bradnelsond975b302016-10-23 12:20:23 -07003142 def get_cced(self):
3143 """Retrieves the list of reviewers."""
3144 matches = [re.match(self.CC_LINE, line) for line in self._description_lines]
3145 cced = [match.group(2).strip() for match in matches if match]
3146 return cleanup_list(cced)
3147
dpranke@chromium.org20254fc2011-03-22 18:28:59 +00003148
maruel@chromium.orge52678e2013-04-26 18:34:44 +00003149def get_approving_reviewers(props):
3150 """Retrieves the reviewers that approved a CL from the issue properties with
3151 messages.
3152
3153 Note that the list may contain reviewers that are not committer, thus are not
3154 considered by the CQ.
3155 """
3156 return sorted(
3157 set(
3158 message['sender']
3159 for message in props['messages']
3160 if message['approval'] and message['sender'] in props['reviewers']
3161 )
3162 )
3163
3164
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003165def FindCodereviewSettingsFile(filename='codereview.settings'):
3166 """Finds the given file starting in the cwd and going up.
3167
3168 Only looks up to the top of the repository unless an
3169 'inherit-review-settings-ok' file exists in the root of the repository.
3170 """
3171 inherit_ok_file = 'inherit-review-settings-ok'
3172 cwd = os.getcwd()
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00003173 root = settings.GetRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003174 if os.path.isfile(os.path.join(root, inherit_ok_file)):
3175 root = '/'
3176 while True:
3177 if filename in os.listdir(cwd):
3178 if os.path.isfile(os.path.join(cwd, filename)):
3179 return open(os.path.join(cwd, filename))
3180 if cwd == root:
3181 break
3182 cwd = os.path.dirname(cwd)
3183
3184
3185def LoadCodereviewSettingsFromFile(fileobj):
3186 """Parse a codereview.settings file and updates hooks."""
maruel@chromium.org99ac1c52012-01-16 14:52:12 +00003187 keyvals = gclient_utils.ParseCodereviewSettingsContent(fileobj.read())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003188
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003189 def SetProperty(name, setting, unset_error_ok=False):
3190 fullname = 'rietveld.' + name
3191 if setting in keyvals:
3192 RunGit(['config', fullname, keyvals[setting]])
3193 else:
3194 RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok)
3195
tandrii48df5812016-10-17 03:55:37 -07003196 if not keyvals.get('GERRIT_HOST', False):
3197 SetProperty('server', 'CODE_REVIEW_SERVER')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003198 # Only server setting is required. Other settings can be absent.
3199 # In that case, we ignore errors raised during option deletion attempt.
3200 SetProperty('cc', 'CC_LIST', unset_error_ok=True)
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00003201 SetProperty('private', 'PRIVATE', unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003202 SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
3203 SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
rmistry@google.com90752582014-01-14 21:04:50 +00003204 SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003205 SetProperty('cpplint-regex', 'LINT_REGEX', unset_error_ok=True)
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00003206 SetProperty('force-https-commit-url', 'FORCE_HTTPS_COMMIT_URL',
3207 unset_error_ok=True)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003208 SetProperty('cpplint-ignore-regex', 'LINT_IGNORE_REGEX', unset_error_ok=True)
sheyang@chromium.org152cf832014-06-11 21:37:49 +00003209 SetProperty('project', 'PROJECT', unset_error_ok=True)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00003210 SetProperty('pending-ref-prefix', 'PENDING_REF_PREFIX', unset_error_ok=True)
tandriif46c20f2016-09-14 06:17:05 -07003211 SetProperty('git-number-footer', 'GIT_NUMBER_FOOTER', unset_error_ok=True)
rmistry@google.com5626a922015-02-26 14:03:30 +00003212 SetProperty('run-post-upload-hook', 'RUN_POST_UPLOAD_HOOK',
3213 unset_error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003214
ukai@chromium.org7044efc2013-11-28 01:51:21 +00003215 if 'GERRIT_HOST' in keyvals:
ukai@chromium.orge8077812012-02-03 03:41:46 +00003216 RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
ukai@chromium.orge8077812012-02-03 03:41:46 +00003217
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003218 if 'GERRIT_SQUASH_UPLOADS' in keyvals:
tandrii8dd81ea2016-06-16 13:24:23 -07003219 RunGit(['config', 'gerrit.squash-uploads',
3220 keyvals['GERRIT_SQUASH_UPLOADS']])
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00003221
tandrii@chromium.org28253532016-04-14 13:46:56 +00003222 if 'GERRIT_SKIP_ENSURE_AUTHENTICATED' in keyvals:
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00003223 RunGit(['config', 'gerrit.skip-ensure-authenticated',
tandrii@chromium.org28253532016-04-14 13:46:56 +00003224 keyvals['GERRIT_SKIP_ENSURE_AUTHENTICATED']])
3225
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003226 if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
3227 #should be of the form
3228 #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
3229 #ORIGIN_URL_CONFIG: http://src.chromium.org/git
3230 RunGit(['config', keyvals['PUSH_URL_CONFIG'],
3231 keyvals['ORIGIN_URL_CONFIG']])
3232
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003233
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003234def urlretrieve(source, destination):
3235 """urllib is broken for SSL connections via a proxy therefore we
3236 can't use urllib.urlretrieve()."""
3237 with open(destination, 'w') as f:
3238 f.write(urllib2.urlopen(source).read())
3239
3240
ukai@chromium.org712d6102013-11-27 00:52:58 +00003241def hasSheBang(fname):
3242 """Checks fname is a #! script."""
3243 with open(fname) as f:
3244 return f.read(2).startswith('#!')
3245
3246
bpastene@chromium.org917f0ff2016-04-05 00:45:30 +00003247# TODO(bpastene) Remove once a cleaner fix to crbug.com/600473 presents itself.
3248def DownloadHooks(*args, **kwargs):
3249 pass
3250
3251
tandrii@chromium.org18630d62016-03-04 12:06:02 +00003252def DownloadGerritHook(force):
3253 """Download and install Gerrit commit-msg hook.
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003254
3255 Args:
3256 force: True to update hooks. False to install hooks if not present.
3257 """
3258 if not settings.GetIsGerrit():
3259 return
ukai@chromium.org712d6102013-11-27 00:52:58 +00003260 src = 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg'
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003261 dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
3262 if not os.access(dst, os.X_OK):
3263 if os.path.exists(dst):
3264 if not force:
3265 return
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003266 try:
joshua.lock@intel.com426f69b2012-08-02 23:41:49 +00003267 urlretrieve(src, dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003268 if not hasSheBang(dst):
3269 DieWithError('Not a script: %s\n'
3270 'You need to download from\n%s\n'
3271 'into .git/hooks/commit-msg and '
3272 'chmod +x .git/hooks/commit-msg' % (dst, src))
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003273 os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
3274 except Exception:
3275 if os.path.exists(dst):
3276 os.remove(dst)
ukai@chromium.org712d6102013-11-27 00:52:58 +00003277 DieWithError('\nFailed to download hooks.\n'
3278 'You need to download from\n%s\n'
3279 'into .git/hooks/commit-msg and '
3280 'chmod +x .git/hooks/commit-msg' % src)
ukai@chromium.org78c4b982012-02-14 02:20:26 +00003281
3282
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003283
3284def GetRietveldCodereviewSettingsInteractively():
3285 """Prompt the user for settings."""
3286 server = settings.GetDefaultServerUrl(error_ok=True)
3287 prompt = 'Rietveld server (host[:port])'
3288 prompt += ' [%s]' % (server or DEFAULT_SERVER)
3289 newserver = ask_for_data(prompt + ':')
3290 if not server and not newserver:
3291 newserver = DEFAULT_SERVER
3292 if newserver:
3293 newserver = gclient_utils.UpgradeToHttps(newserver)
3294 if newserver != server:
3295 RunGit(['config', 'rietveld.server', newserver])
3296
3297 def SetProperty(initial, caption, name, is_url):
3298 prompt = caption
3299 if initial:
3300 prompt += ' ("x" to clear) [%s]' % initial
3301 new_val = ask_for_data(prompt + ':')
3302 if new_val == 'x':
3303 RunGit(['config', '--unset-all', 'rietveld.' + name], error_ok=True)
3304 elif new_val:
3305 if is_url:
3306 new_val = gclient_utils.UpgradeToHttps(new_val)
3307 if new_val != initial:
3308 RunGit(['config', 'rietveld.' + name, new_val])
3309
3310 SetProperty(settings.GetDefaultCCList(), 'CC list', 'cc', False)
3311 SetProperty(settings.GetDefaultPrivateFlag(),
3312 'Private flag (rietveld only)', 'private', False)
3313 SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
3314 'tree-status-url', False)
3315 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
3316 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
3317 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook',
3318 'run-post-upload-hook', False)
3319
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003320@subcommand.usage('[repo root containing codereview.settings]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003321def CMDconfig(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003322 """Edits configuration for this tree."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003323
tandrii5d0a0422016-09-14 06:24:35 -07003324 print('WARNING: git cl config works for Rietveld only')
3325 # TODO(tandrii): remove this once we switch to Gerrit.
3326 # See bugs http://crbug.com/637561 and http://crbug.com/600469.
pgervais@chromium.org87884cc2014-01-03 22:23:41 +00003327 parser.add_option('--activate-update', action='store_true',
3328 help='activate auto-updating [rietveld] section in '
3329 '.git/config')
3330 parser.add_option('--deactivate-update', action='store_true',
3331 help='deactivate auto-updating [rietveld] section in '
3332 '.git/config')
3333 options, args = parser.parse_args(args)
3334
3335 if options.deactivate_update:
3336 RunGit(['config', 'rietveld.autoupdate', 'false'])
3337 return
3338
3339 if options.activate_update:
3340 RunGit(['config', '--unset', 'rietveld.autoupdate'])
3341 return
3342
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003343 if len(args) == 0:
tandrii@chromium.orge7d3d162016-03-15 14:15:57 +00003344 GetRietveldCodereviewSettingsInteractively()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003345 return 0
3346
3347 url = args[0]
3348 if not url.endswith('codereview.settings'):
3349 url = os.path.join(url, 'codereview.settings')
3350
3351 # Load code review settings and download hooks (if available).
3352 LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
3353 return 0
3354
3355
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003356def CMDbaseurl(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003357 """Gets or sets base-url for this branch."""
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003358 branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
3359 branch = ShortBranchName(branchref)
3360 _, args = parser.parse_args(args)
3361 if not args:
vapiera7fbd5a2016-06-16 09:17:49 -07003362 print('Current base-url:')
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003363 return RunGit(['config', 'branch.%s.base-url' % branch],
3364 error_ok=False).strip()
3365 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003366 print('Setting base-url to %s' % args[0])
kalmard@homejinni.com6b0051e2012-04-03 15:45:08 +00003367 return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
3368 error_ok=False).strip()
3369
3370
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003371def color_for_status(status):
3372 """Maps a Changelist status to color, for CMDstatus and other tools."""
3373 return {
3374 'unsent': Fore.RED,
3375 'waiting': Fore.BLUE,
3376 'reply': Fore.YELLOW,
3377 'lgtm': Fore.GREEN,
3378 'commit': Fore.MAGENTA,
3379 'closed': Fore.CYAN,
3380 'error': Fore.WHITE,
3381 }.get(status, Fore.WHITE)
3382
tandrii@chromium.org04ea8462016-04-25 19:51:21 +00003383
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003384def get_cl_statuses(changes, fine_grained, max_processes=None):
3385 """Returns a blocking iterable of (cl, status) for given branches.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003386
3387 If fine_grained is true, this will fetch CL statuses from the server.
3388 Otherwise, simply indicate if there's a matching url for the given branches.
3389
3390 If max_processes is specified, it is used as the maximum number of processes
3391 to spawn to fetch CL status from the server. Otherwise 1 process per branch is
3392 spawned.
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003393
3394 See GetStatus() for a list of possible statuses.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003395 """
qyearsley12fa6ff2016-08-24 09:18:40 -07003396 # Silence upload.py otherwise it becomes unwieldy.
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003397 upload.verbosity = 0
3398
3399 if fine_grained:
3400 # Process one branch synchronously to work through authentication, then
3401 # spawn processes to process all the other branches in parallel.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003402 if changes:
tandriiea9514a2016-08-17 12:32:37 -07003403 def fetch(cl):
3404 try:
3405 return (cl, cl.GetStatus())
3406 except:
3407 # See http://crbug.com/629863.
3408 logging.exception('failed to fetch status for %s:', cl)
3409 raise
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003410 yield fetch(changes[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003411
tandriiea9514a2016-08-17 12:32:37 -07003412 changes_to_fetch = changes[1:]
3413 if not changes_to_fetch:
kmarshall3bff56b2016-06-06 18:31:47 -07003414 # Exit early if there was only one branch to fetch.
3415 return
3416
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003417 pool = ThreadPool(
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003418 min(max_processes, len(changes_to_fetch))
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003419 if max_processes is not None
dsinclair99d30172016-08-09 10:48:58 -07003420 else max(len(changes_to_fetch), 1))
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003421
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003422 fetched_cls = set()
3423 it = pool.imap_unordered(fetch, changes_to_fetch).__iter__()
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003424 while True:
3425 try:
3426 row = it.next(timeout=5)
3427 except multiprocessing.TimeoutError:
3428 break
3429
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003430 fetched_cls.add(row[0])
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003431 yield row
3432
3433 # Add any branches that failed to fetch.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003434 for cl in set(changes_to_fetch) - fetched_cls:
3435 yield (cl, 'error')
calamity@chromium.orgcf197482016-04-29 20:15:53 +00003436
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003437 else:
3438 # Do not use GetApprovingReviewers(), since it requires an HTTP request.
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003439 for cl in changes:
3440 yield (cl, 'waiting' if cl.GetIssueURL() else 'error')
jsbell@chromium.orgb99fbd92014-09-11 17:29:28 +00003441
rmistry@google.com2dd99862015-06-22 12:22:18 +00003442
3443def upload_branch_deps(cl, args):
3444 """Uploads CLs of local branches that are dependents of the current branch.
3445
3446 If the local branch dependency tree looks like:
3447 test1 -> test2.1 -> test3.1
3448 -> test3.2
3449 -> test2.2 -> test3.3
3450
3451 and you run "git cl upload --dependencies" from test1 then "git cl upload" is
3452 run on the dependent branches in this order:
3453 test2.1, test3.1, test3.2, test2.2, test3.3
3454
3455 Note: This function does not rebase your local dependent branches. Use it when
3456 you make a change to the parent branch that will not conflict with its
3457 dependent branches, and you would like their dependencies updated in
3458 Rietveld.
3459 """
3460 if git_common.is_dirty_git_tree('upload-branch-deps'):
3461 return 1
3462
3463 root_branch = cl.GetBranch()
3464 if root_branch is None:
3465 DieWithError('Can\'t find dependent branches from detached HEAD state. '
3466 'Get on a branch!')
3467 if not cl.GetIssue() or not cl.GetPatchset():
3468 DieWithError('Current branch does not have an uploaded CL. We cannot set '
3469 'patchset dependencies without an uploaded CL.')
3470
3471 branches = RunGit(['for-each-ref',
3472 '--format=%(refname:short) %(upstream:short)',
3473 'refs/heads'])
3474 if not branches:
3475 print('No local branches found.')
3476 return 0
3477
3478 # Create a dictionary of all local branches to the branches that are dependent
3479 # on it.
3480 tracked_to_dependents = collections.defaultdict(list)
3481 for b in branches.splitlines():
3482 tokens = b.split()
3483 if len(tokens) == 2:
3484 branch_name, tracked = tokens
3485 tracked_to_dependents[tracked].append(branch_name)
3486
vapiera7fbd5a2016-06-16 09:17:49 -07003487 print()
3488 print('The dependent local branches of %s are:' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003489 dependents = []
3490 def traverse_dependents_preorder(branch, padding=''):
3491 dependents_to_process = tracked_to_dependents.get(branch, [])
3492 padding += ' '
3493 for dependent in dependents_to_process:
vapiera7fbd5a2016-06-16 09:17:49 -07003494 print('%s%s' % (padding, dependent))
rmistry@google.com2dd99862015-06-22 12:22:18 +00003495 dependents.append(dependent)
3496 traverse_dependents_preorder(dependent, padding)
3497 traverse_dependents_preorder(root_branch)
vapiera7fbd5a2016-06-16 09:17:49 -07003498 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003499
3500 if not dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003501 print('There are no dependent local branches for %s' % root_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003502 return 0
3503
vapiera7fbd5a2016-06-16 09:17:49 -07003504 print('This command will checkout all dependent branches and run '
3505 '"git cl upload".')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003506 ask_for_data('[Press enter to continue or ctrl-C to quit]')
3507
andybons@chromium.org962f9462016-02-03 20:00:42 +00003508 # Add a default patchset title to all upload calls in Rietveld.
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00003509 if not cl.IsGerrit():
andybons@chromium.org962f9462016-02-03 20:00:42 +00003510 args.extend(['-t', 'Updated patchset dependency'])
3511
rmistry@google.com2dd99862015-06-22 12:22:18 +00003512 # Record all dependents that failed to upload.
3513 failures = {}
3514 # Go through all dependents, checkout the branch and upload.
3515 try:
3516 for dependent_branch in dependents:
vapiera7fbd5a2016-06-16 09:17:49 -07003517 print()
3518 print('--------------------------------------')
3519 print('Running "git cl upload" from %s:' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003520 RunGit(['checkout', '-q', dependent_branch])
vapiera7fbd5a2016-06-16 09:17:49 -07003521 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003522 try:
3523 if CMDupload(OptionParser(), args) != 0:
vapiera7fbd5a2016-06-16 09:17:49 -07003524 print('Upload failed for %s!' % dependent_branch)
rmistry@google.com2dd99862015-06-22 12:22:18 +00003525 failures[dependent_branch] = 1
3526 except: # pylint: disable=W0702
3527 failures[dependent_branch] = 1
vapiera7fbd5a2016-06-16 09:17:49 -07003528 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003529 finally:
3530 # Swap back to the original root branch.
3531 RunGit(['checkout', '-q', root_branch])
3532
vapiera7fbd5a2016-06-16 09:17:49 -07003533 print()
3534 print('Upload complete for dependent branches!')
rmistry@google.com2dd99862015-06-22 12:22:18 +00003535 for dependent_branch in dependents:
3536 upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
vapiera7fbd5a2016-06-16 09:17:49 -07003537 print(' %s : %s' % (dependent_branch, upload_status))
3538 print()
rmistry@google.com2dd99862015-06-22 12:22:18 +00003539
3540 return 0
3541
3542
kmarshall3bff56b2016-06-06 18:31:47 -07003543def CMDarchive(parser, args):
3544 """Archives and deletes branches associated with closed changelists."""
3545 parser.add_option(
3546 '-j', '--maxjobs', action='store', type=int,
kmarshall9249e012016-08-23 12:02:16 -07003547 help='The maximum number of jobs to use when retrieving review status.')
kmarshall3bff56b2016-06-06 18:31:47 -07003548 parser.add_option(
3549 '-f', '--force', action='store_true',
3550 help='Bypasses the confirmation prompt.')
kmarshall9249e012016-08-23 12:02:16 -07003551 parser.add_option(
3552 '-d', '--dry-run', action='store_true',
3553 help='Skip the branch tagging and removal steps.')
3554 parser.add_option(
3555 '-t', '--notags', action='store_true',
3556 help='Do not tag archived branches. '
3557 'Note: local commit history may be lost.')
kmarshall3bff56b2016-06-06 18:31:47 -07003558
3559 auth.add_auth_options(parser)
3560 options, args = parser.parse_args(args)
3561 if args:
3562 parser.error('Unsupported args: %s' % ' '.join(args))
3563 auth_config = auth.extract_auth_config_from_options(options)
3564
3565 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3566 if not branches:
3567 return 0
3568
vapiera7fbd5a2016-06-16 09:17:49 -07003569 print('Finding all branches associated with closed issues...')
kmarshall3bff56b2016-06-06 18:31:47 -07003570 changes = [Changelist(branchref=b, auth_config=auth_config)
3571 for b in branches.splitlines()]
3572 alignment = max(5, max(len(c.GetBranch()) for c in changes))
3573 statuses = get_cl_statuses(changes,
3574 fine_grained=True,
3575 max_processes=options.maxjobs)
3576 proposal = [(cl.GetBranch(),
3577 'git-cl-archived-%s-%s' % (cl.GetIssue(), cl.GetBranch()))
3578 for cl, status in statuses
3579 if status == 'closed']
3580 proposal.sort()
3581
3582 if not proposal:
vapiera7fbd5a2016-06-16 09:17:49 -07003583 print('No branches with closed codereview issues found.')
kmarshall3bff56b2016-06-06 18:31:47 -07003584 return 0
3585
3586 current_branch = GetCurrentBranch()
3587
vapiera7fbd5a2016-06-16 09:17:49 -07003588 print('\nBranches with closed issues that will be archived:\n')
kmarshall9249e012016-08-23 12:02:16 -07003589 if options.notags:
3590 for next_item in proposal:
3591 print(' ' + next_item[0])
3592 else:
3593 print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
3594 for next_item in proposal:
3595 print('%*s %s' % (alignment, next_item[0], next_item[1]))
kmarshall3bff56b2016-06-06 18:31:47 -07003596
kmarshall9249e012016-08-23 12:02:16 -07003597 # Quit now on precondition failure or if instructed by the user, either
3598 # via an interactive prompt or by command line flags.
3599 if options.dry_run:
3600 print('\nNo changes were made (dry run).\n')
3601 return 0
3602 elif any(branch == current_branch for branch, _ in proposal):
kmarshall3bff56b2016-06-06 18:31:47 -07003603 print('You are currently on a branch \'%s\' which is associated with a '
3604 'closed codereview issue, so archive cannot proceed. Please '
3605 'checkout another branch and run this command again.' %
3606 current_branch)
3607 return 1
kmarshall9249e012016-08-23 12:02:16 -07003608 elif not options.force:
sergiyb4a5ecbe2016-06-20 09:46:00 -07003609 answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
3610 if answer not in ('y', ''):
vapiera7fbd5a2016-06-16 09:17:49 -07003611 print('Aborted.')
kmarshall3bff56b2016-06-06 18:31:47 -07003612 return 1
3613
3614 for branch, tagname in proposal:
kmarshall9249e012016-08-23 12:02:16 -07003615 if not options.notags:
3616 RunGit(['tag', tagname, branch])
kmarshall3bff56b2016-06-06 18:31:47 -07003617 RunGit(['branch', '-D', branch])
kmarshall9249e012016-08-23 12:02:16 -07003618
vapiera7fbd5a2016-06-16 09:17:49 -07003619 print('\nJob\'s done!')
kmarshall3bff56b2016-06-06 18:31:47 -07003620
3621 return 0
3622
3623
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003624def CMDstatus(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003625 """Show status of changelists.
3626
3627 Colors are used to tell the state of the CL unless --fast is used:
jsbell@chromium.orgaeab41a2013-12-10 20:01:22 +00003628 - Red not sent for review or broken
3629 - Blue waiting for review
3630 - Yellow waiting for you to reply to review
3631 - Green LGTM'ed
3632 - Magenta in the commit queue
3633 - Cyan was committed, branch can be deleted
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003634
3635 Also see 'git cl comments'.
3636 """
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003637 parser.add_option('--field',
phajdan.jr289d03e2016-08-16 08:21:06 -07003638 help='print only specific field (desc|id|patch|status|url)')
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003639 parser.add_option('-f', '--fast', action='store_true',
3640 help='Do not retrieve review status')
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003641 parser.add_option(
3642 '-j', '--maxjobs', action='store', type=int,
3643 help='The maximum number of jobs to use when retrieving review status')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003644
3645 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07003646 _add_codereview_issue_select_options(
3647 parser, 'Must be in conjunction with --field.')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003648 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07003649 _process_codereview_issue_select_options(parser, options)
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003650 if args:
3651 parser.error('Unsupported args: %s' % args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003652 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003653
iannuccie53c9352016-08-17 14:40:40 -07003654 if options.issue is not None and not options.field:
3655 parser.error('--field must be specified with --issue')
iannucci3c972b92016-08-17 13:24:10 -07003656
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003657 if options.field:
iannucci3c972b92016-08-17 13:24:10 -07003658 cl = Changelist(auth_config=auth_config, issue=options.issue,
3659 codereview=options.forced_codereview)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003660 if options.field.startswith('desc'):
vapiera7fbd5a2016-06-16 09:17:49 -07003661 print(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003662 elif options.field == 'id':
3663 issueid = cl.GetIssue()
3664 if issueid:
vapiera7fbd5a2016-06-16 09:17:49 -07003665 print(issueid)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003666 elif options.field == 'patch':
3667 patchset = cl.GetPatchset()
3668 if patchset:
vapiera7fbd5a2016-06-16 09:17:49 -07003669 print(patchset)
phajdan.jr289d03e2016-08-16 08:21:06 -07003670 elif options.field == 'status':
3671 print(cl.GetStatus())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003672 elif options.field == 'url':
3673 url = cl.GetIssueURL()
3674 if url:
vapiera7fbd5a2016-06-16 09:17:49 -07003675 print(url)
maruel@chromium.orge25c75b2013-07-23 18:30:56 +00003676 return 0
3677
3678 branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
3679 if not branches:
3680 print('No local branch found.')
3681 return 0
3682
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003683 changes = [
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003684 Changelist(branchref=b, auth_config=auth_config)
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003685 for b in branches.splitlines()]
vapiera7fbd5a2016-06-16 09:17:49 -07003686 print('Branches associated with reviews:')
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003687 output = get_cl_statuses(changes,
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003688 fine_grained=not options.fast,
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003689 max_processes=options.maxjobs)
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003690
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003691 branch_statuses = {}
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003692 alignment = max(5, max(len(ShortBranchName(c.GetBranch())) for c in changes))
3693 for cl in sorted(changes, key=lambda c: c.GetBranch()):
3694 branch = cl.GetBranch()
calamity@chromium.orgffde55c2015-03-12 00:44:17 +00003695 while branch not in branch_statuses:
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003696 c, status = output.next()
3697 branch_statuses[c.GetBranch()] = status
3698 status = branch_statuses.pop(branch)
3699 url = cl.GetIssueURL()
3700 if url and (not status or status == 'error'):
3701 # The issue probably doesn't exist anymore.
3702 url += ' (broken)'
3703
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003704 color = color_for_status(status)
maruel@chromium.org885f6512013-07-27 02:17:26 +00003705 reset = Fore.RESET
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00003706 if not setup_color.IS_TTY:
maruel@chromium.org885f6512013-07-27 02:17:26 +00003707 color = ''
3708 reset = ''
nodir@chromium.orga6de1f42015-06-10 04:23:17 +00003709 status_str = '(%s)' % status if status else ''
vapiera7fbd5a2016-06-16 09:17:49 -07003710 print(' %*s : %s%s %s%s' % (
clemensh@chromium.orgcbd7dc32016-05-31 10:33:50 +00003711 alignment, ShortBranchName(branch), color, url,
vapiera7fbd5a2016-06-16 09:17:49 -07003712 status_str, reset))
maruel@chromium.org1033efd2013-07-23 23:25:09 +00003713
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003714 cl = Changelist(auth_config=auth_config)
vapiera7fbd5a2016-06-16 09:17:49 -07003715 print()
3716 print('Current branch:',)
3717 print(cl.GetBranch())
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003718 if not cl.GetIssue():
vapiera7fbd5a2016-06-16 09:17:49 -07003719 print('No issue assigned.')
dpranke@chromium.orgee87f582015-07-31 18:46:25 +00003720 return 0
vapiera7fbd5a2016-06-16 09:17:49 -07003721 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
maruel@chromium.org85616e02014-07-28 15:37:55 +00003722 if not options.fast:
vapiera7fbd5a2016-06-16 09:17:49 -07003723 print('Issue description:')
3724 print(cl.GetDescription(pretty=True))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003725 return 0
3726
3727
maruel@chromium.org39c0b222013-08-17 16:57:01 +00003728def colorize_CMDstatus_doc():
3729 """To be called once in main() to add colors to git cl status help."""
3730 colors = [i for i in dir(Fore) if i[0].isupper()]
3731
3732 def colorize_line(line):
3733 for color in colors:
3734 if color in line.upper():
3735 # Extract whitespaces first and the leading '-'.
3736 indent = len(line) - len(line.lstrip(' ')) + 1
3737 return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
3738 return line
3739
3740 lines = CMDstatus.__doc__.splitlines()
3741 CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
3742
3743
phajdan.jre328cf92016-08-22 04:12:17 -07003744def write_json(path, contents):
3745 with open(path, 'w') as f:
3746 json.dump(contents, f)
3747
3748
maruel@chromium.org0633fb42013-08-16 20:06:14 +00003749@subcommand.usage('[issue_number]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003750def CMDissue(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003751 """Sets or displays the current code review issue number.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003752
3753 Pass issue number 0 to clear the current issue.
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003754 """
dnj@chromium.org406c4402015-03-03 17:22:28 +00003755 parser.add_option('-r', '--reverse', action='store_true',
3756 help='Lookup the branch(es) for the specified issues. If '
3757 'no issues are specified, all branches with mapped '
3758 'issues will be listed.')
phajdan.jre328cf92016-08-22 04:12:17 -07003759 parser.add_option('--json', help='Path to JSON output file.')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003760 _add_codereview_select_options(parser)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003761 options, args = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003762 _process_codereview_select_options(parser, options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003763
dnj@chromium.org406c4402015-03-03 17:22:28 +00003764 if options.reverse:
3765 branches = RunGit(['for-each-ref', 'refs/heads',
3766 '--format=%(refname:short)']).splitlines()
3767
3768 # Reverse issue lookup.
3769 issue_branch_map = {}
3770 for branch in branches:
3771 cl = Changelist(branchref=branch)
3772 issue_branch_map.setdefault(cl.GetIssue(), []).append(branch)
3773 if not args:
3774 args = sorted(issue_branch_map.iterkeys())
phajdan.jre328cf92016-08-22 04:12:17 -07003775 result = {}
dnj@chromium.org406c4402015-03-03 17:22:28 +00003776 for issue in args:
3777 if not issue:
3778 continue
phajdan.jre328cf92016-08-22 04:12:17 -07003779 result[int(issue)] = issue_branch_map.get(int(issue))
vapiera7fbd5a2016-06-16 09:17:49 -07003780 print('Branch for issue number %s: %s' % (
3781 issue, ', '.join(issue_branch_map.get(int(issue)) or ('None',))))
phajdan.jre328cf92016-08-22 04:12:17 -07003782 if options.json:
3783 write_json(options.json, result)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003784 else:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00003785 cl = Changelist(codereview=options.forced_codereview)
dnj@chromium.org406c4402015-03-03 17:22:28 +00003786 if len(args) > 0:
3787 try:
3788 issue = int(args[0])
3789 except ValueError:
3790 DieWithError('Pass a number to set the issue or none to list it.\n'
tandrii@chromium.org8930b3d2016-04-13 14:47:02 +00003791 'Maybe you want to run git cl status?')
dnj@chromium.org406c4402015-03-03 17:22:28 +00003792 cl.SetIssue(issue)
vapiera7fbd5a2016-06-16 09:17:49 -07003793 print('Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL()))
phajdan.jre328cf92016-08-22 04:12:17 -07003794 if options.json:
3795 write_json(options.json, {
3796 'issue': cl.GetIssue(),
3797 'issue_url': cl.GetIssueURL(),
3798 })
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003799 return 0
3800
3801
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003802def CMDcomments(parser, args):
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003803 """Shows or posts review comments for any changelist."""
3804 parser.add_option('-a', '--add-comment', dest='comment',
3805 help='comment to add to an issue')
3806 parser.add_option('-i', dest='issue',
3807 help="review issue id (defaults to current issue)")
smut@google.comc85ac942015-09-15 16:34:43 +00003808 parser.add_option('-j', '--json-file',
3809 help='File to write JSON summary to')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003810 auth.add_auth_options(parser)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003811 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003812 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003813
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003814 issue = None
3815 if options.issue:
3816 try:
3817 issue = int(options.issue)
3818 except ValueError:
3819 DieWithError('A review issue id is expected to be a number')
3820
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00003821 cl = Changelist(issue=issue, codereview='rietveld', auth_config=auth_config)
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003822
3823 if options.comment:
3824 cl.AddComment(options.comment)
3825 return 0
3826
3827 data = cl.GetIssueProperties()
smut@google.comc85ac942015-09-15 16:34:43 +00003828 summary = []
maruel@chromium.org5cab2d32014-11-11 18:32:41 +00003829 for message in sorted(data.get('messages', []), key=lambda x: x['date']):
smut@google.comc85ac942015-09-15 16:34:43 +00003830 summary.append({
3831 'date': message['date'],
3832 'lgtm': False,
3833 'message': message['text'],
3834 'not_lgtm': False,
3835 'sender': message['sender'],
3836 })
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003837 if message['disapproval']:
3838 color = Fore.RED
smut@google.comc85ac942015-09-15 16:34:43 +00003839 summary[-1]['not lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003840 elif message['approval']:
3841 color = Fore.GREEN
smut@google.comc85ac942015-09-15 16:34:43 +00003842 summary[-1]['lgtm'] = True
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003843 elif message['sender'] == data['owner_email']:
3844 color = Fore.MAGENTA
3845 else:
3846 color = Fore.BLUE
vapiera7fbd5a2016-06-16 09:17:49 -07003847 print('\n%s%s %s%s' % (
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003848 color, message['date'].split('.', 1)[0], message['sender'],
vapiera7fbd5a2016-06-16 09:17:49 -07003849 Fore.RESET))
apavlov@chromium.orge4efd512014-11-05 09:05:29 +00003850 if message['text'].strip():
vapiera7fbd5a2016-06-16 09:17:49 -07003851 print('\n'.join(' ' + l for l in message['text'].splitlines()))
smut@google.comc85ac942015-09-15 16:34:43 +00003852 if options.json_file:
3853 with open(options.json_file, 'wb') as f:
3854 json.dump(summary, f)
maruel@chromium.org9977a2e2012-06-06 22:30:56 +00003855 return 0
3856
3857
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003858@subcommand.usage('[codereview url or issue id]')
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003859def CMDdescription(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003860 """Brings up the editor for the current CL's description."""
smut@google.com34fb6b12015-07-13 20:03:26 +00003861 parser.add_option('-d', '--display', action='store_true',
3862 help='Display the description instead of opening an editor')
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003863 parser.add_option('-n', '--new-description',
dnjba1b0f32016-09-02 12:37:42 -07003864 help='New description to set for this issue (- for stdin, '
3865 '+ to load from local commit HEAD)')
dsansomee2d6fd92016-09-08 00:10:47 -07003866 parser.add_option('-f', '--force', action='store_true',
3867 help='Delete any unpublished Gerrit edits for this issue '
3868 'without prompting')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003869
3870 _add_codereview_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003871 auth.add_auth_options(parser)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003872 options, args = parser.parse_args(args)
3873 _process_codereview_select_options(parser, options)
3874
3875 target_issue = None
3876 if len(args) > 0:
martiniss6eda05f2016-06-30 10:18:35 -07003877 target_issue = ParseIssueNumberArgument(args[0])
3878 if not target_issue.valid:
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003879 parser.print_help()
3880 return 1
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003881
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003882 auth_config = auth.extract_auth_config_from_options(options)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003883
martiniss6eda05f2016-06-30 10:18:35 -07003884 kwargs = {
3885 'auth_config': auth_config,
3886 'codereview': options.forced_codereview,
3887 }
3888 if target_issue:
3889 kwargs['issue'] = target_issue.issue
3890 if options.forced_codereview == 'rietveld':
3891 kwargs['rietveld_server'] = target_issue.hostname
3892
3893 cl = Changelist(**kwargs)
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00003894
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003895 if not cl.GetIssue():
3896 DieWithError('This branch has no associated changelist.')
3897 description = ChangeDescription(cl.GetDescription())
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003898
smut@google.com34fb6b12015-07-13 20:03:26 +00003899 if options.display:
vapiera7fbd5a2016-06-16 09:17:49 -07003900 print(description.description)
smut@google.com34fb6b12015-07-13 20:03:26 +00003901 return 0
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003902
3903 if options.new_description:
3904 text = options.new_description
3905 if text == '-':
3906 text = '\n'.join(l.rstrip() for l in sys.stdin)
dnjba1b0f32016-09-02 12:37:42 -07003907 elif text == '+':
3908 base_branch = cl.GetCommonAncestorWithUpstream()
3909 change = cl.GetChange(base_branch, None, local_description=True)
3910 text = change.FullDescriptionText()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00003911
3912 description.set_description(text)
3913 else:
3914 description.prompt()
3915
wychen@chromium.org063e4e52015-04-03 06:51:44 +00003916 if cl.GetDescription() != description.description:
dsansomee2d6fd92016-09-08 00:10:47 -07003917 cl.UpdateDescription(description.description, force=options.force)
rsesek@chromium.orgeec76592013-05-20 16:27:57 +00003918 return 0
3919
3920
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003921def CreateDescriptionFromLog(args):
3922 """Pulls out the commit log to use as a base for the CL description."""
3923 log_args = []
3924 if len(args) == 1 and not args[0].endswith('.'):
3925 log_args = [args[0] + '..']
3926 elif len(args) == 1 and args[0].endswith('...'):
3927 log_args = [args[0][:-1]]
3928 elif len(args) == 2:
3929 log_args = [args[0] + '..' + args[1]]
3930 else:
3931 log_args = args[:] # Hope for the best!
maruel@chromium.org373af802012-05-25 21:07:33 +00003932 return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003933
3934
thestig@chromium.org44202a22014-03-11 19:22:18 +00003935def CMDlint(parser, args):
3936 """Runs cpplint on the current changelist."""
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003937 parser.add_option('--filter', action='append', metavar='-x,+y',
3938 help='Comma-separated list of cpplint\'s category-filters')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003939 auth.add_auth_options(parser)
3940 options, args = parser.parse_args(args)
3941 auth_config = auth.extract_auth_config_from_options(options)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003942
3943 # Access to a protected member _XX of a client class
3944 # pylint: disable=W0212
3945 try:
3946 import cpplint
3947 import cpplint_chromium
3948 except ImportError:
vapiera7fbd5a2016-06-16 09:17:49 -07003949 print('Your depot_tools is missing cpplint.py and/or cpplint_chromium.py.')
thestig@chromium.org44202a22014-03-11 19:22:18 +00003950 return 1
3951
3952 # Change the current working directory before calling lint so that it
3953 # shows the correct base.
3954 previous_cwd = os.getcwd()
3955 os.chdir(settings.GetRoot())
3956 try:
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003957 cl = Changelist(auth_config=auth_config)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003958 change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
3959 files = [f.LocalPath() for f in change.AffectedFiles()]
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003960 if not files:
vapiera7fbd5a2016-06-16 09:17:49 -07003961 print('Cannot lint an empty CL')
thestig@chromium.org5839eb52014-05-30 16:20:51 +00003962 return 1
thestig@chromium.org44202a22014-03-11 19:22:18 +00003963
3964 # Process cpplints arguments if any.
tzik@chromium.orgf204d4b2014-03-13 07:40:55 +00003965 command = args + files
3966 if options.filter:
3967 command = ['--filter=' + ','.join(options.filter)] + command
3968 filenames = cpplint.ParseArguments(command)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003969
3970 white_regex = re.compile(settings.GetLintRegex())
3971 black_regex = re.compile(settings.GetLintIgnoreRegex())
3972 extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
3973 for filename in filenames:
3974 if white_regex.match(filename):
3975 if black_regex.match(filename):
vapiera7fbd5a2016-06-16 09:17:49 -07003976 print('Ignoring file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003977 else:
3978 cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
3979 extra_check_functions)
3980 else:
vapiera7fbd5a2016-06-16 09:17:49 -07003981 print('Skipping file %s' % filename)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003982 finally:
3983 os.chdir(previous_cwd)
vapiera7fbd5a2016-06-16 09:17:49 -07003984 print('Total errors found: %d\n' % cpplint._cpplint_state.error_count)
thestig@chromium.org44202a22014-03-11 19:22:18 +00003985 if cpplint._cpplint_state.error_count != 0:
3986 return 1
3987 return 0
3988
3989
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003990def CMDpresubmit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00003991 """Runs presubmit tests on the current changelist."""
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003992 parser.add_option('-u', '--upload', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003993 help='Run upload hook instead of the push/dcommit hook')
ilevy@chromium.org375a9022013-01-07 01:12:05 +00003994 parser.add_option('-f', '--force', action='store_true',
sbc@chromium.org495ad152012-09-04 23:07:42 +00003995 help='Run checks even if tree is dirty')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00003996 auth.add_auth_options(parser)
3997 options, args = parser.parse_args(args)
3998 auth_config = auth.extract_auth_config_from_options(options)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00003999
sbc@chromium.org71437c02015-04-09 19:29:40 +00004000 if not options.force and git_common.is_dirty_git_tree('presubmit'):
vapiera7fbd5a2016-06-16 09:17:49 -07004001 print('use --force to check even if tree is dirty.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004002 return 1
4003
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004004 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004005 if args:
4006 base_branch = args[0]
4007 else:
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004008 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004009 base_branch = cl.GetCommonAncestorWithUpstream()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004010
ilevy@chromium.org051ad0e2013-03-04 21:57:34 +00004011 cl.RunHook(
4012 committing=not options.upload,
4013 may_prompt=False,
4014 verbose=options.verbose,
4015 change=cl.GetChange(base_branch, None))
dpranke@chromium.org0a2bb372011-03-25 01:16:22 +00004016 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004017
4018
tandrii@chromium.org65874e12016-03-04 12:03:02 +00004019def GenerateGerritChangeId(message):
4020 """Returns Ixxxxxx...xxx change id.
4021
4022 Works the same way as
4023 https://gerrit-review.googlesource.com/tools/hooks/commit-msg
4024 but can be called on demand on all platforms.
4025
4026 The basic idea is to generate git hash of a state of the tree, original commit
4027 message, author/committer info and timestamps.
4028 """
4029 lines = []
4030 tree_hash = RunGitSilent(['write-tree'])
4031 lines.append('tree %s' % tree_hash.strip())
4032 code, parent = RunGitWithCode(['rev-parse', 'HEAD~0'], suppress_stderr=False)
4033 if code == 0:
4034 lines.append('parent %s' % parent.strip())
4035 author = RunGitSilent(['var', 'GIT_AUTHOR_IDENT'])
4036 lines.append('author %s' % author.strip())
4037 committer = RunGitSilent(['var', 'GIT_COMMITTER_IDENT'])
4038 lines.append('committer %s' % committer.strip())
4039 lines.append('')
4040 # Note: Gerrit's commit-hook actually cleans message of some lines and
4041 # whitespace. This code is not doing this, but it clearly won't decrease
4042 # entropy.
4043 lines.append(message)
4044 change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
4045 stdin='\n'.join(lines))
4046 return 'I%s' % change_hash.strip()
4047
4048
wittman@chromium.org455dc922015-01-26 20:15:50 +00004049def GetTargetRef(remote, remote_branch, target_branch, pending_prefix):
4050 """Computes the remote branch ref to use for the CL.
4051
4052 Args:
4053 remote (str): The git remote for the CL.
4054 remote_branch (str): The git remote branch for the CL.
4055 target_branch (str): The target branch specified by the user.
4056 pending_prefix (str): The pending prefix from the settings.
4057 """
4058 if not (remote and remote_branch):
4059 return None
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004060
wittman@chromium.org455dc922015-01-26 20:15:50 +00004061 if target_branch:
4062 # Cannonicalize branch references to the equivalent local full symbolic
4063 # refs, which are then translated into the remote full symbolic refs
4064 # below.
4065 if '/' not in target_branch:
4066 remote_branch = 'refs/remotes/%s/%s' % (remote, target_branch)
4067 else:
4068 prefix_replacements = (
4069 ('^((refs/)?remotes/)?branch-heads/', 'refs/remotes/branch-heads/'),
4070 ('^((refs/)?remotes/)?%s/' % remote, 'refs/remotes/%s/' % remote),
4071 ('^(refs/)?heads/', 'refs/remotes/%s/' % remote),
4072 )
4073 match = None
4074 for regex, replacement in prefix_replacements:
4075 match = re.search(regex, target_branch)
4076 if match:
4077 remote_branch = target_branch.replace(match.group(0), replacement)
4078 break
4079 if not match:
4080 # This is a branch path but not one we recognize; use as-is.
4081 remote_branch = target_branch
rmistry@google.comc68112d2015-03-03 12:48:06 +00004082 elif remote_branch in REFS_THAT_ALIAS_TO_OTHER_REFS:
4083 # Handle the refs that need to land in different refs.
4084 remote_branch = REFS_THAT_ALIAS_TO_OTHER_REFS[remote_branch]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004085
wittman@chromium.org455dc922015-01-26 20:15:50 +00004086 # Create the true path to the remote branch.
4087 # Does the following translation:
4088 # * refs/remotes/origin/refs/diff/test -> refs/diff/test
4089 # * refs/remotes/origin/master -> refs/heads/master
4090 # * refs/remotes/branch-heads/test -> refs/branch-heads/test
4091 if remote_branch.startswith('refs/remotes/%s/refs/' % remote):
4092 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote, '')
4093 elif remote_branch.startswith('refs/remotes/%s/' % remote):
4094 remote_branch = remote_branch.replace('refs/remotes/%s/' % remote,
4095 'refs/heads/')
4096 elif remote_branch.startswith('refs/remotes/branch-heads'):
4097 remote_branch = remote_branch.replace('refs/remotes/', 'refs/')
4098 # If a pending prefix exists then replace refs/ with it.
4099 if pending_prefix:
4100 remote_branch = remote_branch.replace('refs/', pending_prefix)
4101 return remote_branch
4102
4103
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004104def cleanup_list(l):
4105 """Fixes a list so that comma separated items are put as individual items.
4106
4107 So that "--reviewers joe@c,john@c --reviewers joa@c" results in
4108 options.reviewers == sorted(['joe@c', 'john@c', 'joa@c']).
4109 """
4110 items = sum((i.split(',') for i in l), [])
4111 stripped_items = (i.strip() for i in items)
4112 return sorted(filter(None, stripped_items))
4113
4114
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004115@subcommand.usage('[args to "git diff"]')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004116def CMDupload(parser, args):
rmistry@google.com78948ed2015-07-08 23:09:57 +00004117 """Uploads the current changelist to codereview.
4118
4119 Can skip dependency patchset uploads for a branch by running:
4120 git config branch.branch_name.skip-deps-uploads True
4121 To unset run:
4122 git config --unset branch.branch_name.skip-deps-uploads
4123 Can also set the above globally by using the --global flag.
4124 """
ukai@chromium.orge8077812012-02-03 03:41:46 +00004125 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4126 help='bypass upload presubmit hook')
brettw@chromium.orgb65c43c2013-06-10 22:04:49 +00004127 parser.add_option('--bypass-watchlists', action='store_true',
4128 dest='bypass_watchlists',
4129 help='bypass watchlists auto CC-ing reviewers')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004130 parser.add_option('-f', action='store_true', dest='force',
4131 help="force yes to questions (don't prompt)")
rogerta@chromium.org420d3b82012-05-14 18:41:38 +00004132 parser.add_option('-m', dest='message', help='message for patchset')
tandriif9aefb72016-07-01 09:06:51 -07004133 parser.add_option('-b', '--bug',
4134 help='pre-populate the bug number(s) for this issue. '
4135 'If several, separate with commas')
tandriib80458a2016-06-23 12:20:07 -07004136 parser.add_option('--message-file', dest='message_file',
4137 help='file which contains message for patchset')
andybons@chromium.org962f9462016-02-03 20:00:42 +00004138 parser.add_option('-t', dest='title',
4139 help='title for patchset (Rietveld only)')
ukai@chromium.orge8077812012-02-03 03:41:46 +00004140 parser.add_option('-r', '--reviewers',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004141 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004142 help='reviewer email addresses')
4143 parser.add_option('--cc',
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004144 action='append', default=[],
ukai@chromium.orge8077812012-02-03 03:41:46 +00004145 help='cc email addresses')
adamk@chromium.org36f47302013-04-05 01:08:31 +00004146 parser.add_option('-s', '--send-mail', action='store_true',
ukai@chromium.orge8077812012-02-03 03:41:46 +00004147 help='send email to reviewer immediately')
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004148 parser.add_option('--emulate_svn_auto_props',
4149 '--emulate-svn-auto-props',
4150 action="store_true",
ukai@chromium.orge8077812012-02-03 03:41:46 +00004151 dest="emulate_svn_auto_props",
4152 help="Emulate Subversion's auto properties feature.")
ukai@chromium.orge8077812012-02-03 03:41:46 +00004153 parser.add_option('-c', '--use-commit-queue', action='store_true',
4154 help='tell the commit queue to commit this patchset')
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +00004155 parser.add_option('--private', action='store_true',
4156 help='set the review private (rietveld only)')
ukai@chromium.org8ef7ab22012-11-28 04:24:52 +00004157 parser.add_option('--target_branch',
pgervais@chromium.orgb9f27512014-08-08 15:52:33 +00004158 '--target-branch',
wittman@chromium.org455dc922015-01-26 20:15:50 +00004159 metavar='TARGET',
4160 help='Apply CL to remote ref TARGET. ' +
4161 'Default: remote branch head, or master')
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00004162 parser.add_option('--squash', action='store_true',
4163 help='Squash multiple commits into one (Gerrit only)')
bauerb@chromium.org54b400c2016-01-14 10:08:25 +00004164 parser.add_option('--no-squash', action='store_true',
4165 help='Don\'t squash multiple commits into one ' +
4166 '(Gerrit only)')
rmistry9eadede2016-09-19 11:22:43 -07004167 parser.add_option('--topic', default=None,
4168 help='Topic to specify when uploading (Gerrit only)')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004169 parser.add_option('--email', default=None,
4170 help='email address to use to connect to Rietveld')
piman@chromium.org336f9122014-09-04 02:16:55 +00004171 parser.add_option('--tbr-owners', dest='tbr_owners', action='store_true',
4172 help='add a set of OWNERS to TBR')
tandrii@chromium.orgd50452a2015-11-23 16:38:15 +00004173 parser.add_option('-d', '--cq-dry-run', dest='cq_dry_run',
4174 action='store_true',
rmistry@google.comef966222015-04-07 11:15:01 +00004175 help='Send the patchset to do a CQ dry run right after '
4176 'upload.')
rmistry@google.com2dd99862015-06-22 12:22:18 +00004177 parser.add_option('--dependencies', action='store_true',
4178 help='Uploads CLs of all the local branches that depend on '
4179 'the current branch')
pgervais@chromium.org91141372014-01-09 23:27:20 +00004180
rmistry@google.com2dd99862015-06-22 12:22:18 +00004181 orig_args = args
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004182 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004183 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004184 _add_codereview_select_options(parser)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004185 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004186 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004187 auth_config = auth.extract_auth_config_from_options(options)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004188
sbc@chromium.org71437c02015-04-09 19:29:40 +00004189 if git_common.is_dirty_git_tree('upload'):
ukai@chromium.orge8077812012-02-03 03:41:46 +00004190 return 1
4191
maruel@chromium.orgeb52a5c2013-04-10 23:17:09 +00004192 options.reviewers = cleanup_list(options.reviewers)
4193 options.cc = cleanup_list(options.cc)
4194
tandriib80458a2016-06-23 12:20:07 -07004195 if options.message_file:
4196 if options.message:
4197 parser.error('only one of --message and --message-file allowed.')
4198 options.message = gclient_utils.FileRead(options.message_file)
4199 options.message_file = None
4200
tandrii4d0545a2016-07-06 03:56:49 -07004201 if options.cq_dry_run and options.use_commit_queue:
4202 parser.error('only one of --use-commit-queue and --cq-dry-run allowed.')
4203
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00004204 # For sanity of test expectations, do this otherwise lazy-loading *now*.
4205 settings.GetIsGerrit()
4206
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004207 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
tandrii@chromium.org9e6c3a52016-04-12 14:13:08 +00004208 return cl.CMDUpload(options, args, orig_args)
ukai@chromium.orge8077812012-02-03 03:41:46 +00004209
4210
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004211def IsSubmoduleMergeCommit(ref):
4212 # When submodules are added to the repo, we expect there to be a single
4213 # non-git-svn merge commit at remote HEAD with a signature comment.
4214 pattern = '^SVN changes up to revision [0-9]*$'
szager@chromium.orge84b7542012-06-15 21:26:58 +00004215 cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004216 return RunGit(cmd) != ''
4217
4218
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004219def SendUpstream(parser, args, cmd):
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004220 """Common code for CMDland and CmdDCommit
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004221
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00004222 In case of Gerrit, uses Gerrit REST api to "submit" the issue, which pushes
4223 upstream and closes the issue automatically and atomically.
4224
4225 Otherwise (in case of Rietveld):
4226 Squashes branch into a single commit.
4227 Updates changelog with metadata (e.g. pointer to review).
4228 Pushes/dcommits the code upstream.
4229 Updates review and closes.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004230 """
4231 parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
4232 help='bypass upload presubmit hook')
4233 parser.add_option('-m', dest='message',
4234 help="override review description")
4235 parser.add_option('-f', action='store_true', dest='force',
4236 help="force yes to questions (don't prompt)")
4237 parser.add_option('-c', dest='contributor',
4238 help="external contributor for patch (appended to " +
4239 "description and used as author for git). Should be " +
4240 "formatted as 'First Last <email@example.com>'")
iannucci@chromium.org53937ba2012-10-02 18:20:43 +00004241 add_git_similarity(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004242 auth.add_auth_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004243 (options, args) = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004244 auth_config = auth.extract_auth_config_from_options(options)
4245
4246 cl = Changelist(auth_config=auth_config)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004247
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00004248 # TODO(tandrii): refactor this into _RietveldChangelistImpl method.
4249 if cl.IsGerrit():
4250 if options.message:
4251 # This could be implemented, but it requires sending a new patch to
4252 # Gerrit, as Gerrit unlike Rietveld versions messages with patchsets.
4253 # Besides, Gerrit has the ability to change the commit message on submit
4254 # automatically, thus there is no need to support this option (so far?).
4255 parser.error('-m MESSAGE option is not supported for Gerrit.')
4256 if options.contributor:
4257 parser.error(
4258 '-c CONTRIBUTOR option is not supported for Gerrit.\n'
4259 'Before uploading a commit to Gerrit, ensure it\'s author field is '
4260 'the contributor\'s "name <email>". If you can\'t upload such a '
4261 'commit for review, contact your repository admin and request'
4262 '"Forge-Author" permission.')
tandrii73449b02016-09-14 06:27:24 -07004263 if not cl.GetIssue():
4264 DieWithError('You must upload the issue first to Gerrit.\n'
4265 ' If you would rather have `git cl land` upload '
4266 'automatically for you, see http://crbug.com/642759')
tandrii@chromium.orgd68b62b2016-03-31 16:09:29 +00004267 return cl._codereview_impl.CMDLand(options.force, options.bypass_hooks,
4268 options.verbose)
4269
iannucci@chromium.org5724c962014-04-11 09:32:56 +00004270 current = cl.GetBranch()
4271 remote, upstream_branch = cl.FetchUpstreamTuple(cl.GetBranch())
4272 if not settings.GetIsGitSvn() and remote == '.':
vapiera7fbd5a2016-06-16 09:17:49 -07004273 print()
4274 print('Attempting to push branch %r into another local branch!' % current)
4275 print()
4276 print('Either reparent this branch on top of origin/master:')
4277 print(' git reparent-branch --root')
4278 print()
4279 print('OR run `git rebase-update` if you think the parent branch is ')
4280 print('already committed.')
4281 print()
4282 print(' Current parent: %r' % upstream_branch)
iannucci@chromium.org5724c962014-04-11 09:32:56 +00004283 return 1
4284
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004285 if not args or cmd == 'land':
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004286 # Default to merging against our best guess of the upstream branch.
4287 args = [cl.GetUpstreamBranch()]
4288
maruel@chromium.org13f623c2011-07-22 16:02:23 +00004289 if options.contributor:
4290 if not re.match('^.*\s<\S+@\S+>$', options.contributor):
vapiera7fbd5a2016-06-16 09:17:49 -07004291 print("Please provide contibutor as 'First Last <email@example.com>'")
maruel@chromium.org13f623c2011-07-22 16:02:23 +00004292 return 1
4293
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004294 base_branch = args[0]
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004295 base_has_submodules = IsSubmoduleMergeCommit(base_branch)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004296
sbc@chromium.org71437c02015-04-09 19:29:40 +00004297 if git_common.is_dirty_git_tree(cmd):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004298 return 1
4299
4300 # This rev-list syntax means "show all commits not in my branch that
4301 # are in base_branch".
4302 upstream_commits = RunGit(['rev-list', '^' + cl.GetBranchRef(),
4303 base_branch]).splitlines()
4304 if upstream_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07004305 print('Base branch "%s" has %d commits '
4306 'not in this branch.' % (base_branch, len(upstream_commits)))
4307 print('Run "git merge %s" before attempting to %s.' % (base_branch, cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004308 return 1
4309
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004310 # This is the revision `svn dcommit` will commit on top of.
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004311 svn_head = None
4312 if cmd == 'dcommit' or base_has_submodules:
4313 svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
4314 '--pretty=format:%H'])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004315
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004316 if cmd == 'dcommit':
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004317 # If the base_head is a submodule merge commit, the first parent of the
4318 # base_head should be a git-svn commit, which is what we're interested in.
4319 base_svn_head = base_branch
4320 if base_has_submodules:
4321 base_svn_head += '^1'
4322
4323 extra_commits = RunGit(['rev-list', '^' + svn_head, base_svn_head])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004324 if extra_commits:
vapiera7fbd5a2016-06-16 09:17:49 -07004325 print('This branch has %d additional commits not upstreamed yet.'
4326 % len(extra_commits.splitlines()))
4327 print('Upstream "%s" or rebase this branch on top of the upstream trunk '
4328 'before attempting to %s.' % (base_branch, cmd))
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004329 return 1
4330
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004331 merge_base = RunGit(['merge-base', base_branch, 'HEAD']).strip()
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004332 if not options.bypass_hooks:
maruel@chromium.org13f623c2011-07-22 16:02:23 +00004333 author = None
4334 if options.contributor:
4335 author = re.search(r'\<(.*)\>', options.contributor).group(1)
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004336 hook_results = cl.RunHook(
4337 committing=True,
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004338 may_prompt=not options.force,
4339 verbose=options.verbose,
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004340 change=cl.GetChange(merge_base, author))
maruel@chromium.orgb0a63912012-01-17 18:10:16 +00004341 if not hook_results.should_continue():
4342 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004343
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004344 # Check the tree status if the tree status URL is set.
4345 status = GetTreeStatus()
4346 if 'closed' == status:
4347 print('The tree is closed. Please wait for it to reopen. Use '
4348 '"git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
4349 return 1
4350 elif 'unknown' == status:
4351 print('Unable to determine tree status. Please verify manually and '
4352 'use "git cl %s --bypass-hooks" to commit on a closed tree.' % cmd)
4353 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004354
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004355 change_desc = ChangeDescription(options.message)
4356 if not change_desc.description and cl.GetIssue():
4357 change_desc = ChangeDescription(cl.GetDescription())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004358
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004359 if not change_desc.description:
erg@chromium.org1a173982012-08-29 20:43:05 +00004360 if not cl.GetIssue() and options.bypass_hooks:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004361 change_desc = ChangeDescription(CreateDescriptionFromLog([merge_base]))
erg@chromium.org1a173982012-08-29 20:43:05 +00004362 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004363 print('No description set.')
4364 print('Visit %s/edit to set it.' % (cl.GetIssueURL()))
erg@chromium.org1a173982012-08-29 20:43:05 +00004365 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004366
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004367 # Keep a separate copy for the commit message, because the commit message
4368 # contains the link to the Rietveld issue, while the Rietveld message contains
4369 # the commit viewvc url.
maruel@chromium.orge52678e2013-04-26 18:34:44 +00004370 # Keep a separate copy for the commit message.
4371 if cl.GetIssue():
maruel@chromium.orgcf087782013-07-23 13:08:48 +00004372 change_desc.update_reviewers(cl.GetApprovingReviewers())
maruel@chromium.orge52678e2013-04-26 18:34:44 +00004373
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004374 commit_desc = ChangeDescription(change_desc.description)
maruel@chromium.orgcc73ad62011-07-06 17:39:26 +00004375 if cl.GetIssue():
smut@google.com4c61dcc2015-06-08 22:31:29 +00004376 # Xcode won't linkify this URL unless there is a non-whitespace character
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +00004377 # after it. Add a period on a new line to circumvent this. Also add a space
4378 # before the period to make sure that Gitiles continues to correctly resolve
4379 # the URL.
4380 commit_desc.append_footer('Review URL: %s .' % cl.GetIssueURL())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004381 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004382 commit_desc.append_footer('Patch from %s.' % options.contributor)
4383
agable@chromium.orgeec3ea32013-08-15 20:31:39 +00004384 print('Description:')
4385 print(commit_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004386
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004387 branches = [merge_base, cl.GetBranchRef()]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004388 if not options.force:
iannucci@chromium.org79540052012-10-19 23:15:26 +00004389 print_stats(options.similarity, options.find_copies, branches)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004390
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004391 # We want to squash all this branch's commits into one commit with the proper
4392 # description. We do this by doing a "reset --soft" to the base branch (which
4393 # keeps the working copy the same), then dcommitting that. If origin/master
4394 # has a submodule merge commit, we'll also need to cherry-pick the squashed
4395 # commit onto a branch based on the git-svn head.
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004396 MERGE_BRANCH = 'git-cl-commit'
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004397 CHERRY_PICK_BRANCH = 'git-cl-cherry-pick'
4398 # Delete the branches if they exist.
4399 for branch in [MERGE_BRANCH, CHERRY_PICK_BRANCH]:
4400 showref_cmd = ['show-ref', '--quiet', '--verify', 'refs/heads/%s' % branch]
4401 result = RunGitWithCode(showref_cmd)
4402 if result[0] == 0:
4403 RunGit(['branch', '-D', branch])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004404
4405 # We might be in a directory that's present in this branch but not in the
4406 # trunk. Move up to the top of the tree so that git commands that expect a
4407 # valid CWD won't fail after we check out the merge branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004408 rel_base_path = settings.GetRelativeRoot()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004409 if rel_base_path:
4410 os.chdir(rel_base_path)
4411
4412 # Stuff our change into the merge branch.
4413 # We wrap in a try...finally block so if anything goes wrong,
4414 # we clean up the branches.
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004415 retcode = -1
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004416 pushed_to_pending = False
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004417 pending_ref = None
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004418 revision = None
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004419 try:
bauerb@chromium.orgb4a75c42011-03-08 08:35:38 +00004420 RunGit(['checkout', '-q', '-b', MERGE_BRANCH])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004421 RunGit(['reset', '--soft', merge_base])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004422 if options.contributor:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004423 RunGit(
4424 [
4425 'commit', '--author', options.contributor,
4426 '-m', commit_desc.description,
4427 ])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004428 else:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004429 RunGit(['commit', '-m', commit_desc.description])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004430 if base_has_submodules:
4431 cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip()
4432 RunGit(['branch', CHERRY_PICK_BRANCH, svn_head])
4433 RunGit(['checkout', CHERRY_PICK_BRANCH])
4434 RunGit(['cherry-pick', cherry_pick_commit])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004435 if cmd == 'land':
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00004436 remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004437 mirror = settings.GetGitMirror(remote)
4438 pushurl = mirror.url if mirror else remote
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004439 pending_prefix = settings.GetPendingRefPrefix()
4440 if not pending_prefix or branch.startswith(pending_prefix):
4441 # If not using refs/pending/heads/* at all, or target ref is already set
4442 # to pending, then push to the target ref directly.
4443 retcode, output = RunGitWithCode(
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004444 ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004445 pushed_to_pending = pending_prefix and branch.startswith(pending_prefix)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004446 else:
4447 # Cherry-pick the change on top of pending ref and then push it.
4448 assert branch.startswith('refs/'), branch
4449 assert pending_prefix[-1] == '/', pending_prefix
4450 pending_ref = pending_prefix + branch[len('refs/'):]
tandriibf429402016-09-14 07:09:12 -07004451 retcode, output = PushToGitPending(pushurl, pending_ref)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004452 pushed_to_pending = (retcode == 0)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004453 if retcode == 0:
4454 revision = RunGit(['rev-parse', 'HEAD']).strip()
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004455 else:
4456 # dcommit the merge branch.
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00004457 cmd_args = [
kjellander@chromium.org6abc6522014-12-02 07:34:49 +00004458 'svn', 'dcommit',
4459 '-C%s' % options.similarity,
4460 '--no-rebase', '--rmdir',
4461 ]
4462 if settings.GetForceHttpsCommitUrl():
4463 # Allow forcing https commit URLs for some projects that don't allow
4464 # committing to http URLs (like Google Code).
4465 remote_url = cl.GetGitSvnRemoteUrl()
4466 if urlparse.urlparse(remote_url).scheme == 'http':
4467 remote_url = remote_url.replace('http://', 'https://')
iannucci@chromium.orga1950c42014-12-05 22:15:56 +00004468 cmd_args.append('--commit-url=%s' % remote_url)
4469 _, output = RunGitWithCode(cmd_args)
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004470 if 'Committed r' in output:
4471 revision = re.match(
4472 '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
4473 logging.debug(output)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004474 finally:
4475 # And then swap back to the original branch and clean up.
4476 RunGit(['checkout', '-q', cl.GetBranch()])
4477 RunGit(['branch', '-D', MERGE_BRANCH])
szager@chromium.org9bb85e22012-06-13 20:28:23 +00004478 if base_has_submodules:
4479 RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004480
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004481 if not revision:
vapiera7fbd5a2016-06-16 09:17:49 -07004482 print('Failed to push. If this persists, please file a bug.')
iannucci@chromium.org34504a12014-08-29 23:51:37 +00004483 return 1
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004484
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004485 killed = False
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004486 if pushed_to_pending:
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004487 try:
4488 revision = WaitForRealCommit(remote, revision, base_branch, branch)
4489 # We set pushed_to_pending to False, since it made it all the way to the
4490 # real ref.
4491 pushed_to_pending = False
4492 except KeyboardInterrupt:
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004493 killed = True
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004494
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004495 if cl.GetIssue():
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004496 to_pending = ' to pending queue' if pushed_to_pending else ''
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004497 viewvc_url = settings.GetViewVCUrl()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004498 if not to_pending:
4499 if viewvc_url and revision:
4500 change_desc.append_footer(
4501 'Committed: %s%s' % (viewvc_url, revision))
4502 elif revision:
4503 change_desc.append_footer('Committed: %s' % (revision,))
vapiera7fbd5a2016-06-16 09:17:49 -07004504 print('Closing issue '
4505 '(you may be prompted for your codereview password)...')
maruel@chromium.org78936cb2013-04-11 00:17:52 +00004506 cl.UpdateDescription(change_desc.description)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004507 cl.CloseIssue()
maruel@chromium.org1033efd2013-07-23 23:25:09 +00004508 props = cl.GetIssueProperties()
sadrul@chromium.org34b5d822013-02-18 01:39:24 +00004509 patch_num = len(props['patchsets'])
rmistry@google.com52d224a2014-08-27 14:44:41 +00004510 comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
mark@chromium.org782570c2014-09-26 21:48:02 +00004511 patch_num, props['patchsets'][-1], to_pending, revision)
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004512 if options.bypass_hooks:
4513 comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
4514 else:
4515 comment += ' (presubmit successful).'
iannucci@chromium.orgb85a3162013-01-26 01:11:13 +00004516 cl.RpcServer().add_comment(cl.GetIssue(), comment)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004517
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004518 if pushed_to_pending:
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004519 _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
vapiera7fbd5a2016-06-16 09:17:49 -07004520 print('The commit is in the pending queue (%s).' % pending_ref)
4521 print('It will show up on %s in ~1 min, once it gets a Cr-Commit-Position '
4522 'footer.' % branch)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004523
iannucci@chromium.org6c217b12014-08-29 22:10:59 +00004524 hook = POSTUPSTREAM_HOOK_PATTERN % cmd
4525 if os.path.isfile(hook):
4526 RunCommand([hook, merge_base], error_ok=True)
maruel@chromium.org0ba7f962011-01-11 22:13:58 +00004527
iannucci@chromium.orgbbe9cc52014-09-05 18:25:51 +00004528 return 1 if killed else 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004529
4530
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004531def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
vapiera7fbd5a2016-06-16 09:17:49 -07004532 print()
4533 print('Waiting for commit to be landed on %s...' % real_ref)
4534 print('(If you are impatient, you may Ctrl-C once without harm)')
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004535 target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
4536 current_rev = RunGit(['rev-parse', local_base_ref]).strip()
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004537 mirror = settings.GetGitMirror(remote)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004538
4539 loop = 0
4540 while True:
4541 sys.stdout.write('fetching (%d)... \r' % loop)
4542 sys.stdout.flush()
4543 loop += 1
4544
szager@chromium.org151ebcf2016-03-09 01:08:25 +00004545 if mirror:
4546 mirror.populate()
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004547 RunGit(['retry', 'fetch', remote, real_ref], stderr=subprocess2.VOID)
4548 to_rev = RunGit(['rev-parse', 'FETCH_HEAD']).strip()
4549 commits = RunGit(['rev-list', '%s..%s' % (current_rev, to_rev)])
4550 for commit in commits.splitlines():
4551 if RunGit(['rev-parse', '%s:' % commit]).strip() == target_tree:
vapiera7fbd5a2016-06-16 09:17:49 -07004552 print('Found commit on %s' % real_ref)
iannucci@chromium.orge6896b52014-08-29 01:38:03 +00004553 return commit
4554
4555 current_rev = to_rev
4556
4557
tandriibf429402016-09-14 07:09:12 -07004558def PushToGitPending(remote, pending_ref):
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004559 """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
4560
4561 Returns:
4562 (retcode of last operation, output log of last operation).
4563 """
4564 assert pending_ref.startswith('refs/'), pending_ref
4565 local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):]
4566 cherry = RunGit(['rev-parse', 'HEAD']).strip()
4567 code = 0
4568 out = ''
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004569 max_attempts = 3
4570 attempts_left = max_attempts
4571 while attempts_left:
4572 if attempts_left != max_attempts:
vapiera7fbd5a2016-06-16 09:17:49 -07004573 print('Retrying, %d attempts left...' % (attempts_left - 1,))
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004574 attempts_left -= 1
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004575
4576 # Fetch. Retry fetch errors.
vapiera7fbd5a2016-06-16 09:17:49 -07004577 print('Fetching pending ref %s...' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004578 code, out = RunGitWithCode(
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004579 ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004580 if code:
vapiera7fbd5a2016-06-16 09:17:49 -07004581 print('Fetch failed with exit code %d.' % code)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004582 if out.strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004583 print(out.strip())
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004584 continue
4585
4586 # Try to cherry pick. Abort on merge conflicts.
vapiera7fbd5a2016-06-16 09:17:49 -07004587 print('Cherry-picking commit on top of pending ref...')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004588 RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004589 code, out = RunGitWithCode(['cherry-pick', cherry])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004590 if code:
vapiera7fbd5a2016-06-16 09:17:49 -07004591 print('Your patch doesn\'t apply cleanly to ref \'%s\', '
4592 'the following files have merge conflicts:' % pending_ref)
4593 print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
4594 print('Please rebase your patch and try again.')
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004595 RunGitWithCode(['cherry-pick', '--abort'])
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004596 return code, out
4597
4598 # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
vapiera7fbd5a2016-06-16 09:17:49 -07004599 print('Pushing commit to %s... It can take a while.' % pending_ref)
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004600 code, out = RunGitWithCode(
4601 ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
4602 if code == 0:
4603 # Success.
vapiera7fbd5a2016-06-16 09:17:49 -07004604 print('Commit pushed to pending ref successfully!')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004605 return code, out
4606
vapiera7fbd5a2016-06-16 09:17:49 -07004607 print('Push failed with exit code %d.' % code)
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004608 if out.strip():
vapiera7fbd5a2016-06-16 09:17:49 -07004609 print(out.strip())
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004610 if IsFatalPushFailure(out):
vapiera7fbd5a2016-06-16 09:17:49 -07004611 print('Fatal push error. Make sure your .netrc credentials and git '
4612 'user.email are correct and you have push access to the repo.')
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004613 return code, out
4614
vapiera7fbd5a2016-06-16 09:17:49 -07004615 print('All attempts to push to pending ref failed.')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004616 return code, out
4617
4618
vadimsh@chromium.org749fbd92014-08-26 21:57:53 +00004619def IsFatalPushFailure(push_stdout):
4620 """True if retrying push won't help."""
4621 return '(prohibited by Gerrit)' in push_stdout
4622
4623
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004624@subcommand.usage('[upstream branch to apply against]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004625def CMDdcommit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004626 """Commits the current changelist via git-svn."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004627 if not settings.GetIsGitSvn():
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004628 if git_footers.get_footer_svn_id():
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004629 # If it looks like previous commits were mirrored with git-svn.
agable3b9a5bb2016-09-22 11:32:08 -07004630 message = """This repository appears to be a git-svn mirror, but we
4631don't support git-svn mirrors anymore."""
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004632 else:
4633 message = """This doesn't appear to be an SVN repository.
4634If your project has a true, writeable git repository, you probably want to run
4635'git cl land' instead.
4636If your project has a git mirror of an upstream SVN master, you probably need
4637to run 'git svn init'.
4638
4639Using the wrong command might cause your commit to appear to succeed, and the
4640review to be closed, without actually landing upstream. If you choose to
4641proceed, please verify that the commit lands upstream as expected."""
thakis@chromium.orgcde3bb62011-01-20 01:16:14 +00004642 print(message)
maruel@chromium.org90541732011-04-01 17:54:18 +00004643 ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
tandrii3bb82ff2016-06-17 07:36:36 -07004644 print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n'
4645 'Please let us know of this project you are committing to:'
4646 ' http://crbug.com/600451')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004647 return SendUpstream(parser, args, 'dcommit')
4648
4649
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004650@subcommand.usage('[upstream branch to apply against]')
pgervais@chromium.orgcee6dc42014-05-07 17:04:03 +00004651def CMDland(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004652 """Commits the current changelist via git."""
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00004653 if settings.GetIsGitSvn() or git_footers.get_footer_svn_id():
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004654 print('This appears to be an SVN repository.')
4655 print('Are you sure you didn\'t mean \'git cl dcommit\'?')
mmoss@chromium.orgf0e41522015-06-10 19:52:01 +00004656 print('(Ignore if this is the first commit after migrating from svn->git)')
maruel@chromium.org90541732011-04-01 17:54:18 +00004657 ask_for_data('[Press enter to push or ctrl-C to quit]')
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +00004658 return SendUpstream(parser, args, 'land')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004659
4660
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004661@subcommand.usage('<patch url or issue id or issue url>')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004662def CMDpatch(parser, args):
marq@chromium.orge5e59002013-10-02 23:21:25 +00004663 """Patches in a code review."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004664 parser.add_option('-b', dest='newbranch',
4665 help='create a new branch off trunk for the patch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004666 parser.add_option('-f', '--force', action='store_true',
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004667 help='with -b, clobber any existing branch')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004668 parser.add_option('-d', '--directory', action='store', metavar='DIR',
4669 help='Change to the directory DIR immediately, '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004670 'before doing anything else. Rietveld only.')
qsr@chromium.org1ef44af2013-10-16 16:24:32 +00004671 parser.add_option('--reject', action='store_true',
tapted@chromium.org6a0b07c2013-07-10 01:29:19 +00004672 help='failed patches spew .rej files rather than '
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004673 'attempting a 3-way merge. Rietveld only.')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004674 parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004675 help='don\'t commit after patch applies. Rietveld only.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004676
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004677
4678 group = optparse.OptionGroup(
4679 parser,
4680 'Options for continuing work on the current issue uploaded from a '
4681 'different clone (e.g. different machine). Must be used independently '
4682 'from the other options. No issue number should be specified, and the '
4683 'branch must have an issue number associated with it')
4684 group.add_option('--reapply', action='store_true', dest='reapply',
4685 help='Reset the branch and reapply the issue.\n'
4686 'CAUTION: This will undo any local changes in this '
4687 'branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004688
4689 group.add_option('--pull', action='store_true', dest='pull',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004690 help='Performs a pull before reapplying.')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004691 parser.add_option_group(group)
4692
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004693 auth.add_auth_options(parser)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004694 _add_codereview_select_options(parser)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004695 (options, args) = parser.parse_args(args)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00004696 _process_codereview_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004697 auth_config = auth.extract_auth_config_from_options(options)
4698
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004699
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004700 if options.reapply :
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004701 if options.newbranch:
4702 parser.error('--reapply works on the current branch only')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004703 if len(args) > 0:
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004704 parser.error('--reapply implies no additional arguments')
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004705
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004706 cl = Changelist(auth_config=auth_config,
4707 codereview=options.forced_codereview)
4708 if not cl.GetIssue():
4709 parser.error('current branch must have an associated issue')
4710
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004711 upstream = cl.GetUpstreamBranch()
4712 if upstream == None:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004713 parser.error('No upstream branch specified. Cannot reset branch')
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004714
4715 RunGit(['reset', '--hard', upstream])
4716 if options.pull:
4717 RunGit(['pull'])
mtrofin@chromium.org1d88dd32016-02-04 16:25:12 +00004718
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004719 return cl.CMDPatchIssue(cl.GetIssue(), options.reject, options.nocommit,
4720 options.directory)
4721
4722 if len(args) != 1 or not args[0]:
4723 parser.error('Must specify issue number or url')
4724
4725 # We don't want uncommitted changes mixed up with the patch.
4726 if git_common.is_dirty_git_tree('patch'):
dsinclair@chromium.orgfbed6562015-09-25 21:22:36 +00004727 return 1
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004728
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004729 if options.newbranch:
4730 if options.force:
4731 RunGit(['branch', '-D', options.newbranch],
4732 stderr=subprocess2.PIPE, error_ok=True)
4733 RunGit(['new-branch', options.newbranch])
tandriidf09a462016-08-18 16:23:55 -07004734 elif not GetCurrentBranch():
4735 DieWithError('A branch is required to apply patch. Hint: use -b option.')
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004736
4737 cl = Changelist(auth_config=auth_config, codereview=options.forced_codereview)
4738
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004739 if cl.IsGerrit():
4740 if options.reject:
4741 parser.error('--reject is not supported with Gerrit codereview.')
4742 if options.nocommit:
4743 parser.error('--nocommit is not supported with Gerrit codereview.')
4744 if options.directory:
4745 parser.error('--directory is not supported with Gerrit codereview.')
4746
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00004747 return cl.CMDPatchIssue(args[0], options.reject, options.nocommit,
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00004748 options.directory)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004749
4750
4751def CMDrebase(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004752 """Rebases current branch on top of svn repo."""
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004753 # Provide a wrapper for git svn rebase to help avoid accidental
4754 # git svn dcommit.
4755 # It's the only command that doesn't use parser at all since we just defer
4756 # execution to git-svn.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00004757
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00004758 return RunGitWithCode(['svn', 'rebase'] + args)[1]
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004759
4760
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004761def GetTreeStatus(url=None):
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004762 """Fetches the tree status and returns either 'open', 'closed',
4763 'unknown' or 'unset'."""
jochen@chromium.org3ec0d542014-01-14 20:00:03 +00004764 url = url or settings.GetTreeStatusUrl(error_ok=True)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004765 if url:
4766 status = urllib2.urlopen(url).read().lower()
4767 if status.find('closed') != -1 or status == '0':
4768 return 'closed'
4769 elif status.find('open') != -1 or status == '1':
4770 return 'open'
4771 return 'unknown'
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004772 return 'unset'
4773
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004774
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004775def GetTreeStatusReason():
4776 """Fetches the tree status from a json url and returns the message
4777 with the reason for the tree to be opened or closed."""
msb@chromium.orgbf1a7ba2011-02-01 16:21:46 +00004778 url = settings.GetTreeStatusUrl()
4779 json_url = urlparse.urljoin(url, '/current?format=json')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004780 connection = urllib2.urlopen(json_url)
4781 status = json.loads(connection.read())
4782 connection.close()
4783 return status['message']
4784
dpranke@chromium.org970c5222011-03-12 00:32:24 +00004785
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004786def CMDtree(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004787 """Shows the status of the tree."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004788 _, args = parser.parse_args(args)
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004789 status = GetTreeStatus()
4790 if 'unset' == status:
vapiera7fbd5a2016-06-16 09:17:49 -07004791 print('You must configure your tree status URL by running "git cl config".')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004792 return 2
4793
vapiera7fbd5a2016-06-16 09:17:49 -07004794 print('The tree is %s' % status)
4795 print()
4796 print(GetTreeStatusReason())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004797 if status != 'open':
4798 return 1
4799 return 0
4800
4801
maruel@chromium.org15192402012-09-06 12:38:29 +00004802def CMDtry(parser, args):
qyearsley1fdfcb62016-10-24 13:22:03 -07004803 """Triggers try jobs using either BuildBucket or CQ dry run."""
tandrii1838bad2016-10-06 00:10:52 -07004804 group = optparse.OptionGroup(parser, 'Try job options')
maruel@chromium.org15192402012-09-06 12:38:29 +00004805 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004806 '-b', '--bot', action='append',
4807 help=('IMPORTANT: specify ONE builder per --bot flag. Use it multiple '
4808 'times to specify multiple builders. ex: '
4809 '"-b win_rel -b win_layout". See '
4810 'the try server waterfall for the builders name and the tests '
4811 'available.'))
maruel@chromium.org15192402012-09-06 12:38:29 +00004812 group.add_option(
borenet6c0efe62016-10-19 08:13:29 -07004813 '-B', '--bucket', default='',
4814 help=('Buildbucket bucket to send the try requests.'))
4815 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004816 '-m', '--master', default='',
4817 help=('Specify a try master where to run the tries.'))
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004818 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004819 '-r', '--revision',
tandriif7b29d42016-10-07 08:45:41 -07004820 help='Revision to use for the try job; default: the revision will '
4821 'be determined by the try recipe that builder runs, which usually '
4822 'defaults to HEAD of origin/master')
maruel@chromium.org15192402012-09-06 12:38:29 +00004823 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004824 '-c', '--clobber', action='store_true', default=False,
tandriif7b29d42016-10-07 08:45:41 -07004825 help='Force a clobber before building; that is don\'t do an '
tandrii1838bad2016-10-06 00:10:52 -07004826 'incremental build')
maruel@chromium.org15192402012-09-06 12:38:29 +00004827 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004828 '--project',
4829 help='Override which project to use. Projects are defined '
tandriif7b29d42016-10-07 08:45:41 -07004830 'in recipe to determine to which repository or directory to '
4831 'apply the patch')
maruel@chromium.org15192402012-09-06 12:38:29 +00004832 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004833 '-p', '--property', dest='properties', action='append', default=[],
4834 help='Specify generic properties in the form -p key1=value1 -p '
tandriif7b29d42016-10-07 08:45:41 -07004835 'key2=value2 etc. The value will be treated as '
4836 'json if decodable, or as string otherwise. '
4837 'NOTE: using this may make your try job not usable for CQ, '
4838 'which will then schedule another try job with default properties')
sheyang@chromium.orgdb375572015-08-17 19:22:23 +00004839 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004840 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4841 help='Host of buildbucket. The default host is %default.')
maruel@chromium.org15192402012-09-06 12:38:29 +00004842 parser.add_option_group(group)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004843 auth.add_auth_options(parser)
maruel@chromium.org15192402012-09-06 12:38:29 +00004844 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004845 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org15192402012-09-06 12:38:29 +00004846
machenbach@chromium.org45453142015-09-15 08:45:22 +00004847 # Make sure that all properties are prop=value pairs.
4848 bad_params = [x for x in options.properties if '=' not in x]
4849 if bad_params:
4850 parser.error('Got properties with missing "=": %s' % bad_params)
4851
maruel@chromium.org15192402012-09-06 12:38:29 +00004852 if args:
4853 parser.error('Unknown arguments: %s' % args)
4854
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004855 cl = Changelist(auth_config=auth_config)
maruel@chromium.org15192402012-09-06 12:38:29 +00004856 if not cl.GetIssue():
4857 parser.error('Need to upload first')
4858
tandriie113dfd2016-10-11 10:20:12 -07004859 error_message = cl.CannotTriggerTryJobReason()
4860 if error_message:
qyearsley99e2cdf2016-10-23 12:51:41 -07004861 parser.error('Can\'t trigger try jobs: %s' % error_message)
jrobbins@chromium.org16f10f72014-06-24 22:14:36 +00004862
borenet6c0efe62016-10-19 08:13:29 -07004863 if options.bucket and options.master:
4864 parser.error('Only one of --bucket and --master may be used.')
4865
qyearsley1fdfcb62016-10-24 13:22:03 -07004866 buckets = _get_bucket_map(cl, options, parser)
phajdan.jr@chromium.org8da7f272014-03-14 01:28:39 +00004867
qyearsleydd49f942016-10-28 11:57:22 -07004868 # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
4869 # then we default to triggering a CQ dry run (see http://crbug.com/625697).
qyearsley1fdfcb62016-10-24 13:22:03 -07004870 if not buckets:
qyearsley1fdfcb62016-10-24 13:22:03 -07004871 if options.verbose:
4872 print('git cl try with no bots now defaults to CQ Dry Run.')
4873 return cl.TriggerDryRun()
stip@chromium.org43064fd2013-12-18 20:07:44 +00004874
borenet6c0efe62016-10-19 08:13:29 -07004875 for builders in buckets.itervalues():
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004876 if any('triggered' in b for b in builders):
vapiera7fbd5a2016-06-16 09:17:49 -07004877 print('ERROR You are trying to send a job to a triggered bot. This type '
tandriide281ae2016-10-12 06:02:30 -07004878 'of bot requires an initial job from a parent (usually a builder). '
4879 'Instead send your job to the parent.\n'
vapiera7fbd5a2016-06-16 09:17:49 -07004880 'Bot list: %s' % builders, file=sys.stderr)
machenbach@chromium.org58a69cb2014-03-01 02:08:29 +00004881 return 1
ilevy@chromium.orgf3b21232012-09-24 20:48:55 +00004882
ilevy@chromium.org36e420b2013-08-06 23:21:12 +00004883 patchset = cl.GetMostRecentPatchset()
tandriide281ae2016-10-12 06:02:30 -07004884 if patchset != cl.GetPatchset():
4885 print('Warning: Codereview server has newer patchsets (%s) than most '
4886 'recent upload from local checkout (%s). Did a previous upload '
4887 'fail?\n'
4888 'By default, git cl try uses the latest patchset from '
4889 'codereview, continuing to use patchset %s.\n' %
4890 (patchset, cl.GetPatchset(), patchset))
qyearsley1fdfcb62016-10-24 13:22:03 -07004891
tandrii568043b2016-10-11 07:49:18 -07004892 try:
borenet6c0efe62016-10-19 08:13:29 -07004893 _trigger_try_jobs(auth_config, cl, buckets, options, 'git_cl_try',
4894 patchset)
tandrii568043b2016-10-11 07:49:18 -07004895 except BuildbucketResponseException as ex:
4896 print('ERROR: %s' % ex)
4897 return 1
maruel@chromium.org15192402012-09-06 12:38:29 +00004898 return 0
4899
4900
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004901def CMDtry_results(parser, args):
tandrii1838bad2016-10-06 00:10:52 -07004902 """Prints info about try jobs associated with current CL."""
4903 group = optparse.OptionGroup(parser, 'Try job results options')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004904 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004905 '-p', '--patchset', type=int, help='patchset number if not current.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004906 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004907 '--print-master', action='store_true', help='print master name as well.')
tandrii@chromium.org6cf98c82016-03-15 11:56:00 +00004908 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004909 '--color', action='store_true', default=setup_color.IS_TTY,
4910 help='force color output, useful when piping output.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004911 group.add_option(
tandrii1838bad2016-10-06 00:10:52 -07004912 '--buildbucket-host', default='cr-buildbucket.appspot.com',
4913 help='Host of buildbucket. The default host is %default.')
qyearsley53f48a12016-09-01 10:45:13 -07004914 group.add_option(
4915 '--json', help='Path of JSON output file to write try job results to.')
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004916 parser.add_option_group(group)
4917 auth.add_auth_options(parser)
4918 options, args = parser.parse_args(args)
4919 if args:
4920 parser.error('Unrecognized args: %s' % ' '.join(args))
4921
4922 auth_config = auth.extract_auth_config_from_options(options)
4923 cl = Changelist(auth_config=auth_config)
4924 if not cl.GetIssue():
4925 parser.error('Need to upload first')
4926
tandrii221ab252016-10-06 08:12:04 -07004927 patchset = options.patchset
4928 if not patchset:
4929 patchset = cl.GetMostRecentPatchset()
4930 if not patchset:
4931 parser.error('Codereview doesn\'t know about issue %s. '
4932 'No access to issue or wrong issue number?\n'
4933 'Either upload first, or pass --patchset explicitely' %
4934 cl.GetIssue())
4935
4936 if patchset != cl.GetPatchset():
tandrii45b2a582016-10-11 03:14:16 -07004937 print('Warning: Codereview server has newer patchsets (%s) than most '
4938 'recent upload from local checkout (%s). Did a previous upload '
4939 'fail?\n'
tandriide281ae2016-10-12 06:02:30 -07004940 'By default, git cl try-results uses the latest patchset from '
4941 'codereview, continuing to use patchset %s.\n' %
tandrii45b2a582016-10-11 03:14:16 -07004942 (patchset, cl.GetPatchset(), patchset))
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004943 try:
tandrii221ab252016-10-06 08:12:04 -07004944 jobs = fetch_try_jobs(auth_config, cl, options.buildbucket_host, patchset)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004945 except BuildbucketResponseException as ex:
vapiera7fbd5a2016-06-16 09:17:49 -07004946 print('Buildbucket error: %s' % ex)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004947 return 1
qyearsley53f48a12016-09-01 10:45:13 -07004948 if options.json:
4949 write_try_results_json(options.json, jobs)
4950 else:
4951 print_try_jobs(options, jobs)
tandrii@chromium.orgb015fac2016-02-26 14:52:01 +00004952 return 0
4953
4954
maruel@chromium.org0633fb42013-08-16 20:06:14 +00004955@subcommand.usage('[new upstream branch]')
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004956def CMDupstream(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004957 """Prints or sets the name of the upstream branch, if any."""
dpranke@chromium.org97ae58e2011-03-18 00:29:20 +00004958 _, args = parser.parse_args(args)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004959 if len(args) > 1:
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004960 parser.error('Unrecognized args: %s' % ' '.join(args))
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004961
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004962 cl = Changelist()
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004963 if args:
4964 # One arg means set upstream branch.
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004965 branch = cl.GetBranch()
stip7a3dd352016-09-22 17:32:28 -07004966 RunGit(['branch', '--set-upstream-to', args[0], branch])
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004967 cl = Changelist()
vapiera7fbd5a2016-06-16 09:17:49 -07004968 print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))
bauerb@chromium.orgc9cf90a2014-04-28 20:32:31 +00004969
4970 # Clear configured merge-base, if there is one.
4971 git_common.remove_merge_base(branch)
brettw@chromium.orgac0ba332012-08-09 23:42:53 +00004972 else:
vapiera7fbd5a2016-06-16 09:17:49 -07004973 print(cl.GetUpstreamBranch())
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00004974 return 0
4975
4976
thestig@chromium.org00858c82013-12-02 23:08:03 +00004977def CMDweb(parser, args):
4978 """Opens the current CL in the web browser."""
4979 _, args = parser.parse_args(args)
4980 if args:
4981 parser.error('Unrecognized args: %s' % ' '.join(args))
4982
4983 issue_url = Changelist().GetIssueURL()
4984 if not issue_url:
vapiera7fbd5a2016-06-16 09:17:49 -07004985 print('ERROR No issue to open', file=sys.stderr)
thestig@chromium.org00858c82013-12-02 23:08:03 +00004986 return 1
4987
4988 webbrowser.open(issue_url)
4989 return 0
4990
4991
maruel@chromium.org27bb3872011-05-30 20:33:19 +00004992def CMDset_commit(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00004993 """Sets the commit bit to trigger the Commit Queue."""
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00004994 parser.add_option('-d', '--dry-run', action='store_true',
4995 help='trigger in dry run mode')
4996 parser.add_option('-c', '--clear', action='store_true',
4997 help='stop CQ run, if any')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00004998 auth.add_auth_options(parser)
iannuccie53c9352016-08-17 14:40:40 -07004999 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005000 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005001 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005002 auth_config = auth.extract_auth_config_from_options(options)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005003 if args:
5004 parser.error('Unrecognized args: %s' % ' '.join(args))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005005 if options.dry_run and options.clear:
5006 parser.error('Make up your mind: both --dry-run and --clear not allowed')
5007
iannuccie53c9352016-08-17 14:40:40 -07005008 cl = Changelist(auth_config=auth_config, issue=options.issue,
5009 codereview=options.forced_codereview)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005010 if options.clear:
tandriid9e5ce52016-07-13 02:32:59 -07005011 state = _CQState.NONE
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005012 elif options.dry_run:
qyearsley1fdfcb62016-10-24 13:22:03 -07005013 # TODO(qyearsley): Use cl.TriggerDryRun.
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00005014 state = _CQState.DRY_RUN
5015 else:
5016 state = _CQState.COMMIT
5017 if not cl.GetIssue():
5018 parser.error('Must upload the issue first')
tandrii9de9ec62016-07-13 03:01:59 -07005019 cl.SetCQState(state)
maruel@chromium.org27bb3872011-05-30 20:33:19 +00005020 return 0
5021
5022
groby@chromium.org411034a2013-02-26 15:12:01 +00005023def CMDset_close(parser, args):
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005024 """Closes the issue."""
iannuccie53c9352016-08-17 14:40:40 -07005025 _add_codereview_issue_select_options(parser)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005026 auth.add_auth_options(parser)
5027 options, args = parser.parse_args(args)
iannuccie53c9352016-08-17 14:40:40 -07005028 _process_codereview_issue_select_options(parser, options)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005029 auth_config = auth.extract_auth_config_from_options(options)
groby@chromium.org411034a2013-02-26 15:12:01 +00005030 if args:
5031 parser.error('Unrecognized args: %s' % ' '.join(args))
iannuccie53c9352016-08-17 14:40:40 -07005032 cl = Changelist(auth_config=auth_config, issue=options.issue,
5033 codereview=options.forced_codereview)
groby@chromium.org411034a2013-02-26 15:12:01 +00005034 # Ensure there actually is an issue to close.
5035 cl.GetDescription()
5036 cl.CloseIssue()
5037 return 0
5038
5039
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005040def CMDdiff(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005041 """Shows differences between local tree and last upload."""
thomasanderson074beb22016-08-29 14:03:20 -07005042 parser.add_option(
5043 '--stat',
5044 action='store_true',
5045 dest='stat',
5046 help='Generate a diffstat')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005047 auth.add_auth_options(parser)
5048 options, args = parser.parse_args(args)
5049 auth_config = auth.extract_auth_config_from_options(options)
5050 if args:
5051 parser.error('Unrecognized args: %s' % ' '.join(args))
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005052
5053 # Uncommitted (staged and unstaged) changes will be destroyed by
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005054 # "git reset --hard" if there are merging conflicts in CMDPatchIssue().
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005055 # Staged changes would be committed along with the patch from last
5056 # upload, hence counted toward the "last upload" side in the final
5057 # diff output, and this is not what we want.
sbc@chromium.org71437c02015-04-09 19:29:40 +00005058 if git_common.is_dirty_git_tree('diff'):
wychen@chromium.org46309bf2015-04-03 21:04:49 +00005059 return 1
5060
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005061 cl = Changelist(auth_config=auth_config)
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005062 issue = cl.GetIssue()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005063 branch = cl.GetBranch()
sbc@chromium.org78dc9842013-11-25 18:43:44 +00005064 if not issue:
5065 DieWithError('No issue found for current branch (%s)' % branch)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005066 TMP_BRANCH = 'git-cl-diff'
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005067 base_branch = cl.GetCommonAncestorWithUpstream()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005068
5069 # Create a new branch based on the merge-base
5070 RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
tandrii@chromium.org534f67a2016-04-07 18:47:05 +00005071 # Clear cached branch in cl object, to avoid overwriting original CL branch
5072 # properties.
5073 cl.ClearBranch()
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005074 try:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005075 rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005076 if rtn != 0:
wychen@chromium.orga872e752015-04-28 23:42:18 +00005077 RunGit(['reset', '--hard'])
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005078 return rtn
5079
wychen@chromium.org06928532015-02-03 02:11:29 +00005080 # Switch back to starting branch and diff against the temporary
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005081 # branch containing the latest rietveld patch.
thomasanderson074beb22016-08-29 14:03:20 -07005082 cmd = ['git', 'diff']
5083 if options.stat:
5084 cmd.append('--stat')
5085 cmd.extend([TMP_BRANCH, branch, '--'])
5086 subprocess2.check_call(cmd)
sbc@chromium.org87b9bf02013-09-26 20:35:15 +00005087 finally:
5088 RunGit(['checkout', '-q', branch])
5089 RunGit(['branch', '-D', TMP_BRANCH])
5090
5091 return 0
5092
5093
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005094def CMDowners(parser, args):
wychen@chromium.org37b2ec02015-04-03 00:49:15 +00005095 """Interactively find the owners for reviewing."""
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005096 parser.add_option(
5097 '--no-color',
5098 action='store_true',
5099 help='Use this option to disable color output')
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005100 auth.add_auth_options(parser)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005101 options, args = parser.parse_args(args)
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005102 auth_config = auth.extract_auth_config_from_options(options)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005103
5104 author = RunGit(['config', 'user.email']).strip() or None
5105
vadimsh@chromium.orgcf6a5d22015-04-09 22:02:00 +00005106 cl = Changelist(auth_config=auth_config)
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005107
5108 if args:
5109 if len(args) > 1:
5110 parser.error('Unknown args')
5111 base_branch = args[0]
5112 else:
5113 # Default to diffing against the common ancestor of the upstream branch.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005114 base_branch = cl.GetCommonAncestorWithUpstream()
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005115
5116 change = cl.GetChange(base_branch, None)
5117 return owners_finder.OwnersFinder(
5118 [f.LocalPath() for f in
5119 cl.GetChange(base_branch, None).AffectedFiles()],
5120 change.RepositoryRoot(), author,
dtu944b6052016-07-14 14:48:21 -07005121 fopen=file, os_path=os.path,
ikarienator@chromium.orgfaf3fdf2013-09-20 02:11:48 +00005122 disable_color=options.no_color).run()
5123
5124
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005125def BuildGitDiffCmd(diff_type, upstream_commit, args):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005126 """Generates a diff command."""
5127 # Generate diff for the current branch's changes.
5128 diff_cmd = ['diff', '--no-ext-diff', '--no-prefix', diff_type,
5129 upstream_commit, '--' ]
5130
5131 if args:
5132 for arg in args:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005133 if os.path.isdir(arg) or os.path.isfile(arg):
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005134 diff_cmd.append(arg)
5135 else:
5136 DieWithError('Argument "%s" is not a file or a directory' % arg)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005137
5138 return diff_cmd
5139
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005140def MatchingFileType(file_name, extensions):
5141 """Returns true if the file name ends with one of the given extensions."""
5142 return bool([ext for ext in extensions if file_name.lower().endswith(ext)])
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005143
enne@chromium.org555cfe42014-01-29 18:21:39 +00005144@subcommand.usage('[files or directories to diff]')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005145def CMDformat(parser, args):
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005146 """Runs auto-formatting tools (clang-format etc.) on the diff."""
zengsterbf470142016-07-07 16:43:00 -07005147 CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
kylechar58edce22016-06-17 06:07:51 -07005148 GN_EXTS = ['.gn', '.gni', '.typemap']
enne@chromium.org3b7e15c2014-01-21 17:44:47 +00005149 parser.add_option('--full', action='store_true',
5150 help='Reformat the full content of all touched files')
5151 parser.add_option('--dry-run', action='store_true',
5152 help='Don\'t modify any file on disk.')
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005153 parser.add_option('--python', action='store_true',
5154 help='Format python code with yapf (experimental).')
wittman@chromium.org04d5a222014-03-07 18:30:42 +00005155 parser.add_option('--diff', action='store_true',
5156 help='Print diff to stdout rather than modifying files.')
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005157 opts, args = parser.parse_args(args)
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005158
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005159 # git diff generates paths against the root of the repository. Change
5160 # to that directory so clang-format can find files even within subdirs.
thestig@chromium.org8b0553c2014-02-11 00:33:37 +00005161 rel_base_path = settings.GetRelativeRoot()
enne@chromium.orgff7a1fb2013-12-10 19:21:41 +00005162 if rel_base_path:
5163 os.chdir(rel_base_path)
5164
digit@chromium.org29e47272013-05-17 17:01:46 +00005165 # Grab the merge-base commit, i.e. the upstream commit of the current
5166 # branch when it was created or the last time it was rebased. This is
5167 # to cover the case where the user may have called "git fetch origin",
5168 # moving the origin branch to a newer commit, but hasn't rebased yet.
5169 upstream_commit = None
5170 cl = Changelist()
5171 upstream_branch = cl.GetUpstreamBranch()
5172 if upstream_branch:
5173 upstream_commit = RunGit(['merge-base', 'HEAD', upstream_branch])
5174 upstream_commit = upstream_commit.strip()
5175
5176 if not upstream_commit:
5177 DieWithError('Could not find base commit for this branch. '
5178 'Are you in detached state?')
5179
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005180 changed_files_cmd = BuildGitDiffCmd('--name-only', upstream_commit, args)
5181 diff_output = RunGit(changed_files_cmd)
5182 diff_files = diff_output.splitlines()
jkarlin@chromium.orgad21b922016-01-28 17:48:42 +00005183 # Filter out files deleted by this CL
5184 diff_files = [x for x in diff_files if os.path.isfile(x)]
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005185
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005186 clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
5187 python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
5188 dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005189 gn_diff_files = [x for x in diff_files if MatchingFileType(x, GN_EXTS)]
digit@chromium.org29e47272013-05-17 17:01:46 +00005190
nick@chromium.org3ac1c4e2014-01-16 02:44:42 +00005191 top_dir = os.path.normpath(
5192 RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
5193
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005194 # Set to 2 to signal to CheckPatchFormatted() that this patch isn't
5195 # formatted. This is used to block during the presubmit.
5196 return_value = 0
5197
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005198 if clang_diff_files:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005199 # Locate the clang-format binary in the checkout
5200 try:
5201 clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
vapierfd77ac72016-06-16 08:33:57 -07005202 except clang_format.NotFoundError as e:
techtonik@gmail.com5573df12016-04-12 18:34:10 +00005203 DieWithError(e)
5204
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005205 if opts.full:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005206 cmd = [clang_format_tool]
5207 if not opts.dry_run and not opts.diff:
5208 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005209 stdout = RunCommand(cmd + clang_diff_files, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005210 if opts.diff:
5211 sys.stdout.write(stdout)
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005212 else:
5213 env = os.environ.copy()
5214 env['PATH'] = str(os.path.dirname(clang_format_tool))
5215 try:
5216 script = clang_format.FindClangFormatScriptInChromiumTree(
5217 'clang-format-diff.py')
vapierfd77ac72016-06-16 08:33:57 -07005218 except clang_format.NotFoundError as e:
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005219 DieWithError(e)
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005220
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005221 cmd = [sys.executable, script, '-p0']
5222 if not opts.dry_run and not opts.diff:
5223 cmd.append('-i')
digit@chromium.orgd6ddc1c2013-10-25 15:36:32 +00005224
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005225 diff_cmd = BuildGitDiffCmd('-U0', upstream_commit, clang_diff_files)
5226 diff_output = RunGit(diff_cmd)
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005227
sammc@chromium.org0b35f5d2016-02-25 22:39:23 +00005228 stdout = RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
5229 if opts.diff:
5230 sys.stdout.write(stdout)
5231 if opts.dry_run and len(stdout) > 0:
5232 return_value = 2
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005233
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005234 # Similar code to above, but using yapf on .py files rather than clang-format
5235 # on C/C++ files
5236 if opts.python:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005237 yapf_tool = gclient_utils.FindExecutable('yapf')
5238 if yapf_tool is None:
5239 DieWithError('yapf not found in PATH')
5240
5241 if opts.full:
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005242 if python_diff_files:
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005243 cmd = [yapf_tool]
5244 if not opts.dry_run and not opts.diff:
5245 cmd.append('-i')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005246 stdout = RunCommand(cmd + python_diff_files, cwd=top_dir)
sbc@chromium.org9d0644d2015-06-05 23:16:54 +00005247 if opts.diff:
5248 sys.stdout.write(stdout)
5249 else:
5250 # TODO(sbc): yapf --lines mode still has some issues.
5251 # https://github.com/google/yapf/issues/154
5252 DieWithError('--python currently only works with --full')
5253
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005254 # Dart's formatter does not have the nice property of only operating on
5255 # modified chunks, so hard code full.
5256 if dart_diff_files:
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005257 try:
5258 command = [dart_format.FindDartFmtToolInChromiumTree()]
5259 if not opts.dry_run and not opts.diff:
5260 command.append('-w')
jkarlin@chromium.org6f7fa5e2016-01-20 19:32:21 +00005261 command.extend(dart_diff_files)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005262
ppi@chromium.org6593d932016-03-03 15:41:15 +00005263 stdout = RunCommand(command, cwd=top_dir)
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005264 if opts.dry_run and stdout:
5265 return_value = 2
5266 except dart_format.NotFoundError as e:
vapiera7fbd5a2016-06-16 09:17:49 -07005267 print('Warning: Unable to check Dart code formatting. Dart SDK not '
5268 'found in this checkout. Files in other languages are still '
5269 'formatted.')
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005270
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005271 # Format GN build files. Always run on full build files for canonical form.
5272 if gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005273 cmd = ['gn', 'format' ]
5274 if opts.dry_run or opts.diff:
5275 cmd.append('--dry-run')
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005276 for gn_diff_file in gn_diff_files:
brettw4b8ed592016-08-05 16:19:12 -07005277 gn_ret = subprocess2.call(cmd + [gn_diff_file],
5278 shell=sys.platform == 'win32',
5279 cwd=top_dir)
5280 if opts.dry_run and gn_ret == 2:
5281 return_value = 2 # Not formatted.
5282 elif opts.diff and gn_ret == 2:
5283 # TODO this should compute and print the actual diff.
5284 print("This change has GN build file diff for " + gn_diff_file)
5285 elif gn_ret != 0:
5286 # For non-dry run cases (and non-2 return values for dry-run), a
5287 # nonzero error code indicates a failure, probably because the file
5288 # doesn't parse.
5289 DieWithError("gn format failed on " + gn_diff_file +
5290 "\nTry running 'gn format' on this file manually.")
kylechar@chromium.org8b61f112016-02-05 13:28:58 +00005291
erg@chromium.orge0a7c5d2015-02-23 20:30:08 +00005292 return return_value
agable@chromium.orgfab8f822013-05-06 17:43:09 +00005293
5294
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005295@subcommand.usage('<codereview url or issue id>')
5296def CMDcheckout(parser, args):
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005297 """Checks out a branch associated with a given Rietveld or Gerrit issue."""
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005298 _, args = parser.parse_args(args)
5299
5300 if len(args) != 1:
5301 parser.print_help()
5302 return 1
5303
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00005304 issue_arg = ParseIssueNumberArgument(args[0])
tandrii@chromium.orgde6c9a12016-04-11 15:33:53 +00005305 if not issue_arg.valid:
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005306 parser.print_help()
5307 return 1
tandrii@chromium.orgabd27e52016-04-11 15:43:32 +00005308 target_issue = str(issue_arg.issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005309
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005310 def find_issues(issueprefix):
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00005311 output = RunGit(['config', '--local', '--get-regexp',
5312 r'branch\..*\.%s' % issueprefix],
5313 error_ok=True)
5314 for key, issue in [x.split() for x in output.splitlines()]:
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005315 if issue == target_issue:
5316 yield re.sub(r'branch\.(.*)\.%s' % issueprefix, r'\1', key)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005317
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00005318 branches = []
5319 for cls in _CODEREVIEW_IMPLEMENTATIONS.values():
tandrii5d48c322016-08-18 16:19:37 -07005320 branches.extend(find_issues(cls.IssueConfigKey()))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005321 if len(branches) == 0:
vapiera7fbd5a2016-06-16 09:17:49 -07005322 print('No branch found for issue %s.' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005323 return 1
5324 if len(branches) == 1:
5325 RunGit(['checkout', branches[0]])
5326 else:
vapiera7fbd5a2016-06-16 09:17:49 -07005327 print('Multiple branches match issue %s:' % target_issue)
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005328 for i in range(len(branches)):
vapiera7fbd5a2016-06-16 09:17:49 -07005329 print('%d: %s' % (i, branches[i]))
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005330 which = raw_input('Choose by index: ')
5331 try:
5332 RunGit(['checkout', branches[int(which)]])
5333 except (IndexError, ValueError):
vapiera7fbd5a2016-06-16 09:17:49 -07005334 print('Invalid selection, not checking out any branch.')
scottmg@chromium.org84a80c42015-09-22 20:40:37 +00005335 return 1
5336
5337 return 0
5338
5339
maruel@chromium.org29404b52014-09-08 22:58:00 +00005340def CMDlol(parser, args):
5341 # This command is intentionally undocumented.
vapiera7fbd5a2016-06-16 09:17:49 -07005342 print(zlib.decompress(base64.b64decode(
thakis@chromium.org3421c992014-11-02 02:20:32 +00005343 'eNptkLEOwyAMRHe+wupCIqW57v0Vq84WqWtXyrcXnCBsmgMJ+/SSAxMZgRB6NzE'
5344 'E2ObgCKJooYdu4uAQVffUEoE1sRQLxAcqzd7uK2gmStrll1ucV3uZyaY5sXyDd9'
5345 'JAnN+lAXsOMJ90GANAi43mq5/VeeacylKVgi8o6F1SC63FxnagHfJUTfUYdCR/W'
vapiera7fbd5a2016-06-16 09:17:49 -07005346 'Ofe+0dHL7PicpytKP750Fh1q2qnLVof4w8OZWNY')))
maruel@chromium.org29404b52014-09-08 22:58:00 +00005347 return 0
5348
5349
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005350class OptionParser(optparse.OptionParser):
5351 """Creates the option parse and add --verbose support."""
5352 def __init__(self, *args, **kwargs):
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005353 optparse.OptionParser.__init__(
5354 self, *args, prog='git cl', version=__version__, **kwargs)
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005355 self.add_option(
5356 '-v', '--verbose', action='count', default=0,
5357 help='Use 2 times for more debugging info')
5358
5359 def parse_args(self, args=None, values=None):
5360 options, args = optparse.OptionParser.parse_args(self, args, values)
5361 levels = [logging.WARNING, logging.INFO, logging.DEBUG]
5362 logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
5363 return options, args
5364
iannucci@chromium.orgd9c1b202013-07-24 23:52:11 +00005365
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005366def main(argv):
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005367 if sys.hexversion < 0x02060000:
vapiera7fbd5a2016-06-16 09:17:49 -07005368 print('\nYour python version %s is unsupported, please upgrade.\n' %
5369 (sys.version.split(' ', 1)[0],), file=sys.stderr)
maruel@chromium.org82798cb2012-02-23 18:16:12 +00005370 return 2
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005371
maruel@chromium.orgddd59412011-11-30 14:20:38 +00005372 # Reload settings.
5373 global settings
5374 settings = Settings()
5375
maruel@chromium.org39c0b222013-08-17 16:57:01 +00005376 colorize_CMDstatus_doc()
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005377 dispatcher = subcommand.CommandDispatcher(__name__)
5378 try:
5379 return dispatcher.execute(OptionParser(), argv)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +00005380 except auth.AuthenticationError as e:
5381 DieWithError(str(e))
vapierfd77ac72016-06-16 08:33:57 -07005382 except urllib2.HTTPError as e:
maruel@chromium.org0633fb42013-08-16 20:06:14 +00005383 if e.code != 500:
5384 raise
5385 DieWithError(
5386 ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
5387 'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
sbc@chromium.org013731e2015-02-26 18:28:43 +00005388 return 0
chase@chromium.orgcc51cd02010-12-23 00:48:39 +00005389
5390
5391if __name__ == '__main__':
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00005392 # These affect sys.stdout so do it outside of main() to simplify mocks in
5393 # unit testing.
maruel@chromium.org6f09cd92011-04-01 16:38:12 +00005394 fix_encoding.fix_encoding()
iannucci@chromium.org596cd5c2016-04-04 21:34:39 +00005395 setup_color.init()
sbc@chromium.org013731e2015-02-26 18:28:43 +00005396 try:
5397 sys.exit(main(sys.argv[1:]))
5398 except KeyboardInterrupt:
5399 sys.stderr.write('interrupted\n')
5400 sys.exit(1)